diff options
| author | Callum McKenzie <callum@src.gnome.org> | 2009-01-15 03:48:26 +0000 |
|---|---|---|
| committer | Callum McKenzie <callum@src.gnome.org> | 2009-01-15 03:48:26 +0000 |
| commit | cdfed1ff741ee16908a9786e44a77880278ddfb0 (patch) | |
| tree | 50dfedce504eb008fcf19a5ea884133afc3cfcb6 | |
| parent | cd65f76646f1fd06b8d9ad165ec62128aeb6231d (diff) | |
More libgnome/libgnomeui removal work. Fixes the build too. Bugs 567779, 567775.
svn path=/trunk/; revision=11205
| -rw-r--r-- | accessx-status/ChangeLog | 6 | ||||
| -rw-r--r-- | accessx-status/Makefile.am | 3 | ||||
| -rw-r--r-- | accessx-status/applet.c | 16 | ||||
| -rw-r--r-- | stickynotes/ChangeLog | 4 | ||||
| -rw-r--r-- | stickynotes/stickynotes.c | 1 |
5 files changed, 18 insertions, 12 deletions
diff --git a/accessx-status/ChangeLog b/accessx-status/ChangeLog index 95440062d..b6579a339 100644 --- a/accessx-status/ChangeLog +++ b/accessx-status/ChangeLog @@ -1,3 +1,9 @@ +2009-01-15 Callum McKenzie <callum@spooky-possum.org> + + * Makefile.am + * applet.c: Replace gnome_program_locate_file now that we're not + #including any gnome headers. Bug 567779. + ==================== 2.25.3 ====================== ==================== 2.25.2 ====================== diff --git a/accessx-status/Makefile.am b/accessx-status/Makefile.am index 9356593e7..579bd7189 100644 --- a/accessx-status/Makefile.am +++ b/accessx-status/Makefile.am @@ -2,7 +2,8 @@ SUBDIRS = docs pixmaps INCLUDES = \ $(GNOME_APPLETS_CFLAGS) \ - $(GNOME_LIBS2_CFLAGS) + $(GNOME_LIBS2_CFLAGS) \ + -DACCESSX_PIXMAPS_DIR=\""$(datadir)/pixmaps/accessx-status-applet"\" libexec_PROGRAMS = accessx-status-applet diff --git a/accessx-status/applet.c b/accessx-status/applet.c index 0206e0b35..301eb71ab 100644 --- a/accessx-status/applet.c +++ b/accessx-status/applet.c @@ -891,17 +891,13 @@ accessx_applet_add_stock_icons (AccessxStatusApplet *sapplet, GtkWidget *widget) 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, diff --git a/stickynotes/ChangeLog b/stickynotes/ChangeLog index d799e698b..368a5c39a 100644 --- a/stickynotes/ChangeLog +++ b/stickynotes/ChangeLog @@ -1,3 +1,7 @@ +2009-01-15 Callum McKenzie <callum@spooky-possum.org> + + * stickynotes.c: We aren't using libgnomeui anymore. Bug 567775. + ==================== 2.25.3 ====================== ==================== 2.25.2 ====================== diff --git a/stickynotes/stickynotes.c b/stickynotes/stickynotes.c index d69e1a496..61133383a 100644 --- a/stickynotes/stickynotes.c +++ b/stickynotes/stickynotes.c @@ -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> |