gnome-utils r7776 - in trunk/baobab: . pixmaps/24x24 pixmaps/scalable src

[kmaraas svn gnome org]

Author: kmaraas
Date: Tue Jan  8 23:46:09 2008
New Revision: 7776
URL: http://svn.gnome.org/viewvc/gnome-utils?rev=7776&view=rev

Log:
2008-01-05  Christian Kirbach <Christian Kirbach googlemail com>
  
	* pixmaps/24x24/Makefile.am (update-icon-cache): 
	* pixmaps/scalable/Makefile.am (update-icon-cache): run gtk-update-icon-cache for
  	install-hook and uninstall-hook. Fixes #436204
	Original patch by Brian Pepple <bpepple fedoraproject org>

Modified:
   trunk/baobab/ChangeLog
   trunk/baobab/pixmaps/24x24/Makefile.am
   trunk/baobab/pixmaps/scalable/Makefile.am
   trunk/baobab/src/baobab-scan.c
   trunk/baobab/src/baobab-treeview.c
   trunk/baobab/src/baobab.c

Modified: trunk/baobab/pixmaps/24x24/Makefile.am
==============================================================================
--- trunk/baobab/pixmaps/24x24/Makefile.am	(original)
+++ trunk/baobab/pixmaps/24x24/Makefile.am	Tue Jan  8 23:46:09 2008
@@ -17,11 +17,13 @@
 
 gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
 
-install-data-hook:
+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 install, run this:"; \
+		echo "*** Icon cache not updated.  After (un)install, run this:"; \
 		echo "***   $(gtk_update_icon_cache)"; \
 	fi

Modified: trunk/baobab/pixmaps/scalable/Makefile.am
==============================================================================
--- trunk/baobab/pixmaps/scalable/Makefile.am	(original)
+++ trunk/baobab/pixmaps/scalable/Makefile.am	Tue Jan  8 23:46:09 2008
@@ -17,11 +17,13 @@
 
 gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
 
-install-data-hook:
+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 install, run this:"; \
+		echo "*** Icon cache not updated.  After (un)install, run this:"; \
 		echo "***   $(gtk_update_icon_cache)"; \
 	fi

Modified: trunk/baobab/src/baobab-scan.c
==============================================================================
--- trunk/baobab/src/baobab-scan.c	(original)
+++ trunk/baobab/src/baobab-scan.c	Tue Jan  8 23:46:09 2008
@@ -23,6 +23,8 @@
 
 #include <config.h>
 
+#include <string.h>
+
 #include <glib.h>
 #include <gtk/gtk.h>
 #include <libgnomevfs/gnome-vfs.h>

Modified: trunk/baobab/src/baobab-treeview.c
==============================================================================
--- trunk/baobab/src/baobab-treeview.c	(original)
+++ trunk/baobab/src/baobab-treeview.c	Tue Jan  8 23:46:09 2008
@@ -23,6 +23,8 @@
 #include <config.h>
 
 #include <gtk/gtk.h>
+#include <glib.h>
+#include <glib/gprintf.h>
 #include <glib/gi18n.h>
 #include <string.h>
 

Modified: trunk/baobab/src/baobab.c
==============================================================================
--- trunk/baobab/src/baobab.c	(original)
+++ trunk/baobab/src/baobab.c	Tue Jan  8 23:46:09 2008
@@ -416,7 +416,7 @@
 gboolean
 is_excluded_dir (const gchar *dir)
 {
-	g_return_if_fail (dir != NULL);
+	g_return_val_if_fail (dir != NULL, FALSE);
 
 	return (baobab.bbExcludedDirs &&
 		(g_slist_find_custom (baobab.bbExcludedDirs, dir, list_find) != NULL));