rpms/control-center/devel standard-icon.patch, NONE, 1.1 control-center.spec, 1.374, 1.375

Matthias Clasen (mclasen) fedora-extras-commits at redhat.com
Fri Jun 20 18:31:11 UTC 2008 

Author: mclasen

Update of /cvs/extras/rpms/control-center/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19241

Modified Files:
	control-center.spec 
Added Files:
	standard-icon.patch 
Log Message:
use standard icons


standard-icon.patch:

--- NEW FILE standard-icon.patch ---
diff -up gnome-control-center-2.23.4/capplets/accessibility/at-properties/at-properties.desktop.in.in.standard-icon gnome-control-center-2.23.4/capplets/accessibility/at-properties/at-properties.desktop.in.in
--- gnome-control-center-2.23.4/capplets/accessibility/at-properties/at-properties.desktop.in.in.standard-icon	2008-06-20 13:43:47.000000000 -0400
+++ gnome-control-center-2.23.4/capplets/accessibility/at-properties/at-properties.desktop.in.in	2008-06-20 13:44:30.000000000 -0400
@@ -2,7 +2,7 @@
 _Name=Assistive Technologies
 _Comment=Enable support for GNOME assistive technologies at login
 Exec=gnome-at-properties
-Icon=gnome-settings-accessibility-technologies
+Icon=preferences-desktop-accessibility
 Terminal=false
 Type=Application
 StartupNotify=true
diff -up gnome-control-center-2.23.4/capplets/accessibility/at-properties/main.c.standard-icon gnome-control-center-2.23.4/capplets/accessibility/at-properties/main.c
--- gnome-control-center-2.23.4/capplets/accessibility/at-properties/main.c.standard-icon	2008-06-20 13:44:46.000000000 -0400
+++ gnome-control-center-2.23.4/capplets/accessibility/at-properties/main.c	2008-06-20 13:45:08.000000000 -0400
@@ -188,7 +188,7 @@ setup_dialog (GladeXML *dialog)
 			  G_CALLBACK (cb_login_preferences), NULL);
 
 	widget = WID ("at_properties_dialog");
-	capplet_set_icon (widget, "gnome-settings-accessibility-technologies");
+	capplet_set_icon (widget, "preferences-desktop-accessibility");
 
 	g_signal_connect (G_OBJECT (widget),
 			  "response",
diff -up gnome-control-center-2.23.4/capplets/appearance/appearance-main.c.standard-icon gnome-control-center-2.23.4/capplets/appearance/appearance-main.c
--- gnome-control-center-2.23.4/capplets/appearance/appearance-main.c.standard-icon	2008-06-20 14:04:35.000000000 -0400
+++ gnome-control-center-2.23.4/capplets/appearance/appearance-main.c	2008-06-20 14:04:55.000000000 -0400
@@ -156,7 +156,7 @@ main (int argc, char **argv)
 
   /* prepare the main window */
   w = glade_xml_get_widget (data->xml, "appearance_window");
-  capplet_set_icon (w, "gnome-settings-theme");
+  capplet_set_icon (w, "preferences-desktop-theme");
   gtk_widget_show_all (w);
 
   g_signal_connect_after (w, "response",
diff -up gnome-control-center-2.23.4/capplets/appearance/data/gnome-appearance-properties.desktop.in.in.standard-icon gnome-control-center-2.23.4/capplets/appearance/data/gnome-appearance-properties.desktop.in.in
--- gnome-control-center-2.23.4/capplets/appearance/data/gnome-appearance-properties.desktop.in.in.standard-icon	2008-06-20 14:03:23.000000000 -0400
+++ gnome-control-center-2.23.4/capplets/appearance/data/gnome-appearance-properties.desktop.in.in	2008-06-20 14:03:38.000000000 -0400
@@ -2,7 +2,7 @@
 _Name=Appearance
 _Comment=Customize the look of the desktop
 Exec=gnome-appearance-properties %F
-Icon=gnome-settings-theme
+Icon=preferences-desktop-theme
 Terminal=false
 Type=Application
 StartupNotify=true
diff -up gnome-control-center-2.23.4/capplets/keybindings/gnome-keybinding-properties.c.standard-icon gnome-control-center-2.23.4/capplets/keybindings/gnome-keybinding-properties.c
--- gnome-control-center-2.23.4/capplets/keybindings/gnome-keybinding-properties.c.standard-icon	2008-06-20 13:53:42.000000000 -0400
+++ gnome-control-center-2.23.4/capplets/keybindings/gnome-keybinding-properties.c	2008-06-20 13:54:16.000000000 -0400
@@ -1334,7 +1334,7 @@ setup_dialog (GladeXML *dialog)
   g_free (wm_name);
 
   widget = WID ("gnome-keybinding-dialog");
-  capplet_set_icon (widget, "gnome-settings-keybindings");
+  capplet_set_icon (widget, "preferences-desktop-keyboard-shortcuts");
   gtk_widget_show (widget);
 
   g_signal_connect (widget, "key_press_event", G_CALLBACK (maybe_block_accels), NULL);
diff -up gnome-control-center-2.23.4/capplets/keybindings/keybinding.desktop.in.in.standard-icon gnome-control-center-2.23.4/capplets/keybindings/keybinding.desktop.in.in
--- gnome-control-center-2.23.4/capplets/keybindings/keybinding.desktop.in.in.standard-icon	2008-06-20 13:52:32.000000000 -0400
+++ gnome-control-center-2.23.4/capplets/keybindings/keybinding.desktop.in.in	2008-06-20 13:52:53.000000000 -0400
@@ -2,7 +2,7 @@
 _Name=Keyboard Shortcuts
 _Comment=Assign shortcut keys to commands
 Exec=gnome-keybinding-properties
-Icon=gnome-settings-keybindings
+Icon=preferences-desktop-keyboard-shortcuts
 Terminal=false
 Type=Application
 StartupNotify=true
diff -up gnome-control-center-2.23.4/capplets/keyboard/gnome-keyboard-properties.c.standard-icon gnome-control-center-2.23.4/capplets/keyboard/gnome-keyboard-properties.c
--- gnome-control-center-2.23.4/capplets/keyboard/gnome-keyboard-properties.c.standard-icon	2008-06-20 14:13:50.000000000 -0400
+++ gnome-control-center-2.23.4/capplets/keyboard/gnome-keyboard-properties.c	2008-06-20 14:14:33.000000000 -0400
@@ -312,7 +312,7 @@ main (int argc, char **argv)
 		}
 
 		capplet_set_icon (WID ("keyboard_dialog"),
-				  "gnome-dev-keyboard");
+				  "preferences-desktop-keyboard");
 		gtk_widget_show (WID ("keyboard_dialog"));
 		gtk_main ();
 	}
diff -up gnome-control-center-2.23.4/capplets/keyboard/keyboard.desktop.in.in.standard-icon gnome-control-center-2.23.4/capplets/keyboard/keyboard.desktop.in.in
--- gnome-control-center-2.23.4/capplets/keyboard/keyboard.desktop.in.in.standard-icon	2008-06-20 14:13:27.000000000 -0400
+++ gnome-control-center-2.23.4/capplets/keyboard/keyboard.desktop.in.in	2008-06-20 14:15:58.000000000 -0400
@@ -2,7 +2,7 @@
 _Name=Keyboard
 _Comment=Set your keyboard preferences
 Exec=gnome-keyboard-properties
-Icon=gnome-dev-keyboard
+Icon=preferences-desktop-keyboard
 Terminal=false
 Type=Application
 StartupNotify=true
diff -up gnome-control-center-2.23.4/capplets/windows/gnome-window-properties.c.standard-icon gnome-control-center-2.23.4/capplets/windows/gnome-window-properties.c
--- gnome-control-center-2.23.4/capplets/windows/gnome-window-properties.c.standard-icon	2008-06-20 14:18:59.000000000 -0400
+++ gnome-control-center-2.23.4/capplets/windows/gnome-window-properties.c	2008-06-20 14:19:16.000000000 -0400
@@ -467,7 +467,7 @@ main (int argc, char **argv)
                 ++i;
         }
 
-        capplet_set_icon (dialog_win, "gnome-window-manager");
+        capplet_set_icon (dialog_win, "preferences-system-windows");
         gtk_widget_show (dialog_win);
 
         gtk_main ();
diff -up gnome-control-center-2.23.4/capplets/windows/window-properties.desktop.in.in.standard-icon gnome-control-center-2.23.4/capplets/windows/window-properties.desktop.in.in
--- gnome-control-center-2.23.4/capplets/windows/window-properties.desktop.in.in.standard-icon	2008-06-20 14:18:39.000000000 -0400
+++ gnome-control-center-2.23.4/capplets/windows/window-properties.desktop.in.in	2008-06-20 14:18:52.000000000 -0400
@@ -2,7 +2,7 @@
 _Name=Windows
 _Comment=Set your window properties
 Exec=gnome-window-properties
-Icon=gnome-window-manager
+Icon=preferences-system-windows
 Terminal=false
 Type=Application
 StartupNotify=true


Index: control-center.spec
===================================================================
RCS file: /cvs/extras/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.374
retrieving revision 1.375
diff -u -r1.374 -r1.375
--- control-center.spec	18 Jun 2008 18:06:40 -0000	1.374
+++ control-center.spec	20 Jun 2008 18:30:20 -0000	1.375
@@ -22,7 +22,7 @@
 Summary: GNOME Control Center
 Name: control-center
 Version: 2.23.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: User Interface/Desktops
@@ -39,6 +39,13 @@
 # minor build breakage in gtk, will be fixed in the next gtk release
 Patch8: gtkmarshal.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=539336
+# http://bugzilla.gnome.org/show_bug.cgi?id=539338
+# http://bugzilla.gnome.org/show_bug.cgi?id=539339
+# http://bugzilla.gnome.org/show_bug.cgi?id=539340
+# http://bugzilla.gnome.org/show_bug.cgi?id=539343
+Patch9: standard-icon.patch
+
 # call the Fedora/RHEL graphical passwd changing apps
 Patch95: control-center-2.23.2-passwd.patch
 Patch96: control-center-2.23.2-gecos.patch
@@ -171,6 +178,7 @@
 %patch6 -p0 -b .warnings
 popd
 %patch8 -p1 -b .gtkmarshal
+%patch9 -p1 -b .standard-icon
 
 # vendor configuration patches
 %patch95 -p1 -b .passwd
@@ -351,6 +359,9 @@
 %dir %{_datadir}/gnome-control-center/keybindings
 
 %changelog
+* Fri Jun 20 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.4-2
+- Use standard icon names for capplets where available
+
 * Wed Jun 18 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.4-1
 - Update to 2.23.4

More information about the fedora-extras-commits mailing list