Mercurial > pidgin.yaz

changeset 14286:a0394e417fab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 16972] iirc, you shouldn't call the functions in prefix.h directly as they might not exist. also add DATADIR to Makefile.am so EvilDennisR can find something else to complain about. committer: Tailor Script <tailor@pidgin.im>
author Tim Ringenbach <marv@pidgin.im>
date Tue, 22 Aug 2006 05:52:03 +0000
parents baf9f997746c
children e01a8316b08b
files libgaim/protocols/qq/Makefile.am libgaim/protocols/qq/qq.c
diffstat 2 files changed, 6 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/libgaim/protocols/qq/Makefile.am	Tue Aug 22 05:30:30 2006 +0000
+++ b/libgaim/protocols/qq/Makefile.am	Tue Aug 22 05:52:03 2006 +0000
@@ -92,7 +92,8 @@
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/libgaim \
-        -DVERSION=\"$(VERSION)\" \
-        $(DEBUG_CFLAGS) \
-        $(GLIB_CFLAGS) \
+	-DVERSION=\"$(VERSION)\" \
+	-DDATADIR=\"$(datadir)\" \
+	$(DEBUG_CFLAGS) \
+	$(GLIB_CFLAGS) \
 	$(GAIM_CFLAGS)
--- a/libgaim/protocols/qq/qq.c	Tue Aug 22 05:30:30 2006 +0000
+++ b/libgaim/protocols/qq/qq.c	Tue Aug 22 05:52:03 2006 +0000
@@ -431,12 +431,11 @@
 	GaimRequestField *field;
 	struct stat img_stat;
 	FILE *file;
-	gchar *filename, *prefix, *img_data, *face;
+	gchar *filename, *img_data, *face;
 	gint size;
 
 	face = g_strdup_printf("qq_%i.png", face_num);
-	prefix = br_extract_prefix(DATADIR);
-	filename = g_build_filename(prefix, "share","pixmaps",
+	filename = g_build_filename(DATADIR, "pixmaps",
 			"gaim","status","default", face, NULL);
 	g_free(face);
 	face = g_strdup_printf("%i", face_num);
@@ -453,7 +452,6 @@
 		fclose(file);
 	}
 	g_free(face);
-	g_free(prefix);
 }
 
 /* Change your status icon (face) */