gnome-applets r10819 - trunk/charpick

[jhaitsma svn gnome org]

Author: jhaitsma
Date: Tue Apr 29 10:51:02 2008
New Revision: 10819
URL: http://svn.gnome.org/viewvc/gnome-applets?rev=10819&view=rev

Log:
2008-04-29  Jaap A. Haitsma  <jaap haitsma org>

	reviewed by: Callum McKenzie

	* GNOME_CharpickerApplet.server.in.in:
	* Makefile.am:
	* charpick.c: (about), (charpicker_applet_fill):
	Use standard tango icon for charpick. Fixes bug #519765


Removed:
   trunk/charpick/charpick.png
Modified:
   trunk/charpick/ChangeLog
   trunk/charpick/GNOME_CharpickerApplet.server.in.in
   trunk/charpick/Makefile.am
   trunk/charpick/charpick.c

Modified: trunk/charpick/GNOME_CharpickerApplet.server.in.in
==============================================================================
--- trunk/charpick/GNOME_CharpickerApplet.server.in.in	(original)
+++ trunk/charpick/GNOME_CharpickerApplet.server.in.in	Tue Apr 29 10:51:02 2008
@@ -24,7 +24,7 @@
 	</oaf_attribute>
 	<oaf_attribute name="name" type="string" _value="Character Palette"/>
 	<oaf_attribute name="description" type="string" _value="Insert characters"/>
-	<oaf_attribute name="panel:icon" type="string" value="charpick.png"/>
+	<oaf_attribute name="panel:icon" type="string" value="accessories-character-map"/>
 	<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="charpick"/>

Modified: trunk/charpick/Makefile.am
==============================================================================
--- trunk/charpick/Makefile.am	(original)
+++ trunk/charpick/Makefile.am	Tue Apr 29 10:51:02 2008
@@ -16,9 +16,6 @@
 		       $(GNOME_APPLETS_LIBS)	\
 		       $(GUCHARMAP_LIBS)
 
-charpickbitmapsdir = $(iconsdir)/hicolor/48x48/apps
-charpickbitmaps_DATA = charpick.png
-
 serverdir       = $(libdir)/bonobo/servers
 server_in_files = GNOME_CharpickerApplet.server.in
 server_DATA     = $(server_in_files:.server.in=.server)

Modified: trunk/charpick/charpick.c
==============================================================================
--- trunk/charpick/charpick.c	(original)
+++ trunk/charpick/charpick.c	Tue Apr 29 10:51:02 2008
@@ -599,7 +599,7 @@
 	"authors",	authors,
 	"documenters",	documenters,
 	"translator-credits",	_("translator-credits"),
-	"logo-icon-name",	"charpick",
+	"logo-icon-name",	"accessories-character-map",
 	NULL);
 }
 
@@ -742,7 +742,7 @@
 
   g_set_application_name (_("Character Palette"));
   
-  gtk_window_set_default_icon_name ("charpick");
+  gtk_window_set_default_icon_name ("accessories-character-map");
 
   panel_applet_set_background_widget (applet, GTK_WIDGET (applet));