Mercurial > pidgin.yaz
changeset 24603:e8c5688afdcd
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
| author | SHiNE CsyFeK <csyfek@gmail.com> |
|---|---|
| date | Sat, 06 Dec 2008 13:27:25 +0000 |
| parents | 8ee728876ded |
| children | 918738a0bba4 |
| files | libpurple/protocols/qq/ChangeLog libpurple/protocols/qq/Makefile.am libpurple/protocols/qq/Makefile.mingw libpurple/protocols/qq/qq.c |
| diffstat | 4 files changed, 7 insertions(+), 24 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/qq/ChangeLog Fri Dec 05 15:52:02 2008 +0000 +++ b/libpurple/protocols/qq/ChangeLog Sat Dec 06 13:27:25 2008 +0000 @@ -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
--- a/libpurple/protocols/qq/Makefile.am Fri Dec 05 15:52:02 2008 +0000 +++ b/libpurple/protocols/qq/Makefile.am Sat Dec 06 13:27:25 2008 +0000 @@ -53,15 +53,6 @@ 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 @@ -I$(top_builddir)/libpurple \ -DQQ_BUDDY_ICON_DIR=\"$(datadir)/pixmaps/purple/buddy_icons/qq\" \ $(DEBUG_CFLAGS) \ - $(GLIB_CFLAGS) \ - -DOPENQ_VERSION=\"$(CURRENT_REVISION)\" + $(GLIB_CFLAGS)
--- a/libpurple/protocols/qq/Makefile.mingw Fri Dec 05 15:52:02 2008 +0000 +++ b/libpurple/protocols/qq/Makefile.mingw Sat Dec 06 13:27:25 2008 +0000 @@ -6,14 +6,6 @@ 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 @@ DLL_INSTALL_DIR = $(PURPLE_INSTALL_DIR) else ifeq ($(TYPE),PLUGIN) - DEFINES += -DOPENQ_VERSION=\"$(CURRENT_REVISION)\" DLL_INSTALL_DIR = $(PURPLE_INSTALL_PLUGINS_DIR) endif endif
--- a/libpurple/protocols/qq/qq.c Fri Dec 05 15:52:02 2008 +0000 +++ b/libpurple/protocols/qq/qq.c Sat Dec 06 13:27:25 2008 +0000 @@ -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 @@ 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);