Hello community, here is the log from the commit of package nautilus checked in at Tue May 2 13:27:31 CEST 2006. -------- --- GNOME/nautilus/nautilus.changes 2006-04-27 16:24:53.000000000 +0200 +++ STABLE/nautilus/nautilus.changes 2006-05-01 20:36:51.000000000 +0200 @@ -1,0 +2,6 @@ +Mon May 1 20:35:51 CEST 2006 - dobey@suse.de + +- Added nautilus-trash-icon.patch to use the theme's trash icon, + rather than the delete icon, for the "Move to Trash" menu items + +------------------------------------------------------------------- New: ---- nautilus-trash-icon.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nautilus.spec ++++++ --- /var/tmp/diff_new_pack.TtFYDe/_old 2006-05-02 13:26:59.000000000 +0200 +++ /var/tmp/diff_new_pack.TtFYDe/_new 2006-05-02 13:26:59.000000000 +0200 @@ -18,7 +18,7 @@ Group: Productivity/File utilities Autoreqprov: on Version: 2.12.2 -Release: 57 +Release: 59 Summary: The GNOME 2.x Desktop File Manager Source: ftp://ftp.gnome.org/pub/gnome/sources/nautilus/2.11/%{name}-%{version}.tar.bz2 URL: http://www.gnome.org @@ -47,6 +47,7 @@ Patch41: nautilus-mime.patch Patch42: nautilus-155010-desktop-volume-policy.diff Patch43: nautilus-158158-ignore-foreign-desktop-files.diff +Patch44: nautilus-trash-icon.patch PreReq: filesystem gconf2 Requires: gnome2-user-docs Provides: nautilus2 @@ -99,6 +100,7 @@ %patch41 %patch42 -p0 %patch43 -p1 +%patch44 # FIXME: this code updates translation for upstreamed patches. cd po intltool-update --pot @@ -183,6 +185,9 @@ %{prefix}/%_lib/pkgconfig/*.pc %changelog -n nautilus +* Mon May 01 2006 - dobey@suse.de +- Added nautilus-trash-icon.patch to use the theme's trash icon, + rather than the delete icon, for the "Move to Trash" menu items * Thu Apr 27 2006 - federico@novell.com - Updated nautilus-155010-desktop-volume-policy.diff to fix bug https://bugzilla.novell.com/show_bug.cgi?id=168280. This makes ++++++ nautilus-trash-icon.patch ++++++ Index: src/file-manager/fm-directory-view.c =================================================================== RCS file: /cvs/gnome/nautilus/src/file-manager/fm-directory-view.c,v retrieving revision 1.711.2.4 diff -u -p -r1.711.2.4 fm-directory-view.c --- src/file-manager/fm-directory-view.c 10 Dec 2005 17:38:35 -0000 1.711.2.4 +++ src/file-manager/fm-directory-view.c 1 May 2006 17:31:29 -0000 @@ -6219,7 +6219,7 @@ static const GtkActionEntry directory_vi "RenameSelectAll", "<shift>F2", /* label, accelerator */ NULL, /* tooltip */ G_CALLBACK (action_rename_select_all_callback) }, - { "Trash", GTK_STOCK_DELETE, /* name, stock id */ + { "Trash", "gnome-fs-trash-empty", /* name, stock id */ N_("Mo_ve to Trash"), "<control>T", /* label, accelerator */ N_("Move each selected item to the Trash"), /* tooltip */ G_CALLBACK (action_trash_callback) }, Index: src/file-manager/fm-tree-view.c =================================================================== RCS file: /cvs/gnome/nautilus/src/file-manager/fm-tree-view.c,v retrieving revision 1.18.2.1 diff -u -p -r1.18.2.1 fm-tree-view.c --- src/file-manager/fm-tree-view.c 8 Nov 2005 22:30:23 -0000 1.18.2.1 +++ src/file-manager/fm-tree-view.c 1 May 2006 17:31:29 -0000 @@ -1176,8 +1176,8 @@ create_popup_menu (FMTreeView *view) gtk_menu_shell_append (GTK_MENU_SHELL (popup), separator_item); /* add the "move to trash" menu item */ - menu_image = gtk_image_new_from_stock (GTK_STOCK_DELETE, - GTK_ICON_SIZE_MENU); + menu_image = gtk_image_new_from_icon_name ("gnome-fs-trash-empty", + GTK_ICON_SIZE_MENU); gtk_widget_show (menu_image); menu_item = gtk_image_menu_item_new_with_label (_("Move to Trash")); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item), ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...
participants (1)
-
root＠suse.de