applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

+Fri Oct 24 17:21:56 2008 Søren Sandmann <sandmann@redhat.com>

Browse source 
+
+	* capplet-stock-icons.c (capplet_register_stock_icons): Get rid of
+	gnome_program_locate_file()
+


svn path=/trunk/; revision=9099
This commit is contained in:
Søren Sandmann Pedersen 2008-10-24 21:27:14 +00:00
parent 5978fd729c
commit 18c19b9be3
3 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
capplets/common/ChangeLog
View file

@ -1,3 +1,8 @@
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()
2008-10-11 Kjartan Maraas <kmaraas@gnome.org>
* Makefile.am: Add CAPPLET_CFLAGS to INCLUDES to make

1
capplets/common/Makefile.am
View file

@ -8,6 +8,7 @@ INCLUDES = \
-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) \

6
capplets/common/capplet-stock-icons.c
View file

@ -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 @@ capplet_register_stock_icons (GtkIconFactory *factory)
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;