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
This commit is contained in:
Jens Granseuer 2008-01-25 18:55:50 +00:00 committed by Jens Granseuer
parent 62dd7faa9e
commit c06bce17af
13 changed files with 28 additions and 52 deletions

View file

@ -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);