remove code for obsolete "stock" icons

2008-01-25  Jens Granseuer  <jensgr@gmx.net>

	* capplet-stock-icons.c: (capplet_init_stock_icons): remove code
	for obsolete "stock" icons

2008-01-25  Jens Granseuer  <jensgr@gmx.net>

	* Makefile.am:
	* keyboard-bell.png:
	* keyboard-cursor.png:
	* keyboard-repeat.png:
	* keyboard-volume.png: remove obsolete icons
	* gnome-keyboard-properties.c: (setup_dialog): don't initialize
	our custom "stock" icons since we don't use them any longer

2008-01-25  Jens Granseuer  <jensgr@gmx.net>

	* Makefile.am:
	* mouse-left.png:
	* mouse-right.png: remove obsolete icons

svn path=/trunk/; revision=8412

capplets/common/ChangeLog

@@ -1,3 +1,8 @@
+2008-01-25  Jens Granseuer  <jensgr@gmx.net>
+
+	* capplet-stock-icons.c: (capplet_init_stock_icons): remove code
+	for obsolete "stock" icons
+
 2007-12-21  Luca Ferretti  <elle.uca@libero.it>
 
 	* gnome-theme-info.c: (gnome_theme_read_meta_theme),

capplets/common/capplet-stock-icons.c

@@ -19,7 +19,7 @@
  * Boston, MA 02111-1307, USA.
  *
  * Authors:
- *	Rajkumar Sivasamy <rajkumar.siva@wipro.com> 
+ *	Rajkumar Sivasamy <rajkumar.siva@wipro.com>
  *	Taken bits of code from panel-stock-icons.c, Thanks Mark <mark@skynet.ie>
  */
 
@@ -29,29 +29,15 @@
 
 #include "capplet-stock-icons.h"
 
-static GtkIconSize keyboard_capplet_icon_size = 0;
-static GtkIconSize mouse_capplet_icon_size = 0;
 static GtkIconSize mouse_capplet_dblclck_icon_size = 0;
 
-GtkIconSize
-keyboard_capplet_icon_get_size (void)
-{
-	return keyboard_capplet_icon_size;
-}
-
-GtkIconSize
-mouse_capplet_icon_get_size (void)
-{
-	return mouse_capplet_icon_size;
-}
-
 GtkIconSize
 mouse_capplet_dblclck_icon_get_size (void)
 {
 	return mouse_capplet_dblclck_icon_size;
 }
 
-typedef struct 
+typedef struct
 {
 	char *stock_id;
 	char *name;
@@ -59,20 +45,9 @@ typedef struct
 
 
 static CappletStockIcon items [] = {
-	{ KEYBOARD_REPEAT, "keyboard-repeat.png" },
-	{ KEYBOARD_CURSOR, "keyboard-cursor.png" },
-	{ KEYBOARD_VOLUME, "keyboard-volume.png" },
-	{ KEYBOARD_BELL, "keyboard-bell.png" },
-	{ ACCESSX_KEYBOARD_BOUNCE, "accessibility-keyboard-bouncekey.png"},
-	{ ACCESSX_KEYBOARD_SLOW, "accessibility-keyboard-slowkey.png"},
-	{ ACCESSX_KEYBOARD_MOUSE, "accessibility-keyboard-mousekey.png"},
-	{ ACCESSX_KEYBOARD_STICK, "accessibility-keyboard-stickykey.png"},
-	{ ACCESSX_KEYBOARD_TOGGLE, "accessibility-keyboard-togglekey.png"},
 	{ MOUSE_DBLCLCK_MAYBE, "double-click-maybe.png"},
 	{ MOUSE_DBLCLCK_ON, "double-click-on.png"},
-	{ MOUSE_DBLCLCK_OFF, "double-click-off.png"},
-	{ MOUSE_RIGHT_HANDED, "mouse-right.png"},
-	{ MOUSE_LEFT_HANDED, "mouse-left.png"}
+	{ MOUSE_DBLCLCK_OFF, "double-click-off.png"}
 };
 
 static void
@@ -84,7 +59,7 @@ capplet_register_stock_icons (GtkIconFactory *factory)
 	source =  gtk_icon_source_new ();
 
 	for (i = 0; i <  G_N_ELEMENTS (items); ++i) {
-		GtkIconSet *icon_set; 
+		GtkIconSet *icon_set;
 		char *filename;
 		filename = gnome_program_locate_file (NULL, GNOME_FILE_DOMAIN_APP_PIXMAP, items[i].name, TRUE, NULL);
 
@@ -112,7 +87,7 @@ capplet_init_stock_icons (void)
 	GtkIconFactory *factory;
 	static gboolean initialized = FALSE;
 
-	if (initialized) 
+	if (initialized)
 		return;
 	initialized = TRUE;
 
@@ -120,14 +95,6 @@ capplet_init_stock_icons (void)
 	gtk_icon_factory_add_default (factory);
 	capplet_register_stock_icons (factory);
 
-	keyboard_capplet_icon_size = gtk_icon_size_register ("keyboard-capplet",
-							      KEYBOARD_CAPPLET_DEFAULT_ICON_SIZE,
-							      KEYBOARD_CAPPLET_DEFAULT_ICON_SIZE);
-
-	mouse_capplet_icon_size = gtk_icon_size_register ("mouse-capplet",
-							   MOUSE_CAPPLET_DEFAULT_WIDTH,
-							   MOUSE_CAPPLET_DEFAULT_HEIGHT);
-
 	mouse_capplet_dblclck_icon_size = gtk_icon_size_register ("mouse-capplet-dblclck-icon",
 								   MOUSE_CAPPLET_DBLCLCK_ICON_SIZE,
 								   MOUSE_CAPPLET_DBLCLCK_ICON_SIZE);

capplets/keyboard/ChangeLog

@@ -1,3 +1,13 @@
+2008-01-25  Jens Granseuer  <jensgr@gmx.net>
+
+	* Makefile.am:
+	* keyboard-bell.png:
+	* keyboard-cursor.png:
+	* keyboard-repeat.png:
+	* keyboard-volume.png: remove obsolete icons
+	* gnome-keyboard-properties.c: (setup_dialog): don't initialize
+	our custom stock icons since we don't use them any longer
+
 2008-01-16  Denis Washington  <denisw@svn.gnome.org>
 
 	* gnome-keyboard-properties.glade:

capplets/keyboard/Makefile.am

@@ -22,13 +22,6 @@ gnome_keyboard_properties_LDADD = $(GNOMECC_CAPPLETS_LIBS) $(LIBGNOMEKBDUI_LIBS)
 Gladedir   = $(pkgdatadir)/glade
 Glade_DATA = gnome-keyboard-properties.glade
 
-pixmapsdir   = $(pkgdatadir)/pixmaps
-pixmaps_DATA = \
-	keyboard-repeat.png		\
-	keyboard-cursor.png		\
-	keyboard-volume.png		\
-	keyboard-bell.png
-
 desktopdir = $(datadir)/applications
 Desktop_in_files = keyboard.desktop.in
 desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
@@ -40,4 +33,4 @@ INCLUDES = \
 	-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
 	-DGNOMECC_GLADE_DIR="\"$(pkgdatadir)/glade\""
 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
-EXTRA_DIST = $(Glade_DATA) $(pixmaps_DATA)
+EXTRA_DIST = $(Glade_DATA)

capplets/keyboard/gnome-keyboard-properties.c

@@ -131,9 +131,6 @@ setup_dialog (GladeXML * dialog, GConfChangeSet * changeset)
 {
 	GObject *peditor;
 
-	/* load all the images */
-	capplet_init_stock_icons ();
-
 	peditor = gconf_peditor_new_boolean
 	    (changeset, "/desktop/gnome/peripherals/keyboard/repeat",
 	     WID ("repeat_toggle"), NULL);

capplets/mouse/ChangeLog

@@ -1,3 +1,9 @@
+2008-01-25  Jens Granseuer  <jensgr@gmx.net>
+
+	* Makefile.am:
+	* mouse-left.png:
+	* mouse-right.png: remove obsolete icons
+
 2008-01-25  Jens Granseuer  <jensgr@gmx.net>
 
 	* gnome-mouse-properties.c: (delay_value_changed_cb), (setup_dialog):

capplets/mouse/Makefile.am

@@ -15,9 +15,7 @@ pixmapdir  = $(pkgdatadir)/pixmaps
 pixmap_DATA = \
 	double-click-on.png		\
 	double-click-off.png		\
-	double-click-maybe.png		\
-	mouse-left.png			\
-	mouse-right.png
+	double-click-maybe.png
 
 Gladedir   = $(pkgdatadir)/glade
 Glade_DATA = gnome-mouse-properties.glade