grim/guifications2

Make all our icons happy!
org.guifications.gf2
2007-02-25, Gary Kramlich
81e6940b7c9f
Parents 83af6f055aab
Children 72822a47453f
Make all our icons happy!
--- a/VERSION Sat Feb 24 22:25:50 2007 -0500
+++ b/VERSION Sun Feb 25 01:29:20 2007 -0500
@@ -1,1 +1,1 @@
-2.13svn
+2.13mtn
--- a/pixmaps/Makefile.am Sat Feb 24 22:25:50 2007 -0500
+++ b/pixmaps/Makefile.am Sun Feb 25 01:29:20 2007 -0500
@@ -29,5 +29,5 @@
Makefile.mingw \
$(conf_images)
-guificationsconfpixdir = $(GAIM_DATADIR)/pixmaps/gaim/guifications/conf
+guificationsconfpixdir = $(PIDGIN_DATADIR)/pixmaps/pidgin/guifications/conf
guificationsconfpix_DATA = $(conf_images)
--- a/src/Makefile.am Sat Feb 24 22:25:50 2007 -0500
+++ b/src/Makefile.am Sun Feb 25 01:29:20 2007 -0500
@@ -66,8 +66,8 @@
AM_CPPFLAGS = \
-DVERSION=\"$(VERSION)\" \
- -DDATADIR=\"$(GAIM_DATADIR)\" \
- -DLOCALEDIR=\"$(GAIM_DATADIR)/locale\" \
+ -DDATADIR=\"$(PIDGIN_DATADIR)\" \
+ -DLOCALEDIR=\"$(PIDGIN_DATADIR)/locale\" \
$(BINRELOC_CFLAGS) \
$(DEBUG_CFLAGS) \
$(GTK_CFLAGS) \
--- a/src/gf_stock.c Sat Feb 24 22:25:50 2007 -0500
+++ b/src/gf_stock.c Sun Feb 25 01:29:20 2007 -0500
@@ -29,9 +29,9 @@
static GtkIconFactory *icon_factory;
-static gchar *
+static inline gchar *
gf_stock_file_name(const gchar *file_name) {
- return g_build_filename(DATADIR, "pixmaps", "gaim", "guifications",
+ return g_build_filename(DATADIR, "pixmaps", "pidgin", "guifications",
"conf", file_name, NULL);
}
--- a/src/gf_theme.c Sat Feb 24 22:25:50 2007 -0500
+++ b/src/gf_theme.c Sun Feb 25 01:29:20 2007 -0500
@@ -349,7 +349,7 @@
const gchar *file;
gint i;
- probe_dirs[0] = g_build_filename(DATADIR, "pixmaps", "gaim",
+ probe_dirs[0] = g_build_filename(DATADIR, "pixmaps", "pidgin",
"guifications", "themes", NULL);
probe_dirs[1] = g_build_filename(gaim_user_dir(), "guifications", "themes",
NULL);