gnome-applets r11205 - in trunk: accessx-status stickynotes

[callum svn gnome org]

Author: callum
Date: Thu Jan 15 03:48:26 2009
New Revision: 11205
URL: http://svn.gnome.org/viewvc/gnome-applets?rev=11205&view=rev

Log:
More libgnome/libgnomeui removal work. Fixes the build too. Bugs 567779, 567775.

Modified:
   trunk/accessx-status/ChangeLog
   trunk/accessx-status/Makefile.am
   trunk/accessx-status/applet.c
   trunk/stickynotes/ChangeLog
   trunk/stickynotes/stickynotes.c

Modified: trunk/accessx-status/Makefile.am
==============================================================================
--- trunk/accessx-status/Makefile.am	(original)
+++ trunk/accessx-status/Makefile.am	Thu Jan 15 03:48:26 2009
@@ -2,7 +2,8 @@
 
 INCLUDES = \
 	$(GNOME_APPLETS_CFLAGS)	\
-	$(GNOME_LIBS2_CFLAGS)
+	$(GNOME_LIBS2_CFLAGS) \
+	-DACCESSX_PIXMAPS_DIR=\""$(datadir)/pixmaps/accessx-status-applet"\"
 
 libexec_PROGRAMS = accessx-status-applet
 

Modified: trunk/accessx-status/applet.c
==============================================================================
--- trunk/accessx-status/applet.c	(original)
+++ trunk/accessx-status/applet.c	Thu Jan 15 03:48:26 2009
@@ -891,17 +891,13 @@
 		gchar *set_name = stock_icons[i].stock_id;
                 icon_set = gtk_icon_set_new ();
 		do {
-			char *filename, *tmp;
+			char *filename;
 			GtkIconSource *source = gtk_icon_source_new ();
-			tmp = g_strdup_printf (GNOME_PIXMAPSDIR
-					"/accessx-status-applet/%s",
-					stock_icons[i].name);
-			filename = gnome_program_locate_file (NULL,
-					GNOME_FILE_DOMAIN_PIXMAP, 
-					  tmp, 
-					  FALSE, NULL);
-			g_free (tmp);
-			if (!filename) {
+			filename = g_build_filename (ACCESSX_PIXMAPS_DIR,
+						     stock_icons[i].name,
+						     NULL);
+			if (g_file_test (filename, G_FILE_TEST_EXISTS | 
+					 G_FILE_TEST_IS_REGULAR)) {
 				GtkIconSet *default_set = 
 					gtk_icon_factory_lookup_default (GTK_STOCK_MISSING_IMAGE);
 				gtk_icon_source_set_pixbuf (source,

Modified: trunk/stickynotes/stickynotes.c
==============================================================================
--- trunk/stickynotes/stickynotes.c	(original)
+++ trunk/stickynotes/stickynotes.c	Thu Jan 15 03:48:26 2009
@@ -22,7 +22,6 @@
 #include <X11/Xatom.h>
 #include <gdk/gdkx.h>
 #define WNCK_I_KNOW_THIS_IS_UNSTABLE 1
-#include <libgnomeui/libgnomeui.h>
 #include <libwnck/libwnck.h>
 #include <string.h>