Mercurial > pidgin.yaz
changeset 24082:4edf36682236
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
| author | SHiNE CsyFeK <csyfek@gmail.com> |
|---|---|
| date | Wed, 22 Oct 2008 15:03:08 +0000 |
| parents | 119d85c40d75 |
| children | d3811bdb6b07 |
| files | libpurple/protocols/qq/ChangeLog libpurple/protocols/qq/Makefile.am libpurple/protocols/qq/qq.c |
| diffstat | 3 files changed, 17 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/qq/ChangeLog Wed Oct 22 15:00:47 2008 +0000 +++ b/libpurple/protocols/qq/ChangeLog Wed Oct 22 15:03:08 2008 +0000 @@ -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
--- a/libpurple/protocols/qq/Makefile.am Wed Oct 22 15:00:47 2008 +0000 +++ b/libpurple/protocols/qq/Makefile.am Wed Oct 22 15:03:08 2008 +0000 @@ -59,6 +59,11 @@ 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 @@ -I$(top_builddir)/libpurple \ -DQQ_BUDDY_ICON_DIR=\"$(datadir)/pixmaps/purple/buddy_icons/qq\" \ $(DEBUG_CFLAGS) \ - $(GLIB_CFLAGS) + $(GLIB_CFLAGS) \ + -DOPENQ_VERSION=\"$(CURRENT_REVISION)\"
--- a/libpurple/protocols/qq/qq.c Wed Oct 22 15:00:47 2008 +0000 +++ b/libpurple/protocols/qq/qq.c Wed Oct 22 15:03:08 2008 +0000 @@ -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 @@ 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);