gnome-applets r10754 - trunk/gswitchit

[callum svn gnome org]

Author: callum
Date: Wed Mar 12 09:11:07 2008
New Revision: 10754
URL: http://svn.gnome.org/viewvc/gnome-applets?rev=10754&view=rev

Log:
Use tango icons in gswitchit

Modified:
   trunk/gswitchit/ChangeLog
   trunk/gswitchit/GNOME_KeyboardApplet.server.in.in
   trunk/gswitchit/Makefile.am
   trunk/gswitchit/gswitchit-applet.c

Modified: trunk/gswitchit/GNOME_KeyboardApplet.server.in.in
==============================================================================
--- trunk/gswitchit/GNOME_KeyboardApplet.server.in.in	(original)
+++ trunk/gswitchit/GNOME_KeyboardApplet.server.in.in	Wed Mar 12 09:11:07 2008
@@ -33,7 +33,7 @@
         </oaf_attribute>
         <oaf_attribute name="name" type="string" _value="Keyboard Indicator"/>
         <oaf_attribute name="description" type="string" _value="Keyboard layout indicator"/>
-        <oaf_attribute name="panel:icon" type="string" value="gswitchit-applet.png"/>
+        <oaf_attribute name="panel:icon" type="string" value="input-keyboard"/>
         <oaf_attribute name="bugzilla:bugzilla" type="string" value="GNOME"/>
         <oaf_attribute name="bugzilla:product" type="string" value="gnome-applets"/>
         <oaf_attribute name="bugzilla:component" type="string" value="keyboard indicator (gswitchit)"/>

Modified: trunk/gswitchit/Makefile.am
==============================================================================
--- trunk/gswitchit/Makefile.am	(original)
+++ trunk/gswitchit/Makefile.am	Wed Mar 12 09:11:07 2008
@@ -3,7 +3,6 @@
 EXTRA_DIST = \
 	$(server_in_in_files) \
         $(ui_DATA) \
-        $(pixmap_DATA) \
         $(glade_DATA)
 
 libexec_PROGRAMS = gnome-keyboard-applet
@@ -56,8 +55,5 @@
 uidir = $(datadir)/gnome-2.0/ui
 ui_DATA = GNOME_GSwitchItApplet.xml
 
-pixmapdir = $(datadir)/icons/hicolor/48x48/apps
-pixmap_DATA = gswitchit-applet.png gswitchit-properties-capplet.png
-
 glade_DATA = gswitchit.glade
 

Modified: trunk/gswitchit/gswitchit-applet.c
==============================================================================
--- trunk/gswitchit/gswitchit-applet.c	(original)
+++ trunk/gswitchit/gswitchit-applet.c	Wed Mar 12 09:11:07 2008
@@ -489,7 +489,7 @@
 			       strcmp (translator_credits,
 				       "translator-credits") !=
 			       0 ? translator_credits : NULL,
-			       "logo-icon-name", "gswitchit-applet", NULL);
+			       "logo-icon-name", "input-keyboard", NULL);
 }
 
 static void
@@ -600,7 +600,7 @@
 
 	g_set_application_name (_("Keyboard Indicator"));
 
-	gtk_window_set_default_icon_name ("gswitchit-applet");
+	gtk_window_set_default_icon_name ("input-keyboard");
 
 	sia->applet = GTK_WIDGET (applet);