[gnome-control-center/gnome-2-28] [display] Change icon name to preferences-desktop-display

[Jens Granseuer <jensg src gnome org>]

commit b43552201c40755c8ce9c7ddf19d3fb7c26303e8
Author: Jens Granseuer <jensgr gmx net>
Date:   Fri Apr 9 18:55:24 2010 +0200

    [display] Change icon name to preferences-desktop-display
    
    Use preferences-desktop-display instead of gnome-display-properties.
    Closes bug #614912.

 capplets/display/Makefile.am                       |   10 +++++-----
 capplets/display/display-properties.desktop.in.in  |    2 +-
 ...perties.png => preferences-desktop-display.png} |  Bin 613 -> 613 bytes
 ...perties.png => preferences-desktop-display.png} |  Bin 866 -> 866 bytes
 ...perties.png => preferences-desktop-display.png} |  Bin 909 -> 909 bytes
 ...perties.png => preferences-desktop-display.png} |  Bin 1602 -> 1602 bytes
 ...perties.svg => preferences-desktop-display.svg} |    0
 capplets/display/xrandr-capplet.c                  |    4 ++--
 8 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/capplets/display/Makefile.am b/capplets/display/Makefile.am
index 14bba49..1c2b3dd 100644
--- a/capplets/display/Makefile.am
+++ b/capplets/display/Makefile.am
@@ -21,15 +21,15 @@ gnome_display_properties_LDADD = \
 @INTLTOOL_DESKTOP_RULE@
 
 icons16dir = $(datadir)/icons/hicolor/16x16/apps
-dist_icons16_DATA = icons/16x16/gnome-display-properties.png
+dist_icons16_DATA = icons/16x16/preferences-desktop-display.png
 icons22dir = $(datadir)/icons/hicolor/22x22/apps
-dist_icons22_DATA = icons/22x22/gnome-display-properties.png
+dist_icons22_DATA = icons/22x22/preferences-desktop-display.png
 icons24dir = $(datadir)/icons/hicolor/24x24/apps
-dist_icons24_DATA = icons/24x24/gnome-display-properties.png
+dist_icons24_DATA = icons/24x24/preferences-desktop-display.png
 icons32dir = $(datadir)/icons/hicolor/32x32/apps
-dist_icons32_DATA = icons/32x32/gnome-display-properties.png
+dist_icons32_DATA = icons/32x32/preferences-desktop-display.png
 iconssvgdir = $(datadir)/icons/hicolor/scalable/apps
-dist_iconssvg_DATA = icons/scalable/gnome-display-properties.svg
+dist_iconssvg_DATA = icons/scalable/preferences-desktop-display.svg
 
 desktopdir = $(datadir)/applications
 Desktop_in_files = display-properties.desktop.in
diff --git a/capplets/display/display-properties.desktop.in.in b/capplets/display/display-properties.desktop.in.in
index 21bd949..816acc4 100644
--- a/capplets/display/display-properties.desktop.in.in
+++ b/capplets/display/display-properties.desktop.in.in
@@ -2,7 +2,7 @@
 _Name=Display
 _Comment=Change screen resolution
 Exec=gnome-display-properties
-Icon=gnome-display-properties
+Icon=preferences-desktop-display
 Terminal=false
 Type=Application
 StartupNotify=true
diff --git a/capplets/display/icons/16x16/gnome-display-properties.png b/capplets/display/icons/16x16/preferences-desktop-display.png
similarity index 100%
rename from capplets/display/icons/16x16/gnome-display-properties.png
rename to capplets/display/icons/16x16/preferences-desktop-display.png
diff --git a/capplets/display/icons/22x22/gnome-display-properties.png b/capplets/display/icons/22x22/preferences-desktop-display.png
similarity index 100%
rename from capplets/display/icons/22x22/gnome-display-properties.png
rename to capplets/display/icons/22x22/preferences-desktop-display.png
diff --git a/capplets/display/icons/24x24/gnome-display-properties.png b/capplets/display/icons/24x24/preferences-desktop-display.png
similarity index 100%
rename from capplets/display/icons/24x24/gnome-display-properties.png
rename to capplets/display/icons/24x24/preferences-desktop-display.png
diff --git a/capplets/display/icons/32x32/gnome-display-properties.png b/capplets/display/icons/32x32/preferences-desktop-display.png
similarity index 100%
rename from capplets/display/icons/32x32/gnome-display-properties.png
rename to capplets/display/icons/32x32/preferences-desktop-display.png
diff --git a/capplets/display/icons/scalable/gnome-display-properties.svg b/capplets/display/icons/scalable/preferences-desktop-display.svg
similarity index 100%
rename from capplets/display/icons/scalable/gnome-display-properties.svg
rename to capplets/display/icons/scalable/preferences-desktop-display.svg
diff --git a/capplets/display/xrandr-capplet.c b/capplets/display/xrandr-capplet.c
index 1d4d12c..da0a286 100644
--- a/capplets/display/xrandr-capplet.c
+++ b/capplets/display/xrandr-capplet.c
@@ -2301,9 +2301,9 @@ run_application (App *app)
     g_signal_connect_after (app->dialog, "map-event",
 			    G_CALLBACK (dialog_map_event_cb), app);
 
-    gtk_window_set_default_icon_name ("gnome-display-properties");
+    gtk_window_set_default_icon_name ("preferences-desktop-display");
     gtk_window_set_icon_name (GTK_WINDOW (app->dialog),
-			      "gnome-display-properties");
+			      "preferences-desktop-display");
 
     app->current_monitor_event_box = _gtk_builder_get_widget (builder,
     						   "current_monitor_event_box");