pidgin.openq: d2e4cd57: 2008.12.06 - flos <lonicerae(at)gmail.co...

[csyfek at gmail.com]

-----------------------------------------------------------------
Revision: d2e4cd570e8e3995be990ee8ddf4fdfb8ce6226c
Ancestor: 2186de6f13f335afd4a6f08a676467cf80228843
Author: csyfek at gmail.com
Date: 2008-12-06T13:27:25
Branch: im.pidgin.pidgin.openq
URL: http://d.pidgin.im/viewmtn/revision/info/d2e4cd570e8e3995be990ee8ddf4fdfb8ce6226c

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

ChangeLog: 

2008.12.06 - flos <lonicerae(at)gmail.com>
	* Removed version checking script in Makefiles since our developers all migrated to monotone
	* Use our development revision as OPENQ_VERSION in qq.c

-------------- next part --------------
============================================================
--- libpurple/protocols/qq/ChangeLog	edafc8da392f2591797d764c494cfe3b01bc89ec
+++ libpurple/protocols/qq/ChangeLog	aa4bb486a6499b7e1df67cc32404d58fdcd8bafa
@@ -1,3 +1,7 @@
+2008.12.06 - flos <lonicerae(at)gmail.com>
+	* Removed version checking script in Makefiles since our developers all migrated to monotone
+	* Use our development revision as OPENQ_VERSION in qq.c
+
 2008.12.05 - flos <lonicerae(at)gmail.com>
 	* Fixed a bug after propagating
 
============================================================
--- libpurple/protocols/qq/Makefile.am	8c0a4dd94e50c0d0018957cd6467eded65d98987
+++ libpurple/protocols/qq/Makefile.am	020c5382862872d6ba26e640519d6ade314792c2
@@ -53,15 +53,6 @@ libqq_la_LDFLAGS = -module -avoid-versio
 
 libqq_la_LDFLAGS = -module -avoid-version
 
-CURRENT_REVISION=$(shell \
-		 if [ -e ./.hg_archival.txt ]; then \
-		   awk 'BEGIN {"grep node .hg_archival.txt" | getline rev; \
-		   rev=substr(rev,7,6); print rev}' > current_revision; \
-		 else \
-		   echo "!hg" > current_revision; \
-		 fi; \
-		 cat ./current_revision)
-
 if STATIC_QQ
 
 st = -DPURPLE_STATIC_PRPL
@@ -83,5 +74,4 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)/libpurple \
 	-DQQ_BUDDY_ICON_DIR=\"$(datadir)/pixmaps/purple/buddy_icons/qq\" \
 	$(DEBUG_CFLAGS) \
-	$(GLIB_CFLAGS) \
-	-DOPENQ_VERSION=\"$(CURRENT_REVISION)\"
+	$(GLIB_CFLAGS)
============================================================
--- libpurple/protocols/qq/Makefile.mingw	cc551dc295a8c17ecd5d8181ea59c7abaf66a23e
+++ libpurple/protocols/qq/Makefile.mingw	9a1280b5dc1399979c091fc7023a4796e3b39f24
@@ -6,14 +6,6 @@ include $(PIDGIN_TREE_TOP)/libpurple/win
 
 PIDGIN_TREE_TOP := ../../..
 include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
-CURRENT_REVISION=$(shell \
-		 if [ -e ./.hg_archival.txt ]; then \
-		   awk 'BEGIN {"grep node .hg_archival.txt" | getline rev; \
-		   rev=substr(rev,7,6); print rev}' > current_revision; \
-		 else \
-		   echo "!hg" > current_revision; \
-		 fi; \
-		 cat ./current_revision)
 
 TARGET = libqq
 TYPE = PLUGIN
@@ -24,7 +16,6 @@ ifeq ($(TYPE),PLUGIN)
 	DLL_INSTALL_DIR =	$(PURPLE_INSTALL_DIR)
 else
 ifeq ($(TYPE),PLUGIN)
-	DEFINES += -DOPENQ_VERSION=\"$(CURRENT_REVISION)\"
 	DLL_INSTALL_DIR =	$(PURPLE_INSTALL_PLUGINS_DIR)
 endif
 endif
============================================================
--- libpurple/protocols/qq/qq.c	339642861c772dd517a3d1cce1e634f9013dab88
+++ libpurple/protocols/qq/qq.c	147df1a07b096a5cf6570b2d7892e38f4943fb97
@@ -56,9 +56,7 @@
 #include "utils.h"
 #include "version.h"
 
-#ifndef OPENQ_VERSION
-#define OPENQ_VERSION           DISPLAY_VERSION
-#endif
+#define OPENQ_VERSION 		"0.3.2-p19" 
 
 static GList *server_list_build(gchar select)
 {
@@ -663,7 +661,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 r%s"), OPENQ_VERSION);
+	title = g_strdup_printf(_("About OpenQ %s"), OPENQ_VERSION);
 	purple_notify_formatted(gc, title, title, NULL, info->str, NULL, NULL);
 
 	g_free(title);