gtranslator r3548 - in trunk: . plugins/charmap

[icq svn gnome org]

Author: icq
Date: Tue Apr  1 13:50:36 2008
New Revision: 3548
URL: http://svn.gnome.org/viewvc/gtranslator?rev=3548&view=rev

Log:
2008-04-01  Ignacio Casal Quinteiro  <nacho resa gmail com>

        * plugins/charmap/Makefile.am:
        * plugins/charmap/gucharmap.ico:
        * plugins/charmap/charmap-plugin.c:
        Added gucharmap icon. (Fixes bug #513684)



Added:
   trunk/plugins/charmap/gucharmap.ico   (contents, props changed)
Modified:
   trunk/ChangeLog
   trunk/plugins/charmap/Makefile.am
   trunk/plugins/charmap/charmap-plugin.c

Modified: trunk/plugins/charmap/Makefile.am
==============================================================================
--- trunk/plugins/charmap/Makefile.am	(original)
+++ trunk/plugins/charmap/Makefile.am	Tue Apr  1 13:50:36 2008
@@ -4,6 +4,7 @@
 INCLUDES = \
 	-I$(top_srcdir) 				\
 	-I$(top_srcdir)/src				\
+	-I$(top_srcdir)/src/toolbareditor               \
 	-I$(top_srcdir)/src/plugin-system		\
 	$(GTRANSLATOR_CFLAGS) 				\
 	$(GUCHARMAP_CFLAGS)				\
@@ -24,6 +25,10 @@
 	$(GTRANSLATOR_LIBS)					\
 	$(GUCHARMAP_LIBS)
 
+pixmaps_dir = $(datadir)/pixmaps/gtranslator
+pixmaps__DATA = \
+        gucharmap.ico
+
 # Plugin Info
 
 plugin_in_files = charmap.gtranslator-plugin.desktop.in

Modified: trunk/plugins/charmap/charmap-plugin.c
==============================================================================
--- trunk/plugins/charmap/charmap-plugin.c	(original)
+++ trunk/plugins/charmap/charmap-plugin.c	Tue Apr  1 13:50:36 2008
@@ -26,6 +26,7 @@
 #include "charmap-panel.h"
 
 #include <glib/gi18n-lib.h>
+#include "application.h"
 #include "window.h"
 #include <gucharmap/gucharmap-table.h>
 #include <gucharmap/gucharmap-unicode-info.h>
@@ -234,13 +235,16 @@
 		image = gtk_image_new_from_icon_name ("gucharmap",
 						      GTK_ICON_SIZE_MENU);*/
 
+	gtranslator_application_register_icon (GTR_APP, "gucharmap.ico",
+					       "charmap-plugin-icon");
+	
 	data->panel = create_charmap_panel (window);
 	
 	gtranslator_window_add_widget (window,
 				       data->panel,
 				       "GtranslatorCharmapPlugin",
 				       _("Character Map"),
-				       NULL,
+				       "charmap-plugin-icon",
 				       GTR_WINDOW_PLACEMENT_LEFT);
 
 	//gtk_object_sink (GTK_OBJECT (image));

Added: trunk/plugins/charmap/gucharmap.ico
==============================================================================
Binary file. No diff available.