summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCosimo Cecchi <cosimoc@gnome.org>2008-07-28 09:40:58 +0000
committerCosimo Cecchi <cosimoc@src.gnome.org>2008-07-28 09:40:58 +0000
commit979f1594e77b3aa3e6d512df0bda1617b965e2d8 (patch)
tree963052d233f55b9e6f15908c5c93bcbcec9b8ec3
parent9474ce4b1c48373afcface4b33a3dddd3cbad97c (diff)
downloadnautilus-979f1594e77b3aa3e6d512df0bda1617b965e2d8.tar.gz
Use standard icon name, as gnome-icon-theme no longer ships the
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). svn path=/trunk/; revision=14418
-rw-r--r--ChangeLog9
-rw-r--r--src/nautilus-file-management-properties.c2
-rw-r--r--src/nautilus-navigation-window.c2
3 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f7f90e6d9..acae40838 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+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).
+
2008-07-24 Cosimo Cecchi <cosimoc@gnome.org>
* src/nautilus-pathbar.c: (setup_button_drag_source):
diff --git a/src/nautilus-file-management-properties.c b/src/nautilus-file-management-properties.c
index bb14fa3ea..70e732e9f 100644
--- a/src/nautilus-file-management-properties.c
+++ b/src/nautilus-file-management-properties.c
@@ -801,7 +801,7 @@ nautilus_file_management_properties_dialog_setup (GladeXML *xml_dialog, GtkWindo
(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));
diff --git a/src/nautilus-navigation-window.c b/src/nautilus-navigation-window.c
index 33738a908..7d152431e 100644
--- a/src/nautilus-navigation-window.c
+++ b/src/nautilus-navigation-window.c
@@ -1221,7 +1221,7 @@ static NautilusIconInfo *
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