nautilus r14418 - in trunk: . src

[cosimoc svn gnome org]

Author: cosimoc
Date: Mon Jul 28 09:40:58 2008
New Revision: 14418
URL: http://svn.gnome.org/viewvc/nautilus?rev=14418&view=rev

Log:
2008-07-28  Cosimo Cecchi  <cosimoc gnome org>

	* src/nautilus-file-management-properties.c:
	(nautilus_file_management_properties_dialog_setup):
	* src/nautilus-navigation-window.c: (real_get_icon):
	Use standard icon name, as gnome-icon-theme no longer ships
	the "file-manager" icon.
	Patch by Matthias Clasen (#545062).


Modified:
   trunk/ChangeLog
   trunk/src/nautilus-file-management-properties.c
   trunk/src/nautilus-navigation-window.c

Modified: trunk/src/nautilus-file-management-properties.c
==============================================================================
--- trunk/src/nautilus-file-management-properties.c	(original)
+++ trunk/src/nautilus-file-management-properties.c	Mon Jul 28 09:40:58 2008
@@ -801,7 +801,7 @@
 			       (GClosureNotify)g_object_unref,
 			       0);
 
-	gtk_window_set_icon_name (GTK_WINDOW (dialog), "file-manager");
+	gtk_window_set_icon_name (GTK_WINDOW (dialog), "system-file-manager");
 
 	if (window) {
 		gtk_window_set_screen (GTK_WINDOW (dialog), gtk_window_get_screen(window));

Modified: trunk/src/nautilus-navigation-window.c
==============================================================================
--- trunk/src/nautilus-navigation-window.c	(original)
+++ trunk/src/nautilus-navigation-window.c	Mon Jul 28 09:40:58 2008
@@ -1221,7 +1221,7 @@
 real_get_icon (NautilusWindow *window,
 	       NautilusWindowSlot *slot)
 {
-	return nautilus_icon_info_lookup_from_name ("file-manager", 48);
+	return nautilus_icon_info_lookup_from_name ("system-file-manager", 48);
 }
 
 static void