Mercurial > pidgin.yaz
changeset 21031:afb4704781ed
merge of '74f5f273ea24887c8df0384ce8795613dfbbd7ee'
and 'df5eddde2a5d7ede22d8136c865b525bf6c0c677'
| author | Will Thompson <will.thompson@collabora.co.uk> |
|---|---|
| date | Sat, 27 Oct 2007 17:47:48 +0000 |
| parents | 42ecde230f91 (current diff) 3cc856ca2338 (diff) |
| children | acbbcf6b6b46 9347a942b7cd ec9c30ce628d |
| files | |
| diffstat | 85 files changed, 141 insertions(+), 117 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Sat Oct 27 13:27:31 2007 +0000 +++ b/configure.ac Sat Oct 27 17:47:48 2007 +0000 @@ -283,6 +283,17 @@ AC_SUBST(GLIB_CFLAGS) AC_SUBST(GLIB_LIBS) +AC_ARG_WITH([extraversion], + AC_HELP_STRING([--with-extraversion=STRING], + [extra version number to be displayed in Help->About and --help (for packagers)]), + EXTRA_VERSION=$withval) + +if test x"$EXTRA_VERSION" != "x" ; then + AC_DEFINE_UNQUOTED(DISPLAY_VERSION, "$VERSION-$EXTRA_VERSION", [display version info]) +else + AC_DEFINE_UNQUOTED(DISPLAY_VERSION, "$VERSION", [display version info]) +fi + AC_ARG_WITH(x, [], with_x="$withval", with_x="yes") AC_ARG_ENABLE(gtkui, [AC_HELP_STRING([--disable-gtkui],
--- a/finch/finch.c Sat Oct 27 13:27:31 2007 +0000 +++ b/finch/finch.c Sat Oct 27 17:47:48 2007 +0000 @@ -203,7 +203,7 @@ char *text; if (terse) { - text = g_strdup_printf(_("%s. Try `%s -h' for more information.\n"), VERSION, name); + text = g_strdup_printf(_("%s. Try `%s -h' for more information.\n"), DISPLAY_VERSION, name); } else { text = g_strdup_printf(_("%s\n" "Usage: %s [OPTION]...\n\n" @@ -211,7 +211,7 @@ " -d, --debug print debugging messages to stdout\n" " -h, --help display this help and exit\n" " -n, --nologin don't automatically login\n" - " -v, --version display the current version and exit\n"), VERSION, name); + " -v, --version display the current version and exit\n"), DISPLAY_VERSION, name); } purple_print_utf8_to_console(stdout, text); @@ -298,7 +298,7 @@ /* Translators may want to transliterate the name. It is not to be translated. */ gnt_quit(); - printf("%s %s\n", _("Finch"), VERSION); + printf("%s %s\n", _("Finch"), DISPLAY_VERSION); return 0; }
--- a/finch/gntconv.c Sat Oct 27 13:27:31 2007 +0000 +++ b/finch/gntconv.c Sat Oct 27 17:47:48 2007 +0000 @@ -1039,7 +1039,7 @@ PurpleCmdStatus status; if (!g_ascii_strcasecmp(args[0], "version")) { - tmp = g_strdup_printf("me is using Finch v%s.", VERSION); + tmp = g_strdup_printf("me is using Finch v%s.", DISPLAY_VERSION); markup = g_markup_escape_text(tmp, -1); status = purple_cmd_do_command(conv, tmp, markup, error);
--- a/finch/plugins/gntclipboard.c Sat Oct 27 13:27:31 2007 +0000 +++ b/finch/plugins/gntclipboard.c Sat Oct 27 17:47:48 2007 +0000 @@ -156,7 +156,7 @@ PURPLE_PRIORITY_DEFAULT, "gntclipboard", N_("GntClipboard"), - VERSION, + DISPLAY_VERSION, N_("Clipboard plugin"), N_("When the gnt clipboard contents change, " "the contents are made available to X, if possible."),
--- a/finch/plugins/gntgf.c Sat Oct 27 13:27:31 2007 +0000 +++ b/finch/plugins/gntgf.c Sat Oct 27 17:47:48 2007 +0000 @@ -375,7 +375,7 @@ PURPLE_PRIORITY_DEFAULT, "gntgf", N_("GntGf"), - VERSION, + DISPLAY_VERSION, N_("Toaster plugin"), N_("Toaster plugin"), "Sadrul H Chowdhury <sadrul@users.sourceforge.net>",
--- a/finch/plugins/gnthistory.c Sat Oct 27 13:27:31 2007 +0000 +++ b/finch/plugins/gnthistory.c Sat Oct 27 17:47:48 2007 +0000 @@ -177,7 +177,7 @@ PURPLE_PRIORITY_DEFAULT, HISTORY_PLUGIN_ID, N_("GntHistory"), - VERSION, + DISPLAY_VERSION, N_("Shows recently logged conversations in new conversations."), N_("When a new conversation is opened this plugin will insert " "the last conversation into the current conversation."),
--- a/finch/plugins/lastlog.c Sat Oct 27 13:27:31 2007 +0000 +++ b/finch/plugins/lastlog.c Sat Oct 27 17:47:48 2007 +0000 @@ -120,7 +120,7 @@ PURPLE_PRIORITY_DEFAULT, "gntlastlog", N_("GntLastlog"), - VERSION, + DISPLAY_VERSION, N_("Lastlog plugin."), N_("Lastlog plugin."), "Sadrul H Chowdhury <sadrul@users.sourceforge.net>",
--- a/libpurple/plugins/autoaccept.c Sat Oct 27 13:27:31 2007 +0000 +++ b/libpurple/plugins/autoaccept.c Sat Oct 27 17:47:48 2007 +0000 @@ -252,7 +252,7 @@ PLUGIN_ID, /* plugin id */ PLUGIN_NAME, /* name */ - VERSION, /* version */ + DISPLAY_VERSION, /* version */ PLUGIN_SUMMARY, /* summary */ PLUGIN_DESCRIPTION, /* description */ PLUGIN_AUTHOR, /* author */
--- a/libpurple/plugins/buddynote.c Sat Oct 27 13:27:31 2007 +0000 +++ b/libpurple/plugins/buddynote.c Sat Oct 27 17:47:48 2007 +0000 @@ -88,7 +88,7 @@ PURPLE_PRIORITY_DEFAULT, /**< priority */ "core-plugin_pack-buddynote", /**< id */ N_("Buddy Notes"), /**< name */ - VERSION, /**< version */ + DISPLAY_VERSION, /**< version */ N_("Store notes on particular buddies."), /**< summary */ N_("Adds the option to store notes for buddies " "on your buddy list."), /**< description */
--- a/libpurple/plugins/ciphertest.c Sat Oct 27 13:27:31 2007 +0000 +++ b/libpurple/plugins/ciphertest.c Sat Oct 27 17:47:48 2007 +0000 @@ -262,7 +262,7 @@ "core-cipher-test", /**< id */ N_("Cipher Test"), /**< name */ - VERSION, /**< version */ + DISPLAY_VERSION, /**< version */ /** summary */ N_("Tests the ciphers that ship with libpurple."), /** description */
--- a/libpurple/plugins/dbus-example.c Sat Oct 27 13:27:31 2007 +0000 +++ b/libpurple/plugins/dbus-example.c Sat Oct 27 17:47:48 2007 +0000 @@ -153,7 +153,7 @@ "dbus-example", /**< id */ N_("DBus Example"), /**< name */ - VERSION, /**< version */ + DISPLAY_VERSION, /**< version */ /** summary */ N_("DBus Plugin Example"), /** description */
--- a/libpurple/plugins/debug_example.c Sat Oct 27 13:27:31 2007 +0000 +++ b/libpurple/plugins/debug_example.c Sat Oct 27 17:47:48 2007 +0000 @@ -109,7 +109,7 @@ PLUGIN_ID, /* id */ "Debug API Example", /* name */ - VERSION, /* version */ + DISPLAY_VERSION, /* version */ "Debug API Example", /* summary */ "Debug API Example", /* description */ PLUGIN_AUTHOR, /* author */
--- a/libpurple/plugins/filectl.c Sat Oct 27 13:27:31 2007 +0000 +++ b/libpurple/plugins/filectl.c Sat Oct 27 17:47:48 2007 +0000 @@ -246,7 +246,7 @@ FILECTL_PLUGIN_ID, /**< id */ N_("File Control"), /**< name */ - VERSION, /**< version */ + DISPLAY_VERSION, /**< version */ /** summary */ N_("Allows control by entering commands in a file."), /** description */
--- a/libpurple/plugins/helloworld.c Sat Oct 27 13:27:31 2007 +0000 +++ b/libpurple/plugins/helloworld.c Sat Oct 27 17:47:48 2007 +0000 @@ -114,8 +114,8 @@ "core-hello_world", "Hello World!", - VERSION, /* This constant is defined in version.h, but you shouldn't use it for - your own plugins. We use it here because it's our plugin. */ + DISPLAY_VERSION, /* This constant is defined in config.h, but you shouldn't use it for + your own plugins. We use it here because it's our plugin. And we're lazy. */ "Hello World Plugin", "Hello World Plugin",
--- a/libpurple/plugins/idle.c Sat Oct 27 13:27:31 2007 +0000 +++ b/libpurple/plugins/idle.c Sat Oct 27 17:47:48 2007 +0000 @@ -316,7 +316,7 @@ /* This is a cultural reference. Dy'er Mak'er is a song by Led Zeppelin. If that doesn't translate well into your language, drop the 's before translating. */ N_("I'dle Mak'er"), - VERSION, + DISPLAY_VERSION, N_("Allows you to hand-configure how long you've been idle"), N_("Allows you to hand-configure how long you've been idle"), "Eric Warmenhoven <eric@warmenhoven.org>",
--- a/libpurple/plugins/ipc-test-client.c Sat Oct 27 13:27:31 2007 +0000 +++ b/libpurple/plugins/ipc-test-client.c Sat Oct 27 17:47:48 2007 +0000 @@ -85,7 +85,7 @@ IPC_TEST_CLIENT_PLUGIN_ID, /**< id */ N_("IPC Test Client"), /**< name */ - VERSION, /**< version */ + DISPLAY_VERSION, /**< version */ /** summary */ N_("Test plugin IPC support, as a client."), /** description */
--- a/libpurple/plugins/ipc-test-server.c Sat Oct 27 13:27:31 2007 +0000 +++ b/libpurple/plugins/ipc-test-server.c Sat Oct 27 17:47:48 2007 +0000 @@ -72,7 +72,7 @@ IPC_TEST_SERVER_PLUGIN_ID, /**< id */ N_("IPC Test Server"), /**< name */ - VERSION, /**< version */ + DISPLAY_VERSION, /**< version */ /** summary */ N_("Test plugin IPC support, as a server."), /** description */
--- a/libpurple/plugins/joinpart.c Sat Oct 27 13:27:31 2007 +0000 +++ b/libpurple/plugins/joinpart.c Sat Oct 27 17:47:48 2007 +0000 @@ -268,7 +268,7 @@ JOINPART_PLUGIN_ID, /**< id */ N_("Join/Part Hiding"), /**< name */ - VERSION, /**< version */ + DISPLAY_VERSION, /**< version */ /** summary */ N_("Hides extraneous join/part messages."), /** description */
--- a/libpurple/plugins/log_reader.c Sat Oct 27 13:27:31 2007 +0000 +++ b/libpurple/plugins/log_reader.c Sat Oct 27 17:47:48 2007 +0000 @@ -2888,7 +2888,7 @@ PURPLE_PRIORITY_DEFAULT, /**< priority */ "core-log_reader", /**< id */ N_("Log Reader"), /**< name */ - VERSION, /**< version */ + DISPLAY_VERSION, /**< version */ /** summary */ N_("Includes other IM clients' logs in the "
--- a/libpurple/plugins/mono/loader/mono.c Sat Oct 27 13:27:31 2007 +0000 +++ b/libpurple/plugins/mono/loader/mono.c Sat Oct 27 17:47:48 2007 +0000 @@ -215,7 +215,7 @@ PURPLE_PRIORITY_DEFAULT, MONO_PLUGIN_ID, N_("Mono Plugin Loader"), - VERSION, + DISPLAY_VERSION, N_("Loads .NET plugins with Mono."), N_("Loads .NET plugins with Mono."), "Eoin Coffey <ecoffey@simla.colostate.edu>",
--- a/libpurple/plugins/newline.c Sat Oct 27 13:27:31 2007 +0000 +++ b/libpurple/plugins/newline.c Sat Oct 27 17:47:48 2007 +0000 @@ -66,7 +66,7 @@ "core-plugin_pack-newline", /**< id */ N_("New Line"), /**< name */ - VERSION, /**< version */ + DISPLAY_VERSION, /**< version */ N_("Prepends a newline to displayed message."), /**< summary */ N_("Prepends a newline to messages so that the " "rest of the message appears below the "
--- a/libpurple/plugins/notify_example.c Sat Oct 27 13:27:31 2007 +0000 +++ b/libpurple/plugins/notify_example.c Sat Oct 27 17:47:48 2007 +0000 @@ -135,7 +135,7 @@ PLUGIN_ID, /* id */ "Notify API Example", /* name */ - VERSION, /* version */ + DISPLAY_VERSION, /* version */ "Notify API Example", /* summary */ "Notify API Example", /* description */ PLUGIN_AUTHOR, /* author */
--- a/libpurple/plugins/offlinemsg.c Sat Oct 27 13:27:31 2007 +0000 +++ b/libpurple/plugins/offlinemsg.c Sat Oct 27 17:47:48 2007 +0000 @@ -225,7 +225,7 @@ PLUGIN_ID, /* plugin id */ PLUGIN_NAME, /* name */ - VERSION, /* version */ + DISPLAY_VERSION, /* version */ PLUGIN_SUMMARY, /* summary */ PLUGIN_DESCRIPTION, /* description */ PLUGIN_AUTHOR, /* author */
--- a/libpurple/plugins/perl/perl.c Sat Oct 27 13:27:31 2007 +0000 +++ b/libpurple/plugins/perl/perl.c Sat Oct 27 17:47:48 2007 +0000 @@ -599,7 +599,7 @@ PERL_PLUGIN_ID, /**< id */ N_("Perl Plugin Loader"), /**< name */ - VERSION, /**< version */ + DISPLAY_VERSION, /**< version */ N_("Provides support for loading perl plugins."), /**< summary */ N_("Provides support for loading perl plugins."), /**< description */ "Christian Hammond <chipx86@gnupdate.org>", /**< author */
--- a/libpurple/plugins/pluginpref_example.c Sat Oct 27 13:27:31 2007 +0000 +++ b/libpurple/plugins/pluginpref_example.c Sat Oct 27 17:47:48 2007 +0000 @@ -131,7 +131,7 @@ "core-pluginpref_example", /**< id */ "Pluginpref Example", /**< name */ - VERSION, /**< version */ + DISPLAY_VERSION, /**< version */ /** summary */ "An example of how to use pluginprefs", /** description */
--- a/libpurple/plugins/psychic.c Sat Oct 27 13:27:31 2007 +0000 +++ b/libpurple/plugins/psychic.c Sat Oct 27 17:47:48 2007 +0000 @@ -147,7 +147,7 @@ PLUGIN_ID, /**< id */ PLUGIN_NAME, /**< name */ - VERSION, /**< version */ + DISPLAY_VERSION, /**< version */ PLUGIN_SUMMARY, /**< summary */ PLUGIN_DESC, /**< description */ PLUGIN_AUTHOR, /**< author */
--- a/libpurple/plugins/signals-test.c Sat Oct 27 13:27:31 2007 +0000 +++ b/libpurple/plugins/signals-test.c Sat Oct 27 17:47:48 2007 +0000 @@ -709,7 +709,7 @@ SIGNAL_TEST_PLUGIN_ID, /**< id */ N_("Signals Test"), /**< name */ - VERSION, /**< version */ + DISPLAY_VERSION, /**< version */ /** summary */ N_("Test to see that all signals are working properly."), /** description */
--- a/libpurple/plugins/simple.c Sat Oct 27 13:27:31 2007 +0000 +++ b/libpurple/plugins/simple.c Sat Oct 27 17:47:48 2007 +0000 @@ -35,7 +35,7 @@ SIMPLE_PLUGIN_ID, /**< id */ N_("Simple Plugin"), /**< name */ - VERSION, /**< version */ + DISPLAY_VERSION, /**< version */ /** summary */ N_("Tests to see that most things are working."), /** description */
--- a/libpurple/plugins/ssl/ssl-gnutls.c Sat Oct 27 13:27:31 2007 +0000 +++ b/libpurple/plugins/ssl/ssl-gnutls.c Sat Oct 27 17:47:48 2007 +0000 @@ -993,7 +993,7 @@ SSL_GNUTLS_PLUGIN_ID, /**< id */ N_("GNUTLS"), /**< name */ - VERSION, /**< version */ + DISPLAY_VERSION, /**< version */ /** summary */ N_("Provides SSL support through GNUTLS."), /** description */
--- a/libpurple/plugins/ssl/ssl-nss.c Sat Oct 27 13:27:31 2007 +0000 +++ b/libpurple/plugins/ssl/ssl-nss.c Sat Oct 27 17:47:48 2007 +0000 @@ -814,7 +814,7 @@ SSL_NSS_PLUGIN_ID, /**< id */ N_("NSS"), /**< name */ - VERSION, /**< version */ + DISPLAY_VERSION, /**< version */ /** summary */ N_("Provides SSL support through Mozilla NSS."), /** description */
--- a/libpurple/plugins/ssl/ssl.c Sat Oct 27 13:27:31 2007 +0000 +++ b/libpurple/plugins/ssl/ssl.c Sat Oct 27 17:47:48 2007 +0000 @@ -92,7 +92,7 @@ SSL_PLUGIN_ID, /**< id */ N_("SSL"), /**< name */ - VERSION, /**< version */ + DISPLAY_VERSION, /**< version */ /** summary */ N_("Provides a wrapper around SSL support libraries."), /** description */
--- a/libpurple/plugins/statenotify.c Sat Oct 27 13:27:31 2007 +0000 +++ b/libpurple/plugins/statenotify.c Sat Oct 27 17:47:48 2007 +0000 @@ -146,7 +146,7 @@ STATENOTIFY_PLUGIN_ID, /**< id */ N_("Buddy State Notification"), /**< name */ - VERSION, /**< version */ + DISPLAY_VERSION, /**< version */ /** summary */ N_("Notifies in a conversation window when a buddy goes or returns from " "away or idle."),
--- a/libpurple/plugins/tcl/tcl.c Sat Oct 27 13:27:31 2007 +0000 +++ b/libpurple/plugins/tcl/tcl.c Sat Oct 27 17:47:48 2007 +0000 @@ -421,7 +421,7 @@ PURPLE_PRIORITY_DEFAULT, "core-tcl", N_("Tcl Plugin Loader"), - VERSION, + DISPLAY_VERSION, N_("Provides support for loading Tcl plugins"), N_("Provides support for loading Tcl plugins"), "Ethan Blanton <eblanton@cs.purdue.edu>",
--- a/libpurple/protocols/bonjour/bonjour.c Sat Oct 27 13:27:31 2007 +0000 +++ b/libpurple/protocols/bonjour/bonjour.c Sat Oct 27 17:47:48 2007 +0000 @@ -476,7 +476,7 @@ "prpl-bonjour", /**< id */ "Bonjour", /**< name */ - VERSION, /**< version */ + DISPLAY_VERSION, /**< version */ /** summary */ N_("Bonjour Protocol Plugin"), /** description */
--- a/libpurple/protocols/gg/gg.c Sat Oct 27 13:27:31 2007 +0000 +++ b/libpurple/protocols/gg/gg.c Sat Oct 27 17:47:48 2007 +0000 @@ -2148,7 +2148,7 @@ "prpl-gg", /* id */ "Gadu-Gadu", /* name */ - VERSION, /* version */ + DISPLAY_VERSION, /* version */ N_("Gadu-Gadu Protocol Plugin"), /* summary */ N_("Polish popular IM"), /* description */
--- a/libpurple/protocols/irc/irc.c Sat Oct 27 13:27:31 2007 +0000 +++ b/libpurple/protocols/irc/irc.c Sat Oct 27 17:47:48 2007 +0000 @@ -910,7 +910,7 @@ "prpl-irc", /**< id */ "IRC", /**< name */ - VERSION, /**< version */ + DISPLAY_VERSION, /**< version */ N_("IRC Protocol Plugin"), /** summary */ N_("The IRC Protocol Plugin that Sucks Less"), /** description */ NULL, /**< author */
--- a/libpurple/protocols/jabber/libxmpp.c Sat Oct 27 13:27:31 2007 +0000 +++ b/libpurple/protocols/jabber/libxmpp.c Sat Oct 27 17:47:48 2007 +0000 @@ -165,7 +165,7 @@ "prpl-jabber", /**< id */ "XMPP", /**< name */ - VERSION, /**< version */ + DISPLAY_VERSION, /**< version */ /** summary */ N_("XMPP Protocol Plugin"), /** description */
--- a/libpurple/protocols/msn/msn.c Sat Oct 27 13:27:31 2007 +0000 +++ b/libpurple/protocols/msn/msn.c Sat Oct 27 17:47:48 2007 +0000 @@ -617,7 +617,12 @@ * XXX: blocked icon overlay isn't always accurate for MSN. * XXX: This can die as soon as purple_privacy_check() knows that * XXX: this prpl always honors both the allow and deny lists. */ - if (user) + /* While the above comment may be strictly correct (the privacy API needs + * rewriteing), purple_privacy_check() is going to be more accurate at + * indicating whether a particular buddy is going to be able to message + * you, which is the important information that this is trying to convey. + */ + if (full && user) { purple_notify_user_info_add_pair(user_info, _("Blocked"), ((user->list_op & (1 << MSN_LIST_BL)) ? _("Yes") : _("No"))); @@ -2260,7 +2265,7 @@ "prpl-msn", /**< id */ "MSN", /**< name */ - VERSION, /**< version */ + DISPLAY_VERSION, /**< version */ /** summary */ N_("Windows Live Messenger Protocol Plugin"), /** description */
--- a/libpurple/protocols/novell/novell.c Sat Oct 27 13:27:31 2007 +0000 +++ b/libpurple/protocols/novell/novell.c Sat Oct 27 17:47:48 2007 +0000 @@ -3518,7 +3518,7 @@ PURPLE_PRIORITY_DEFAULT, /**< priority */ "prpl-novell", /**< id */ "GroupWise", /**< name */ - VERSION, /**< version */ + DISPLAY_VERSION, /**< version */ /** summary */ N_("Novell GroupWise Messenger Protocol Plugin"), /** description */
--- a/libpurple/protocols/oscar/libaim.c Sat Oct 27 13:27:31 2007 +0000 +++ b/libpurple/protocols/oscar/libaim.c Sat Oct 27 17:47:48 2007 +0000 @@ -113,7 +113,7 @@ "prpl-aim", /**< id */ "AIM", /**< name */ - VERSION, /**< version */ + DISPLAY_VERSION, /**< version */ /** summary */ N_("AIM Protocol Plugin"), /** description */
--- a/libpurple/protocols/oscar/libicq.c Sat Oct 27 13:27:31 2007 +0000 +++ b/libpurple/protocols/oscar/libicq.c Sat Oct 27 17:47:48 2007 +0000 @@ -113,7 +113,7 @@ "prpl-icq", /**< id */ "ICQ", /**< name */ - VERSION, /**< version */ + DISPLAY_VERSION, /**< version */ /** summary */ N_("ICQ Protocol Plugin"), /** description */
--- a/libpurple/protocols/qq/qq.c Sat Oct 27 13:27:31 2007 +0000 +++ b/libpurple/protocols/qq/qq.c Sat Oct 27 17:47:48 2007 +0000 @@ -720,7 +720,7 @@ "prpl-qq", /**< id */ "QQ", /**< name */ - VERSION, /**< version */ + DISPLAY_VERSION, /**< version */ /** summary */ N_("QQ Protocol Plugin"), /** description */
--- a/libpurple/protocols/sametime/sametime.c Sat Oct 27 13:27:31 2007 +0000 +++ b/libpurple/protocols/sametime/sametime.c Sat Oct 27 17:47:48 2007 +0000 @@ -5667,7 +5667,7 @@ PLUGIN_ID, /**< id */ PLUGIN_NAME, /**< name */ - VERSION, /**< version */ + DISPLAY_VERSION, /**< version */ PLUGIN_SUMMARY, /**< summary */ PLUGIN_DESC, /**< description */ PLUGIN_AUTHOR, /**< author */
--- a/libpurple/protocols/silc/buddy.c Sat Oct 27 13:27:31 2007 +0000 +++ b/libpurple/protocols/silc/buddy.c Sat Oct 27 17:47:48 2007 +0000 @@ -934,8 +934,11 @@ /* Create dir if it doesn't exist */ if ((g_stat(filename, &st)) == -1) { if (errno == ENOENT) { - if (pw->pw_uid == geteuid()) - g_mkdir(filename, 0755); + if (pw->pw_uid == geteuid()) { + int ret = g_mkdir(filename, 0755); + if (ret < 0) + return; + } } }
--- a/libpurple/protocols/silc10/buddy.c Sat Oct 27 13:27:31 2007 +0000 +++ b/libpurple/protocols/silc10/buddy.c Sat Oct 27 17:47:48 2007 +0000 @@ -939,8 +939,11 @@ /* Create dir if it doesn't exist */ if ((g_stat(filename, &st)) == -1) { if (errno == ENOENT) { - if (pw->pw_uid == geteuid()) - g_mkdir(filename, 0755); + if (pw->pw_uid == geteuid()) { + int ret = g_mkdir(filename, 0755); + if (ret < 0) + return; + } } }
--- a/libpurple/protocols/simple/simple.c Sat Oct 27 13:27:31 2007 +0000 +++ b/libpurple/protocols/simple/simple.c Sat Oct 27 17:47:48 2007 +0000 @@ -321,7 +321,7 @@ return retval; } -static void fill_auth(struct simple_account_data *sip, gchar *hdr, struct sip_auth *auth) { +static void fill_auth(struct simple_account_data *sip, const gchar *hdr, struct sip_auth *auth) { int i = 0; const char *authuser; char *tmp; @@ -592,7 +592,7 @@ static struct transaction *transactions_find(struct simple_account_data *sip, struct sipmsg *msg) { struct transaction *trans; GSList *transactions = sip->transactions; - gchar *cseq = sipmsg_find_header(msg, "CSeq"); + const gchar *cseq = sipmsg_find_header(msg, "CSeq"); if (cseq) { while(transactions) { @@ -800,7 +800,7 @@ } static gboolean simple_add_lcs_contacts(struct simple_account_data *sip, struct sipmsg *msg, struct transaction *tc) { - gchar *tmp; + const gchar *tmp; xmlnode *item, *group, *isc; const char *name_group; PurpleBuddy *b; @@ -960,7 +960,7 @@ static void process_incoming_message(struct simple_account_data *sip, struct sipmsg *msg) { gchar *from; - gchar *contenttype; + const gchar *contenttype; gboolean found = FALSE; from = parse_from(sipmsg_find_header(msg, "From")); @@ -1015,7 +1015,7 @@ gboolean process_register_response(struct simple_account_data *sip, struct sipmsg *msg, struct transaction *tc) { - gchar *tmp; + const gchar *tmp; purple_debug(PURPLE_DEBUG_MISC, "simple", "in process register response response: %d\n", msg->response); switch (msg->response) { case 200: @@ -1072,7 +1072,7 @@ static void process_incoming_notify(struct simple_account_data *sip, struct sipmsg *msg) { gchar *from; - gchar *fromhdr; + const gchar *fromhdr; gchar *basicstatus_data; xmlnode *pidf; xmlnode *basicstatus = NULL, *tuple, *status; @@ -1255,8 +1255,8 @@ gchar *theirtag = find_tag(from_hdr); gchar *ourtag = find_tag(sipmsg_find_header(msg, "To")); gboolean tagadded = FALSE; - gchar *callid = sipmsg_find_header(msg, "Call-ID"); - gchar *expire = sipmsg_find_header(msg, "Expire"); + const gchar *callid = sipmsg_find_header(msg, "Call-ID"); + const gchar *expire = sipmsg_find_header(msg, "Expire"); gchar *tmp; struct simple_watcher *watcher = watcher_find(sip, from); if(!ourtag) { @@ -1264,14 +1264,14 @@ ourtag = gentag(); } if(!watcher) { /* new subscription */ - gchar *acceptheader = sipmsg_find_header(msg, "Accept"); + const gchar *acceptheader = sipmsg_find_header(msg, "Accept"); gboolean needsxpidf = FALSE; if(!purple_privacy_check(sip->account, from)) { send_sip_response(sip->gc, msg, 202, "Ok", NULL); goto privend; } if(acceptheader) { - gchar *tmp = acceptheader; + const gchar *tmp = acceptheader; gboolean foundpidf = FALSE; gboolean foundxpidf = FALSE; while(tmp && tmp < acceptheader + strlen(acceptheader)) { @@ -1289,7 +1289,6 @@ tmp = 0; } if(!foundpidf && foundxpidf) needsxpidf = TRUE; - g_free(acceptheader); } watcher = watcher_create(sip, from, callid, ourtag, theirtag, needsxpidf); } @@ -1314,8 +1313,6 @@ g_free(from); g_free(theirtag); g_free(ourtag); - g_free(callid); - g_free(expire); } static void process_input_message(struct simple_account_data *sip, struct sipmsg *msg) { @@ -1337,7 +1334,8 @@ struct transaction *trans = transactions_find(sip, msg); if(trans) { if(msg->response == 407) { - gchar *resend, *auth, *ptmp; + gchar *resend, *auth; + const gchar *ptmp; if(sip->proxy.retries > 3) return; sip->proxy.retries++; @@ -1381,7 +1379,8 @@ /* This is encountered when a generic (MESSAGE, NOTIFY, etc) * was denied until further authorization is provided. */ - gchar *resend, *auth, *ptmp; + gchar *resend, *auth; + const gchar *ptmp; if(sip->registrar.retries > SIMPLE_REGISTER_RETRY_MAX) return; sip->registrar.retries++; @@ -1889,7 +1888,7 @@ "prpl-simple", /**< id */ "SIMPLE", /**< name */ - VERSION, /**< version */ + DISPLAY_VERSION, /**< version */ N_("SIP/SIMPLE Protocol Plugin"), /** summary */ N_("The SIP/SIMPLE Protocol Plugin"), /** description */ "Thomas Butter <butter@uni-mannheim.de>", /**< author */
--- a/libpurple/protocols/simple/simple.h Sat Oct 27 13:27:31 2007 +0000 +++ b/libpurple/protocols/simple/simple.h Sat Oct 27 17:47:48 2007 +0000 @@ -127,7 +127,7 @@ int retries; int transport; /* 0 = tcp, 1 = udp */ int fd; - gchar *cseq; + const gchar *cseq; struct sipmsg *msg; TransCallback callback; };
--- a/libpurple/protocols/simple/sipmsg.c Sat Oct 27 13:27:31 2007 +0000 +++ b/libpurple/protocols/simple/sipmsg.c Sat Oct 27 17:47:48 2007 +0000 @@ -58,6 +58,7 @@ gchar *dummy; gchar *dummy2; gchar *tmp; + const gchar *tmp2; int i=1; if(!lines[0]) return NULL; parts = g_strsplit(lines[0], " ", 3); @@ -100,14 +101,16 @@ g_strfreev(parts); } g_strfreev(lines); - msg->bodylen = strtol(sipmsg_find_header(msg, "Content-Length"),NULL,10); + tmp2 = sipmsg_find_header(msg, "Content-Length"); + if (tmp2 != NULL) + msg->bodylen = strtol(tmp2, NULL, 10); if(msg->response) { - tmp = sipmsg_find_header(msg, "CSeq"); - if(!tmp) { + tmp2 = sipmsg_find_header(msg, "CSeq"); + if(!tmp2) { /* SHOULD NOT HAPPEN */ msg->method = 0; } else { - parts = g_strsplit(tmp, " ", 2); + parts = g_strsplit(tmp2, " ", 2); msg->method = g_strdup(parts[1]); g_strfreev(parts); } @@ -192,7 +195,7 @@ return; } -gchar *sipmsg_find_header(struct sipmsg *msg, const gchar *name) { +const gchar *sipmsg_find_header(struct sipmsg *msg, const gchar *name) { GSList *tmp; struct siphdrelement *elem; tmp = msg->headers;
--- a/libpurple/protocols/simple/sipmsg.h Sat Oct 27 13:27:31 2007 +0000 +++ b/libpurple/protocols/simple/sipmsg.h Sat Oct 27 17:47:48 2007 +0000 @@ -43,7 +43,7 @@ struct sipmsg *sipmsg_parse_header(const gchar *header); void sipmsg_add_header(struct sipmsg *msg, const gchar *name, const gchar *value); void sipmsg_free(struct sipmsg *msg); -gchar *sipmsg_find_header(struct sipmsg *msg, const gchar *name); +const gchar *sipmsg_find_header(struct sipmsg *msg, const gchar *name); void sipmsg_remove_header(struct sipmsg *msg, const gchar *name); void sipmsg_print(const struct sipmsg *msg); char *sipmsg_to_string(const struct sipmsg *msg);
--- a/libpurple/protocols/toc/toc.c Sat Oct 27 13:27:31 2007 +0000 +++ b/libpurple/protocols/toc/toc.c Sat Oct 27 17:47:48 2007 +0000 @@ -2301,7 +2301,7 @@ "prpl-toc", /**< id */ "TOC", /**< name */ - VERSION, /**< version */ + DISPLAY_VERSION, /**< version */ /** summary */ N_("TOC Protocol Plugin"), /** description */
--- a/libpurple/protocols/yahoo/yahoo.c Sat Oct 27 13:27:31 2007 +0000 +++ b/libpurple/protocols/yahoo/yahoo.c Sat Oct 27 17:47:48 2007 +0000 @@ -4355,7 +4355,7 @@ PURPLE_PRIORITY_DEFAULT, /**< priority */ "prpl-yahoo", /**< id */ "Yahoo", /**< name */ - VERSION, /**< version */ + DISPLAY_VERSION, /**< version */ /** summary */ N_("Yahoo Protocol Plugin"), /** description */
--- a/libpurple/protocols/zephyr/zephyr.c Sat Oct 27 13:27:31 2007 +0000 +++ b/libpurple/protocols/zephyr/zephyr.c Sat Oct 27 17:47:48 2007 +0000 @@ -2941,7 +2941,7 @@ "prpl-zephyr", /**< id */ "Zephyr", /**< name */ - VERSION, /**< version */ + DISPLAY_VERSION, /**< version */ /** summary */ N_("Zephyr Protocol Plugin"), /** description */
--- a/libpurple/util.c Sat Oct 27 13:27:31 2007 +0000 +++ b/libpurple/util.c Sat Oct 27 17:47:48 2007 +0000 @@ -1642,7 +1642,7 @@ pt->src_tag = "font"; pt->dest_tag = "span"; tags = g_list_prepend(tags, pt); - if(style->len) + if(style->len && xhtml) g_string_append_printf(xhtml, "<span style='%s'>", g_strstrip(style->str)); else pt->ignore = TRUE; @@ -3067,9 +3067,6 @@ ret[j++] = text[i]; } - purple_debug_misc("purple_str_add_cr", "got: %s, leaving with %s\n", - text, ret); - return ret; }
--- a/libpurple/win32/global.mak Sat Oct 27 13:27:31 2007 +0000 +++ b/libpurple/win32/global.mak Sat Oct 27 17:47:48 2007 +0000 @@ -72,6 +72,7 @@ PURPLE_VERSION := $(PIDGIN_VERSION) DEFINES += -DVERSION=\"$(PIDGIN_VERSION)\" \ + -DDISPLAY_VERSION=\"$(PIDGIN_VERSION)\" \ -DHAVE_CONFIG_H # Use -g flag when building debug version of Pidgin (including plugins).
--- a/libpurple/win32/win32dep.c Sat Oct 27 13:27:31 2007 +0000 +++ b/libpurple/win32/win32dep.c Sat Oct 27 17:47:48 2007 +0000 @@ -525,7 +525,7 @@ char *newenv; purple_debug_info("wpurple", "wpurple_init start\n"); - purple_debug_info("wpurple", "libpurple version: " VERSION "\n"); + purple_debug_info("wpurple", "libpurple version: " DISPLAY_VERSION "\n"); purple_debug_info("wpurple", "Glib:%u.%u.%u\n",
--- a/pidgin/gtkconv.c Sat Oct 27 13:27:31 2007 +0000 +++ b/pidgin/gtkconv.c Sat Oct 27 17:47:48 2007 +0000 @@ -359,7 +359,7 @@ PurpleCmdStatus status; if (!g_ascii_strcasecmp(args[0], "version")) { - tmp = g_strdup_printf("me is using %s v%s.", "Pidgin", VERSION); + tmp = g_strdup_printf("me is using %s v%s.", "Pidgin", DISPLAY_VERSION); markup = g_markup_escape_text(tmp, -1); status = purple_cmd_do_command(conv, tmp, markup, error);
--- a/pidgin/gtkdialogs.c Sat Oct 27 13:27:31 2007 +0000 +++ b/pidgin/gtkdialogs.c Sat Oct 27 17:47:48 2007 +0000 @@ -315,7 +315,7 @@ context = gtk_widget_get_pango_context(widget); layout = pango_layout_new(context); - markup = g_strdup_printf("<span foreground=\"#000000\">%s</span>", VERSION); + markup = g_strdup_printf("<span foreground=\"#000000\">%s</span>", DISPLAY_VERSION); pango_layout_set_font_description(layout, style->font_desc); pango_layout_set_markup(layout, markup, strlen(markup)); g_free(markup); @@ -382,7 +382,7 @@ gdk_pixbuf_unref(pixbuf); /* Insert the logo */ obj = gtk_widget_get_accessible(logo); - tmp = g_strconcat(PIDGIN_NAME, " " VERSION, NULL); + tmp = g_strconcat(PIDGIN_NAME, " " DISPLAY_VERSION, NULL); atk_object_set_description(obj, tmp); g_free(tmp); gtk_box_pack_start(GTK_BOX(vbox), logo, FALSE, FALSE, 0); @@ -394,7 +394,7 @@ str = g_string_sized_new(4096); g_string_append_printf(str, - "<CENTER><FONT SIZE=\"4\"><B>%s %s</B></FONT></CENTER><BR><BR>", PIDGIN_NAME, VERSION); + "<CENTER><FONT SIZE=\"4\"><B>%s %s</B></FONT></CENTER><BR><BR>", PIDGIN_NAME, DISPLAY_VERSION); g_string_append_printf(str, _("%s is a graphical modular messaging client based on "
--- a/pidgin/gtkmain.c Sat Oct 27 13:27:31 2007 +0000 +++ b/pidgin/gtkmain.c Sat Oct 27 17:47:48 2007 +0000 @@ -383,7 +383,7 @@ char *text; if (terse) { - text = g_strdup_printf(_("%s %s. Try `%s -h' for more information.\n"), PIDGIN_NAME, VERSION, name); + text = g_strdup_printf(_("%s %s. Try `%s -h' for more information.\n"), PIDGIN_NAME, DISPLAY_VERSION, name); } else { text = g_strdup_printf(_("%s %s\n" "Usage: %s [OPTION]...\n\n" @@ -397,7 +397,7 @@ #ifndef WIN32 " --display=DISPLAY X display to use\n" #endif - " -v, --version display the current version and exit\n"), PIDGIN_NAME, VERSION, name); + " -v, --version display the current version and exit\n"), PIDGIN_NAME, DISPLAY_VERSION, name); } purple_print_utf8_to_console(stdout, text); @@ -527,7 +527,7 @@ "LSchiere (via AIM). Contact information for Sean and Luke \n" "on other protocols is at\n" "%swiki/DeveloperPages\n"), - PIDGIN_NAME, VERSION, PURPLE_DEVEL_WEBSITE, PURPLE_DEVEL_WEBSITE, PURPLE_DEVEL_WEBSITE + PIDGIN_NAME, DISPLAY_VERSION, PURPLE_DEVEL_WEBSITE, PURPLE_DEVEL_WEBSITE, PURPLE_DEVEL_WEBSITE ); /* we have to convert the message (UTF-8 to console @@ -654,7 +654,7 @@ } /* show version message */ if (opt_version) { - printf("%s %s\n", PIDGIN_NAME, VERSION); + printf("%s %s\n", PIDGIN_NAME, DISPLAY_VERSION); #ifdef HAVE_SIGNAL_H g_free(segfault_message); #endif @@ -691,7 +691,7 @@ if (!gui_check) { char *display = gdk_get_display(); - printf("%s %s\n", PIDGIN_NAME, VERSION); + printf("%s %s\n", PIDGIN_NAME, DISPLAY_VERSION); g_warning("cannot open display: %s", display ? display : "unset"); g_free(display);
--- a/pidgin/gtkutils.c Sat Oct 27 13:27:31 2007 +0000 +++ b/pidgin/gtkutils.c Sat Oct 27 17:47:48 2007 +0000 @@ -2858,7 +2858,7 @@ gtk_window_set_urgency_hint(window, urgent); #elif defined _WIN32 winpidgin_window_flash(window, urgent); -#else +#elif defined GDK_WINDOWING_X11 GdkWindow *gdkwin; XWMHints *hints; @@ -2880,6 +2880,8 @@ XSetWMHints(GDK_WINDOW_XDISPLAY(gdkwin), GDK_WINDOW_XWINDOW(gdkwin), hints); XFree(hints); +#else + /* do something else? */ #endif }
--- a/pidgin/plugins/cap/cap.c Sat Oct 27 13:27:31 2007 +0000 +++ b/pidgin/plugins/cap/cap.c Sat Oct 27 17:47:48 2007 +0000 @@ -934,7 +934,7 @@ PURPLE_PRIORITY_DEFAULT, /**< priority */ CAP_PLUGIN_ID, /**< id */ N_("Contact Availability Prediction"), /**< name */ - VERSION, /**< version */ + DISPLAY_VERSION, /**< version */ N_("Contact Availability Prediction plugin."), /** summary */ N_("The contact availability plugin (cap) is used to display statistical information about buddies in a users contact list."), /** description */
--- a/pidgin/plugins/contact_priority.c Sat Oct 27 13:27:31 2007 +0000 +++ b/pidgin/plugins/contact_priority.c Sat Oct 27 17:47:48 2007 +0000 @@ -185,7 +185,7 @@ CONTACT_PRIORITY_PLUGIN_ID, /**< id */ N_("Contact Priority"), /**< name */ - VERSION, /**< version */ + DISPLAY_VERSION, /**< version */ /**< summary */ N_("Allows for controlling the values associated with different buddy states."), /**< description */
--- a/pidgin/plugins/convcolors.c Sat Oct 27 13:27:31 2007 +0000 +++ b/pidgin/plugins/convcolors.c Sat Oct 27 17:47:48 2007 +0000 @@ -340,7 +340,7 @@ PLUGIN_ID, /* plugin id */ PLUGIN_NAME, /* name */ - VERSION, /* version */ + DISPLAY_VERSION, /* version */ PLUGIN_SUMMARY, /* summary */ PLUGIN_DESCRIPTION, /* description */ PLUGIN_AUTHOR, /* author */
--- a/pidgin/plugins/crazychat/cc_pidgin_plugin.c Sat Oct 27 13:27:31 2007 +0000 +++ b/pidgin/plugins/crazychat/cc_pidgin_plugin.c Sat Oct 27 17:47:48 2007 +0000 @@ -144,7 +144,7 @@ CRAZYCHAT_PLUGIN_ID, /**< id */ N_("Crazychat"), /**< name */ - VERSION, /**< version */ + DISPLAY_VERSION, /**< version */ /** summary */ N_("Plugin to establish a Crazychat session."), /** description */
--- a/pidgin/plugins/extplacement.c Sat Oct 27 13:27:31 2007 +0000 +++ b/pidgin/plugins/extplacement.c Sat Oct 27 17:47:48 2007 +0000 @@ -144,7 +144,7 @@ PURPLE_PRIORITY_DEFAULT, /**< priority */ "gtk-extplacement", /**< id */ N_("ExtPlacement"), /**< name */ - VERSION, /**< version */ + DISPLAY_VERSION, /**< version */ N_("Extra conversation placement options."), /**< summary */ /** description */ N_("Restrict the number of conversations per windows,"
--- a/pidgin/plugins/gestures/gestures.c Sat Oct 27 13:27:31 2007 +0000 +++ b/pidgin/plugins/gestures/gestures.c Sat Oct 27 17:47:48 2007 +0000 @@ -293,7 +293,7 @@ GESTURES_PLUGIN_ID, /**< id */ N_("Mouse Gestures"), /**< name */ - VERSION, /**< version */ + DISPLAY_VERSION, /**< version */ /** summary */ N_("Provides support for mouse gestures"), /** description */
--- a/pidgin/plugins/gevolution/gevolution.c Sat Oct 27 13:27:31 2007 +0000 +++ b/pidgin/plugins/gevolution/gevolution.c Sat Oct 27 17:47:48 2007 +0000 @@ -525,7 +525,7 @@ GEVOLUTION_PLUGIN_ID, /**< id */ N_("Evolution Integration"), /**< name */ - VERSION, /**< version */ + DISPLAY_VERSION, /**< version */ /** summary */ N_("Provides integration with Evolution."), /** description */
--- a/pidgin/plugins/gtk-signals-test.c Sat Oct 27 13:27:31 2007 +0000 +++ b/pidgin/plugins/gtk-signals-test.c Sat Oct 27 17:47:48 2007 +0000 @@ -158,7 +158,7 @@ GTK_SIGNAL_TEST_PLUGIN_ID, /**< id */ N_("GTK Signals Test"), /**< name */ - VERSION, /**< version */ + DISPLAY_VERSION, /**< version */ /** summary */ N_("Test to see that all ui signals are working properly."), /** description */
--- a/pidgin/plugins/gtkbuddynote.c Sat Oct 27 13:27:31 2007 +0000 +++ b/pidgin/plugins/gtkbuddynote.c Sat Oct 27 17:47:48 2007 +0000 @@ -72,7 +72,7 @@ PURPLE_PRIORITY_DEFAULT, /**< priority */ "gtkbuddynote", /**< id */ N_("Buddy Notes"), /**< name */ - VERSION, /**< version */ + DISPLAY_VERSION, /**< version */ N_("Store notes on particular buddies."), /**< summary */ N_("Adds the option to store notes for buddies " "on your buddy list."), /**< description */
--- a/pidgin/plugins/history.c Sat Oct 27 13:27:31 2007 +0000 +++ b/pidgin/plugins/history.c Sat Oct 27 17:47:48 2007 +0000 @@ -193,7 +193,7 @@ PURPLE_PRIORITY_DEFAULT, HISTORY_PLUGIN_ID, N_("History"), - VERSION, + DISPLAY_VERSION, N_("Shows recently logged conversations in new conversations."), N_("When a new conversation is opened this plugin will insert " "the last conversation into the current conversation."),
--- a/pidgin/plugins/iconaway.c Sat Oct 27 13:27:31 2007 +0000 +++ b/pidgin/plugins/iconaway.c Sat Oct 27 17:47:48 2007 +0000 @@ -80,7 +80,7 @@ ICONAWAY_PLUGIN_ID, /**< id */ N_("Iconify on Away"), /**< name */ - VERSION, /**< version */ + DISPLAY_VERSION, /**< version */ /** summary */ N_("Iconifies the buddy list and your conversations when you go away."), /** description */
--- a/pidgin/plugins/mailchk.c Sat Oct 27 13:27:31 2007 +0000 +++ b/pidgin/plugins/mailchk.c Sat Oct 27 17:47:48 2007 +0000 @@ -158,7 +158,7 @@ PURPLE_PRIORITY_DEFAULT, MAILCHK_PLUGIN_ID, N_("Mail Checker"), - VERSION, + DISPLAY_VERSION, N_("Checks for new local mail."), N_("Adds a small box to the buddy list that" " shows if you have new mail."),
--- a/pidgin/plugins/markerline.c Sat Oct 27 13:27:31 2007 +0000 +++ b/pidgin/plugins/markerline.c Sat Oct 27 17:47:48 2007 +0000 @@ -281,7 +281,7 @@ PLUGIN_ID, /* plugin id */ PLUGIN_NAME, /* name */ - VERSION, /* version */ + DISPLAY_VERSION, /* version */ PLUGIN_SUMMARY, /* summary */ PLUGIN_DESCRIPTION, /* description */ PLUGIN_AUTHOR, /* author */
--- a/pidgin/plugins/musicmessaging/musicmessaging.c Sat Oct 27 13:27:31 2007 +0000 +++ b/pidgin/plugins/musicmessaging/musicmessaging.c Sat Oct 27 17:47:48 2007 +0000 @@ -681,7 +681,7 @@ MUSICMESSAGING_PLUGIN_ID, /**< id */ "Music Messaging", /**< name */ - VERSION, /**< version */ + DISPLAY_VERSION, /**< version */ N_("Music Messaging Plugin for collaborative composition."), /** summary */ N_("The Music Messaging Plugin allows a number of users to simultaneously work on a piece of music by editting a common score in real-time."),
--- a/pidgin/plugins/notify.c Sat Oct 27 13:27:31 2007 +0000 +++ b/pidgin/plugins/notify.c Sat Oct 27 17:47:48 2007 +0000 @@ -905,7 +905,7 @@ NOTIFY_PLUGIN_ID, /**< id */ N_("Message Notification"), /**< name */ - VERSION, /**< version */ + DISPLAY_VERSION, /**< version */ /** summary */ N_("Provides a variety of ways of notifying you of unread messages."), /** description */
--- a/pidgin/plugins/pidgininc.c Sat Oct 27 13:27:31 2007 +0000 +++ b/pidgin/plugins/pidgininc.c Sat Oct 27 17:47:48 2007 +0000 @@ -89,7 +89,7 @@ PURPLEINC_PLUGIN_ID, /**< id */ N_("Pidgin Demonstration Plugin"), /**< name */ - VERSION, /**< version */ + DISPLAY_VERSION, /**< version */ /** summary */ N_("An example plugin that does stuff - see the description."), /** description */
--- a/pidgin/plugins/pidginrc.c Sat Oct 27 13:27:31 2007 +0000 +++ b/pidgin/plugins/pidginrc.c Sat Oct 27 17:47:48 2007 +0000 @@ -536,7 +536,7 @@ PURPLE_PRIORITY_DEFAULT, "purplerc", N_("Pidgin GTK+ Theme Control"), - VERSION, + DISPLAY_VERSION, N_("Provides access to commonly used gtkrc settings."), N_("Provides access to commonly used gtkrc settings."), "Etan Reisner <deryni@eden.rutgers.edu>",
--- a/pidgin/plugins/raw.c Sat Oct 27 13:27:31 2007 +0000 +++ b/pidgin/plugins/raw.c Sat Oct 27 17:47:48 2007 +0000 @@ -173,7 +173,7 @@ PURPLE_PRIORITY_DEFAULT, RAW_PLUGIN_ID, N_("Raw"), - VERSION, + DISPLAY_VERSION, N_("Lets you send raw input to text-based protocols."), N_("Lets you send raw input to text-based protocols (XMPP, MSN, IRC, " "TOC). Hit 'Enter' in the entry box to send. Watch the debug window."),
--- a/pidgin/plugins/relnot.c Sat Oct 27 13:27:31 2007 +0000 +++ b/pidgin/plugins/relnot.c Sat Oct 27 17:47:48 2007 +0000 @@ -141,7 +141,7 @@ "gtk-relnot", /**< id */ N_("Release Notification"), /**< name */ - VERSION, /**< version */ + DISPLAY_VERSION, /**< version */ /** summary */ N_("Checks periodically for new releases."), /** description */
--- a/pidgin/plugins/spellchk.c Sat Oct 27 13:27:31 2007 +0000 +++ b/pidgin/plugins/spellchk.c Sat Oct 27 17:47:48 2007 +0000 @@ -2368,7 +2368,7 @@ PURPLE_PRIORITY_DEFAULT, SPELLCHECK_PLUGIN_ID, N_("Text replacement"), - VERSION, + DISPLAY_VERSION, N_("Replaces text in outgoing messages according to user-defined rules."), N_("Replaces text in outgoing messages according to user-defined rules."), "Eric Warmenhoven <eric@warmenhoven.org>",
--- a/pidgin/plugins/ticker/ticker.c Sat Oct 27 13:27:31 2007 +0000 +++ b/pidgin/plugins/ticker/ticker.c Sat Oct 27 17:47:48 2007 +0000 @@ -354,7 +354,7 @@ TICKER_PLUGIN_ID, /**< id */ N_("Buddy Ticker"), /**< name */ - VERSION, /**< version */ + DISPLAY_VERSION, /**< version */ /** summary */ N_("A horizontal scrolling version of the buddy list."), /** description */
--- a/pidgin/plugins/timestamp.c Sat Oct 27 13:27:31 2007 +0000 +++ b/pidgin/plugins/timestamp.c Sat Oct 27 17:47:48 2007 +0000 @@ -200,7 +200,7 @@ TIMESTAMP_PLUGIN_ID, /**< id */ N_("Timestamp"), /**< name */ - VERSION, /**< version */ + DISPLAY_VERSION, /**< version */ /** summary */ N_("Display iChat-style timestamps"), /** description */
--- a/pidgin/plugins/timestamp_format.c Sat Oct 27 13:27:31 2007 +0000 +++ b/pidgin/plugins/timestamp_format.c Sat Oct 27 17:47:48 2007 +0000 @@ -149,7 +149,7 @@ "core-timestamp_format", /**< id */ N_("Message Timestamp Formats"), /**< name */ - VERSION, /**< version */ + DISPLAY_VERSION, /**< version */ /** summary */ N_("Customizes the message timestamp formats."), /** description */
--- a/pidgin/plugins/win32/transparency/win2ktrans.c Sat Oct 27 13:27:31 2007 +0000 +++ b/pidgin/plugins/win32/transparency/win2ktrans.c Sat Oct 27 17:47:48 2007 +0000 @@ -691,7 +691,7 @@ PURPLE_PRIORITY_DEFAULT, /**< priority */ WINTRANS_PLUGIN_ID, /**< id */ N_("Transparency"), /**< name */ - VERSION, /**< version */ + DISPLAY_VERSION, /**< version */ /** summary */ N_("Variable Transparency for the buddy list and conversations."), /** description */
--- a/pidgin/plugins/win32/winprefs/winprefs.c Sat Oct 27 13:27:31 2007 +0000 +++ b/pidgin/plugins/win32/winprefs/winprefs.c Sat Oct 27 17:47:48 2007 +0000 @@ -369,7 +369,7 @@ PURPLE_PRIORITY_DEFAULT, WINPREFS_PLUGIN_ID, N_("Windows Pidgin Options"), - VERSION, + DISPLAY_VERSION, N_("Options specific to Pidgin for Windows."), N_("Provides options specific to Pidgin for Windows , such as buddy list docking."), "Herman Bloggs <hermanator12002@yahoo.com>",
--- a/pidgin/plugins/xmppconsole.c Sat Oct 27 13:27:31 2007 +0000 +++ b/pidgin/plugins/xmppconsole.c Sat Oct 27 17:47:48 2007 +0000 @@ -858,7 +858,7 @@ "gtk-xmpp", /**< id */ N_("XMPP Console"), /**< name */ - VERSION, /**< version */ + DISPLAY_VERSION, /**< version */ /** summary */ N_("Send and receive raw XMPP stanzas."), /** description */