gucharmap r1771 - in trunk: . gucharmap pixmaps

[chpe svn gnome org]

Author: chpe
Date: Mon Mar 31 22:29:57 2008
New Revision: 1771
URL: http://svn.gnome.org/viewvc/gucharmap?rev=1771&view=rev

Log:
Use accessories-character-map icon. Bug #331670.


Removed:
   trunk/pixmaps/gucharmap.png
Modified:
   trunk/gucharmap.desktop.in.in
   trunk/gucharmap/gucharmap-window.h
   trunk/pixmaps/Makefile.am

Modified: trunk/gucharmap.desktop.in.in
==============================================================================
--- trunk/gucharmap.desktop.in.in	(original)
+++ trunk/gucharmap.desktop.in.in	Mon Mar 31 22:29:57 2008
@@ -3,7 +3,7 @@
 _Name=Character Map
 _Comment=Insert special characters into documents
 Exec=gucharmap
-Icon=gucharmap
+Icon=accessories-character-map
 Terminal=false
 Type=Application
 Categories=GNOME;GTK;Utility;

Modified: trunk/gucharmap/gucharmap-window.h
==============================================================================
--- trunk/gucharmap/gucharmap-window.h	(original)
+++ trunk/gucharmap/gucharmap-window.h	Mon Mar 31 22:29:57 2008
@@ -67,7 +67,7 @@
   GtkWindowClass parent_class;
 };
 
-#define GUCHARMAP_ICON_NAME "gucharmap"
+#define GUCHARMAP_ICON_NAME "accessories-character-map"
 
 GType       gucharmap_window_get_type  (void);
 

Modified: trunk/pixmaps/Makefile.am
==============================================================================
--- trunk/pixmaps/Makefile.am	(original)
+++ trunk/pixmaps/Makefile.am	Mon Mar 31 22:29:57 2008
@@ -1,5 +1,3 @@
-## $Id: Makefile.am,v 1.10 2006/03/26 20:39:44 behdad Exp $
-##
 ## Copyright (c) 2002  Noah Levitt <nlevitt users sourceforge net>
 ##
 ## This program is free software; you can redistribute it and/or modify it
@@ -17,21 +15,4 @@
 ## 59 Temple Place, Suite 330, Boston, MA 02110-1301  USA
 ##
 
-
-icondir = $(datadir)/icons/hicolor/48x48/apps
-icon_DATA = gucharmap.png
-
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
-
-install-data-hook: update-icon-cache
-uninstall-hook: update-icon-cache
-update-icon-cache:
-	@-if test -z "$(DESTDIR)"; then \
-		echo "Updating Gtk icon cache."; \
-		$(gtk_update_icon_cache); \
-	else \
-		echo "*** Icon cache not updated.  After (un)install, run this:"; \
-		echo "***   $(gtk_update_icon_cache)"; \
-	fi
-
-EXTRA_DIST = $(icon_DATA) gucharmap.ico
+EXTRA_DIST = gucharmap.ico