[Buoh-dev] CVS commit to /cvsroot/buoh/buoh/data by carlosgc

[noreply at forge.novell.com (noreply forge novell com)]

CVS commit to /cvsroot/buoh/buoh/data by carlosgc

Modified Files:
	Makefile.am buoh.desktop.in 
Removed Files:
	buoh16x16.png buoh64x64.png 
Log Message:
2006-09-25  Carlos Garcia Campos  <carlosgc gnome org>
	* INSTALL: Removed, it's a generated file
	* configure.in: Don't use deprecated AM init macro
	* src/buoh-comic-loader.c: Remove stupid debug message
	* data/Makefile.am:
	* data/buoh.desktop.in:
	* data/icons/Makefile.am:
	* data/icons/16x16/Makefile.am:
	* data/icons/16x16/buoh.png:
	* data/icons/64x64/Makefile.am:
	* data/icons/64x64/buoh.png:
	* src/buoh-view-message.c:
	* src/buoh-view.c:
	* src/buoh-window.c:
	* src/main.c:
	Install icons acording to the icon theme specification.

===================================================================
RCS file: /cvsroot/buoh/buoh/data/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- /cvsroot/buoh/buoh/data/Makefile.am	2005/09/26 17:42:25	1.8
+++ /cvsroot/buoh/buoh/data/Makefile.am	2006/09/25 18:18:32	1.9
@@ -1,15 +1,13 @@
+SUBDIRS = icons
+
 @INTLTOOL_SCHEMAS_RULE@
 
 comicsdir = $(comics_dir)
-pixmapsdir = $(pixmaps_dir)
 uidir = $(ui_dir)
 schemadir = $(GCONF_SCHEMA_FILE_DIR)
 
 comics_DATA = comics.xml
 ui_DATA = buoh-ui.xml
-pixmaps_DATA =     		\
-             buoh64x64.png 	\
-             buoh16x16.png
 
 schema_in_files = buoh.schemas.in
 schema_DATA = $(schema_in_files:.schemas.in=.schemas)
@@ -18,8 +16,24 @@
 Applications_in_files = buoh.desktop.in
 Applications_DATA = $(Applications_in_files:.desktop.in=.desktop)
 
-install-data-local:
-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA)
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+
+install-data-hook:
+if GCONF_SCHEMAS_INSTALL
+	if test -z "$(DESTDIR)" ; then \
+	   for p in $(schema_DATA) ; do \
+	   GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/data/$$p >&1 > /dev/null; \
+	   done \
+	fi
+endif
+	if test -z "$(DESTDIR)"; then \
+	   echo "Updating Gtk icon cache."; \
+	   $(gtk_update_icon_cache); \
+	else \
+	   echo "*** Icon cache not updated.  After install, run this:"; \
+	   echo "***   $(gtk_update_icon_cache)"; \
+	fi
+
 
 DISTCLEANFILES =	 	\
 		buoh.desktop    \
@@ -31,7 +45,6 @@
 EXTRA_DIST =                    	\
 		$(comics_DATA)		\
 		$(ui_DATA)		\
-		$(pixmaps_DATA)		\
 		$(schema_in_files)      \
 		$(Applications_in_files)
 
===================================================================
RCS file: /cvsroot/buoh/buoh/data/buoh.desktop.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- /cvsroot/buoh/buoh/data/buoh.desktop.in	2005/09/30 16:13:46	1.3
+++ /cvsroot/buoh/buoh/data/buoh.desktop.in	2006/09/25 18:18:32	1.4
@@ -2,9 +2,9 @@
 _Name=Buoh Online Comics Reader
 _Comment=Read your favourite comics
 Exec=buoh
-Icon=buoh64x64.png
-Terminal=0
+Icon=buoh
+Terminal=true
 Type=Application
-Categories=Application;Utility;
+Categories=GNOME;GTK;Application;Utility;
 StartupNotify=true
 Encoding=UTF-8
rcsdiff: /cvsroot/buoh/buoh/data/RCS/buoh16x16.png,v: No such file or directory
rcsdiff: /cvsroot/buoh/buoh/data/RCS/buoh64x64.png,v: No such file or directory