gnome-control-center r9099 - trunk/capplets/common

[ssp svn gnome org]

Author: ssp
Date: Fri Oct 24 21:27:14 2008
New Revision: 9099
URL: http://svn.gnome.org/viewvc/gnome-control-center?rev=9099&view=rev

Log:
+Fri Oct 24 17:21:56 2008  SÃren Sandmann  <sandmann redhat com>
+
+	* capplet-stock-icons.c (capplet_register_stock_icons): Get rid of
+	gnome_program_locate_file()
+



Modified:
   trunk/capplets/common/ChangeLog
   trunk/capplets/common/Makefile.am
   trunk/capplets/common/capplet-stock-icons.c

Modified: trunk/capplets/common/Makefile.am
==============================================================================
--- trunk/capplets/common/Makefile.am	(original)
+++ trunk/capplets/common/Makefile.am	Fri Oct 24 21:27:14 2008
@@ -8,6 +8,7 @@
 	-DINSTALL_PREFIX=\"$(prefix)\"					\
 	-I$(top_srcdir)							\
 	-I$(top_srcdir)/libwindow-settings				\
+	-DPIXMAP_DIR=\""$(datadir)/gnome-control-center/pixmaps"\"	\
 	$(CAPPLET_CFLAGS)						\
 	$(DBUS_CFLAGS)							\
 	$(GNOME_DESKTOP_CFLAGS)						\

Modified: trunk/capplets/common/capplet-stock-icons.c
==============================================================================
--- trunk/capplets/common/capplet-stock-icons.c	(original)
+++ trunk/capplets/common/capplet-stock-icons.c	Fri Oct 24 21:27:14 2008
@@ -25,7 +25,7 @@
 
 #include <gtk/gtkstock.h>
 #include <gtk/gtkiconfactory.h>
-#include <gnome.h>
+#include <glib/gi18n.h>
 
 #include "capplet-stock-icons.h"
 
@@ -61,10 +61,10 @@
 	for (i = 0; i <  G_N_ELEMENTS (items); ++i) {
 		GtkIconSet *icon_set;
 		char *filename;
-		filename = gnome_program_locate_file (NULL, GNOME_FILE_DOMAIN_APP_PIXMAP, items[i].name, TRUE, NULL);
+		filename = g_build_filename (PIXMAP_DIR, items[i].name, NULL);
 
 		if (!filename) {
-			g_warning (_("Unable to load stock icon '%s'\n"), items[i].name);
+		        g_warning (_("Unable to load stock icon '%s'\n"), items[i].name);
 			icon_set = gtk_icon_factory_lookup_default (GTK_STOCK_MISSING_IMAGE);
 			gtk_icon_factory_add (factory, items[i].stock_id, icon_set);
 			continue;