changeset 24322:d971d5369b43

2008.10.30 - flos <lonicerae(at)gmail.com> * Fixed a bug which made xgettext failed in buddy_info.c * Fixed a bug in Makefile.am and Makefile.mingw * Updated acknowledgement in qq.c
author SHiNE CsyFeK <csyfek@gmail.com>
date Thu, 30 Oct 2008 12:41:36 +0000
parents e4f4ffd7ed4c
children c3a211cea89f
files libpurple/protocols/qq/ChangeLog libpurple/protocols/qq/Makefile.am libpurple/protocols/qq/Makefile.mingw libpurple/protocols/qq/buddy_info.c libpurple/protocols/qq/qq.c
diffstat 5 files changed, 25 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/qq/ChangeLog	Tue Oct 28 16:59:07 2008 +0000
+++ b/libpurple/protocols/qq/ChangeLog	Thu Oct 30 12:41:36 2008 +0000
@@ -1,3 +1,8 @@
+2008.10.30 - flos <lonicerae(at)gmail.com>
+	* Fixed a bug which made xgettext failed in buddy_info.c
+	* Fixed a bug in Makefile.am and Makefile.mingw
+	* Updated acknowledgement in qq.c
+
 2008.10.28 - flos <lonicerae(at)gmail.com>
 	* Updated AUTHORS
 
--- a/libpurple/protocols/qq/Makefile.am	Tue Oct 28 16:59:07 2008 +0000
+++ b/libpurple/protocols/qq/Makefile.am	Thu Oct 30 12:41:36 2008 +0000
@@ -54,9 +54,13 @@
 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 [ -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
 
--- a/libpurple/protocols/qq/Makefile.mingw	Tue Oct 28 16:59:07 2008 +0000
+++ b/libpurple/protocols/qq/Makefile.mingw	Thu Oct 30 12:41:36 2008 +0000
@@ -6,10 +6,16 @@
 
 PIDGIN_TREE_TOP := ../../..
 include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
+
 CURRENT_REVISION=$(shell \
-		 awk 'BEGIN {"grep node .hg_archival.txt" | getline rev; \
-		 rev=substr(rev,7,6); \
-		 print rev}')
+		 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
 
--- a/libpurple/protocols/qq/buddy_info.c	Tue Oct 28 16:59:07 2008 +0000
+++ b/libpurple/protocols/qq/buddy_info.c	Thu Oct 30 12:41:36 2008 +0000
@@ -69,9 +69,9 @@
 };
 
 static const gchar *genders_zh[] = {
-	N_("-"),
-	N_("\xc4\xd0"),
-	N_("\xc5\xae"),
+	"-",
+	"\xc4\xd0",
+	"\xc5\xae",
 };
 
 #define QQ_FACES	    134
--- a/libpurple/protocols/qq/qq.c	Tue Oct 28 16:59:07 2008 +0000
+++ b/libpurple/protocols/qq/qq.c	Thu Oct 30 12:41:36 2008 +0000
@@ -763,6 +763,7 @@
 	g_string_append(info, "khc(at)pidgin.im<br>\n");
 	g_string_append(info, "qulogic(at)pidgin.im<br>\n");
 	g_string_append(info, "rlaager(at)pidgin.im<br>\n");
+	g_string_append(info, "Huang Guan : http://home.xxsyzx.com<br>\n");
 	g_string_append(info, "OpenQ Google Group : http://groups.google.com/group/openq<br>\n");
 	g_string_append(info, "<br>\n");
 	g_string_append(info, _("<p><i>And, all the boys in the backroom...</i><br>\n"));