[Gaim-commits] SF.net SVN: gaim: [16972] trunk/libgaim/protocols/qq

[<ma...@us...>]

Revision: 16972
Author:   marv_sf
Date:     2006-08-21 22:52:03 -0700 (Mon, 21 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16972&view=rev

Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/libgaim/protocols/qq/Makefile.am
    trunk/libgaim/protocols/qq/qq.c
Modified: trunk/libgaim/protocols/qq/Makefile.am
===================================================================
--- trunk/libgaim/protocols/qq/Makefile.am	2006-08-22 05:30:30 UTC (rev 16971)
+++ trunk/libgaim/protocols/qq/Makefile.am	2006-08-22 05:52:03 UTC (rev 16972)
@@ -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)

Modified: trunk/libgaim/protocols/qq/qq.c
===================================================================
--- trunk/libgaim/protocols/qq/qq.c	2006-08-22 05:30:30 UTC (rev 16971)
+++ trunk/libgaim/protocols/qq/qq.c	2006-08-22 05:52:03 UTC (rev 16972)
@@ -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) */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.