pidgin.openq: 6fc65db6: 2008.10.07 - lonicerae <lonicerae(at)gma...

[csyfek at gmail.com]

-----------------------------------------------------------------
Revision: 6fc65db67dac591fb779148d0db1e213f24b695b
Ancestor: d481604e105f793e895e7f2e472eb29d59eeaf9a
Author: csyfek at gmail.com
Date: 2008-10-22T15:03:08
Branch: im.pidgin.pidgin.openq
URL: http://d.pidgin.im/viewmtn/revision/info/6fc65db67dac591fb779148d0db1e213f24b695b

Modified files:
        libpurple/protocols/qq/ChangeLog
        libpurple/protocols/qq/Makefile.am
        libpurple/protocols/qq/qq.c

ChangeLog: 

2008.10.07 - lonicerae <lonicerae(at)gmail.com>
	* Added some defensive code for 'action' series functions of qq.c
2008.10.07 - lonicerae <lonicerae(at)gmail.com>
	* Update 'version display'
	* Merge lonicerae and ccpaging into trunk

-------------- next part --------------
============================================================
--- libpurple/protocols/qq/ChangeLog	57e0c7658fdb473fed731d2aeed7af85e2993689
+++ libpurple/protocols/qq/ChangeLog	480fd6809badb55727e27f61e9865bde0664b51a
@@ -1,3 +1,9 @@
+2008.10.07 - lonicerae <lonicerae(at)gmail.com>
+	* Update 'version display'
+
+2008.10.07 - lonicerae <lonicerae(at)gmail.com>
+	* Added some defensive code for 'action' series functions of qq.c
+
 2008.10.07 - ccpaging <ccpaging(at)gmail.com>
 	* Update buddy icon
 
============================================================
--- libpurple/protocols/qq/Makefile.am	7b58ebc44b1131d5c8d7ee3b6e731725576d7a81
+++ libpurple/protocols/qq/Makefile.am	a1dd9472927a1f3089b9ed4ecc3c47c6cfe0c584
@@ -59,6 +59,11 @@ libqq_la_LDFLAGS = -module -avoid-versio
 
 libqq_la_LDFLAGS = -module -avoid-version
 
+CURRENT_REVISION=$(shell \
+		 awk 'BEGIN {"grep node .hg_archival.txt" | getline rev; \
+		 rev=substr(rev,7,6); \
+		 print rev}')
+
 if STATIC_QQ
 
 st = -DPURPLE_STATIC_PRPL
@@ -80,4 +85,5 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)/libpurple \
 	-DQQ_BUDDY_ICON_DIR=\"$(datadir)/pixmaps/purple/buddy_icons/qq\" \
 	$(DEBUG_CFLAGS) \
-	$(GLIB_CFLAGS)
+	$(GLIB_CFLAGS) \
+	-DOPENQ_VERSION=\"$(CURRENT_REVISION)\"
============================================================
--- libpurple/protocols/qq/qq.c	f35eac22c31bb6e65b3848ec4a571641bab428b4
+++ libpurple/protocols/qq/qq.c	b617fda0eb00749525f3b0fcdadde412bce288b1
@@ -58,7 +58,10 @@
 
 #define OPENQ_AUTHOR            "Puzzlebird"
 #define OPENQ_WEBSITE           "http://openq.sourceforge.net"
+
+#ifndef OPENQ_VERSION
 #define OPENQ_VERSION           DISPLAY_VERSION
+#endif
 
 static GList *server_list_build(gchar select)
 {
@@ -701,7 +704,7 @@ static void action_about_openq(PurplePlu
 	g_string_append(info, _("<i>Feel free to join us!</i> :)"));
 	g_string_append(info, "</body></html>");
 
-	title = g_strdup_printf(_("About OpenQ %s"), OPENQ_VERSION);
+	title = g_strdup_printf(_("About OpenQ r%s"), OPENQ_VERSION);
 	purple_notify_formatted(gc, NULL, title, NULL, info->str, NULL, NULL);
 
 	g_free(title);