im.pidgin.pidgin.2.2.3: 2d426ed900c4a50aaff7263900d56f2ce6d103b6
rekkanoryo at pidgin.im
rekkanoryo at pidgin.im
Fri Nov 9 13:27:03 EST 2007
-----------------------------------------------------------------
Revision: 2d426ed900c4a50aaff7263900d56f2ce6d103b6
Ancestor: 524f26ace3ac354430ac04a95b8d1c149f09b02a
Author: rekkanoryo at pidgin.im
Date: 2007-11-09T08:39:14
Branch: im.pidgin.pidgin.2.2.3
Modified files:
configure.ac finch/finch.c finch/gntconv.c
finch/plugins/gntclipboard.c finch/plugins/gntgf.c
finch/plugins/gnthistory.c finch/plugins/lastlog.c
libpurple/conversation.h libpurple/plugins/autoaccept.c
libpurple/plugins/buddynote.c libpurple/plugins/ciphertest.c
libpurple/plugins/dbus-example.c
libpurple/plugins/debug_example.c
libpurple/plugins/filectl.c libpurple/plugins/helloworld.c
libpurple/plugins/idle.c libpurple/plugins/ipc-test-client.c
libpurple/plugins/ipc-test-server.c
libpurple/plugins/joinpart.c libpurple/plugins/log_reader.c
libpurple/plugins/mono/loader/mono.c
libpurple/plugins/newline.c
libpurple/plugins/notify_example.c
libpurple/plugins/offlinemsg.c libpurple/plugins/perl/perl.c
libpurple/plugins/pluginpref_example.c
libpurple/plugins/psychic.c libpurple/plugins/signals-test.c
libpurple/plugins/simple.c
libpurple/plugins/ssl/ssl-gnutls.c
libpurple/plugins/ssl/ssl-nss.c libpurple/plugins/ssl/ssl.c
libpurple/plugins/statenotify.c libpurple/plugins/tcl/tcl.c
libpurple/protocols/bonjour/bonjour.c
libpurple/protocols/gg/gg.c libpurple/protocols/irc/irc.c
libpurple/protocols/jabber/libxmpp.c
libpurple/protocols/msn/msn.c
libpurple/protocols/novell/novell.c
libpurple/protocols/oscar/libaim.c
libpurple/protocols/oscar/libicq.c
libpurple/protocols/qq/qq.c
libpurple/protocols/sametime/sametime.c
libpurple/protocols/simple/simple.c
libpurple/protocols/toc/toc.c
libpurple/protocols/yahoo/yahoo.c
libpurple/protocols/zephyr/zephyr.c libpurple/prpl.h
libpurple/util.c libpurple/win32/global.mak
libpurple/win32/win32dep.c pidgin/gtkconv.c
pidgin/gtkdialogs.c pidgin/gtkmain.c pidgin/gtkutils.c
pidgin/plugins/cap/cap.c pidgin/plugins/contact_priority.c
pidgin/plugins/convcolors.c
pidgin/plugins/crazychat/cc_pidgin_plugin.c
pidgin/plugins/extplacement.c
pidgin/plugins/gestures/gestures.c
pidgin/plugins/gtk-signals-test.c
pidgin/plugins/gtkbuddynote.c pidgin/plugins/history.c
pidgin/plugins/iconaway.c pidgin/plugins/mailchk.c
pidgin/plugins/markerline.c
pidgin/plugins/musicmessaging/musicmessaging.c
pidgin/plugins/notify.c pidgin/plugins/pidgininc.c
pidgin/plugins/pidginrc.c pidgin/plugins/raw.c
pidgin/plugins/relnot.c pidgin/plugins/spellchk.c
pidgin/plugins/ticker/ticker.c pidgin/plugins/timestamp.c
pidgin/plugins/timestamp_format.c
pidgin/plugins/win32/transparency/win2ktrans.c
pidgin/plugins/win32/winprefs/winprefs.c
pidgin/plugins/xmppconsole.c
ChangeLog:
applied changes from 03b709ec2a153e7e82719df0ba4635108bb1d3c6
through 32f31e981f0618a4167aa98bcc22c2dab13d1550
-------------- next part --------------
============================================================
--- configure.ac 10ec2468aa876823d850965ef4a6e126b3ab8a44
+++ configure.ac 2a3a83305153f94aa68caa3612b8078c0685f6c1
@@ -283,6 +283,17 @@ AC_SUBST(GLIB_LIBS)
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],
============================================================
--- finch/finch.c d197f6c00777b596e021ff56acfb1ad5ad45b00b
+++ finch/finch.c d7088fc88382845c3dbfdbd80ab1f8fbe3b5dfe1
@@ -203,7 +203,7 @@ show_usage(const char *name, gboolean te
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 @@ show_usage(const char *name, gboolean te
" -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 @@ init_libpurple(int argc, char **argv)
/* 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;
}
============================================================
--- finch/gntconv.c a38f3246e3471d27ce3dc0fe3344e6a4a06a818a
+++ finch/gntconv.c 05e9b28f58e3fa0da4651112bfdfa8438515d2dd
@@ -1011,7 +1011,7 @@ debug_command_cb(PurpleConversation *con
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);
============================================================
--- finch/plugins/gntclipboard.c 15ceab59b861fc707273c066cb4083335c283703
+++ finch/plugins/gntclipboard.c 58f3c01d3cf64582e886825439d08995aacf0bd7
@@ -156,7 +156,7 @@ static PurplePluginInfo info =
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."),
============================================================
--- finch/plugins/gntgf.c ad9b2906bea1046113bc6b509fe2117bde8c0036
+++ finch/plugins/gntgf.c 57ac9082b8d9f5f3d1cf72f3a8fd8872a7ec9bee
@@ -375,7 +375,7 @@ static PurplePluginInfo info =
PURPLE_PRIORITY_DEFAULT,
"gntgf",
N_("GntGf"),
- VERSION,
+ DISPLAY_VERSION,
N_("Toaster plugin"),
N_("Toaster plugin"),
"Sadrul H Chowdhury <sadrul at users.sourceforge.net>",
============================================================
--- finch/plugins/gnthistory.c 07e02d5c46795d421f0f7edf647e467d5214dfe7
+++ finch/plugins/gnthistory.c 05ae18bee0735205b35d643be5b2a8f9b18397fa
@@ -177,7 +177,7 @@ static PurplePluginInfo info =
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."),
============================================================
--- finch/plugins/lastlog.c b362a4a8312d99eda9de4289f3ac6a6e78b6f3da
+++ finch/plugins/lastlog.c 8b2d5957f0b536df7ee4c19aca999366f4ce176d
@@ -120,7 +120,7 @@ static PurplePluginInfo info =
PURPLE_PRIORITY_DEFAULT,
"gntlastlog",
N_("GntLastlog"),
- VERSION,
+ DISPLAY_VERSION,
N_("Lastlog plugin."),
N_("Lastlog plugin."),
"Sadrul H Chowdhury <sadrul at users.sourceforge.net>",
============================================================
--- libpurple/conversation.h 71da89b093e34a0b89d65d0435b611ce98f268e0
+++ libpurple/conversation.h 309ec7f99f2720e6ae8a9888a4ec798c5f1776ce
@@ -172,9 +172,12 @@ struct _PurpleConversationUiOps
void (*write_im)(PurpleConversation *conv, const char *who,
const char *message, PurpleMessageFlags flags,
time_t mtime);
- /** Write a message to a conversation. This is used rather than
- * the chat- or im-specific ops for generic messages, such as system
- * messages like "x is now know as y".
+ /** Write a message to a conversation. This is used rather than the
+ * chat- or im-specific ops for errors, system messages (such as "x is
+ * now know as y"), and as the fallback if #write_im and #write_chat
+ * are not implemented. It should be implemented, or the UI will miss
+ * conversation error messages and your users will hate you.
+ *
* @see purple_conversation_write()
*/
void (*write_conv)(PurpleConversation *conv,
============================================================
--- libpurple/plugins/autoaccept.c 1081318b860ebd80f92ad28d6c324d4b79e2747e
+++ libpurple/plugins/autoaccept.c 135615827fb471bdc49b7e60edd271c4c2bb5134
@@ -252,7 +252,7 @@ static PurplePluginInfo info = {
PLUGIN_ID, /* plugin id */
PLUGIN_NAME, /* name */
- VERSION, /* version */
+ DISPLAY_VERSION, /* version */
PLUGIN_SUMMARY, /* summary */
PLUGIN_DESCRIPTION, /* description */
PLUGIN_AUTHOR, /* author */
============================================================
--- libpurple/plugins/buddynote.c 23a984ab63122f2778888844e89258d4f77b9937
+++ libpurple/plugins/buddynote.c 4a6903496006c32e8dfb4887ee06203c9b16421b
@@ -88,7 +88,7 @@ static PurplePluginInfo info =
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 */
============================================================
--- libpurple/plugins/ciphertest.c 7b3a69e3f867a58a6f0b3a63b16a2b361a509e02
+++ libpurple/plugins/ciphertest.c edc2c13f6512e35007d664bb2bf78fd3861beb53
@@ -262,7 +262,7 @@ static PurplePluginInfo info =
"core-cipher-test", /**< id */
N_("Cipher Test"), /**< name */
- VERSION, /**< version */
+ DISPLAY_VERSION, /**< version */
/** summary */
N_("Tests the ciphers that ship with libpurple."),
/** description */
============================================================
--- libpurple/plugins/dbus-example.c e70540a653dfe9a39101e88a87b0cb078f22a36c
+++ libpurple/plugins/dbus-example.c 4a9103a0493203cf8886b5cad86c9adc58d90db6
@@ -153,7 +153,7 @@ static PurplePluginInfo info =
"dbus-example", /**< id */
N_("DBus Example"), /**< name */
- VERSION, /**< version */
+ DISPLAY_VERSION, /**< version */
/** summary */
N_("DBus Plugin Example"),
/** description */
============================================================
--- libpurple/plugins/debug_example.c 81ac161b529b13c7778509f04fb3ba4ad670e4ab
+++ libpurple/plugins/debug_example.c 09a68602b1017ef4c36cff49b5c86c05d0d4a6e8
@@ -109,7 +109,7 @@ static PurplePluginInfo info = {
PLUGIN_ID, /* id */
"Debug API Example", /* name */
- VERSION, /* version */
+ DISPLAY_VERSION, /* version */
"Debug API Example", /* summary */
"Debug API Example", /* description */
PLUGIN_AUTHOR, /* author */
============================================================
--- libpurple/plugins/filectl.c c97068bb4d1a0376d9bfe3d0a27184b42b86e1dc
+++ libpurple/plugins/filectl.c 3663c344f6e2a9882fa17ee77fafeba92e9a4a20
@@ -246,7 +246,7 @@ static PurplePluginInfo info =
FILECTL_PLUGIN_ID, /**< id */
N_("File Control"), /**< name */
- VERSION, /**< version */
+ DISPLAY_VERSION, /**< version */
/** summary */
N_("Allows control by entering commands in a file."),
/** description */
============================================================
--- libpurple/plugins/helloworld.c dad7a3244fac95c5602df892ea2f962a8d07af3c
+++ libpurple/plugins/helloworld.c 81d193b97c1119e8e58226d4ca5f16eae87d10a9
@@ -114,8 +114,8 @@ static PurplePluginInfo info = {
"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",
============================================================
--- libpurple/plugins/idle.c 2c257c84a37b7bd58779eadb5c855f2a51d36c3e
+++ libpurple/plugins/idle.c 060f0c3502b52ed82201e890dc8d61259ec85c74
@@ -316,7 +316,7 @@ static PurplePluginInfo info =
/* 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 at warmenhoven.org>",
============================================================
--- libpurple/plugins/ipc-test-client.c ef3eb7769f78a3e7207c4850a019edf9530133d4
+++ libpurple/plugins/ipc-test-client.c 7702f60429ecd9824d1c200ad6d3362aff74d6e0
@@ -85,7 +85,7 @@ static PurplePluginInfo info =
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 */
============================================================
--- libpurple/plugins/ipc-test-server.c cde367d0492578521425fb3200df477918b424d8
+++ libpurple/plugins/ipc-test-server.c 8d5d6a8b6bc7c0744b190f01ff9f96c13de8e20c
@@ -72,7 +72,7 @@ static PurplePluginInfo info =
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 */
============================================================
--- libpurple/plugins/joinpart.c 53c1dc2b3a83e1fc05853c6ecc3365d742fb3f08
+++ libpurple/plugins/joinpart.c 07b73f22290babb846bcf517000f679577895228
@@ -268,7 +268,7 @@ static PurplePluginInfo info =
JOINPART_PLUGIN_ID, /**< id */
N_("Join/Part Hiding"), /**< name */
- VERSION, /**< version */
+ DISPLAY_VERSION, /**< version */
/** summary */
N_("Hides extraneous join/part messages."),
/** description */
============================================================
--- libpurple/plugins/log_reader.c 879925ba9e7b906f09345aa73f82564a14d6d5f1
+++ libpurple/plugins/log_reader.c 9c83449a45d996f6c1f3a7a2120a3f3736706d49
@@ -2918,7 +2918,7 @@ static PurplePluginInfo info =
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 "
============================================================
--- libpurple/plugins/mono/loader/mono.c 5e4c7112bcd402c6e69d895199abbd41e0835228
+++ libpurple/plugins/mono/loader/mono.c 44c2ccad5c598262739116b33d033c54859206e3
@@ -215,7 +215,7 @@ static PurplePluginInfo info =
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 at simla.colostate.edu>",
============================================================
--- libpurple/plugins/newline.c 1c8960f2ab6ab0be99931244cf28309c3d3a1532
+++ libpurple/plugins/newline.c c391a78885b93eae159ef9324b24e397234cccfc
@@ -66,7 +66,7 @@ static PurplePluginInfo info =
"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 "
============================================================
--- libpurple/plugins/notify_example.c ebc510bd5b8bbba3538112c470bec014fbb49675
+++ libpurple/plugins/notify_example.c 3252ff546948eb8a9ba4b2c2304d440b3863e835
@@ -135,7 +135,7 @@ static PurplePluginInfo info = {
PLUGIN_ID, /* id */
"Notify API Example", /* name */
- VERSION, /* version */
+ DISPLAY_VERSION, /* version */
"Notify API Example", /* summary */
"Notify API Example", /* description */
PLUGIN_AUTHOR, /* author */
============================================================
--- libpurple/plugins/offlinemsg.c 25964ed8b61f51a156a22769f587c3d6f6a4ac40
+++ libpurple/plugins/offlinemsg.c 5a456460ec718ad971fca35e1c364c70fce7d5f9
@@ -225,7 +225,7 @@ static PurplePluginInfo info =
PLUGIN_ID, /* plugin id */
PLUGIN_NAME, /* name */
- VERSION, /* version */
+ DISPLAY_VERSION, /* version */
PLUGIN_SUMMARY, /* summary */
PLUGIN_DESCRIPTION, /* description */
PLUGIN_AUTHOR, /* author */
============================================================
--- libpurple/plugins/perl/perl.c c00fb5febeb0ed7ea2f8add8f6479c43d1f3b6e2
+++ libpurple/plugins/perl/perl.c 6dbed55fa8823e5c3a2a7b659177c960bc28e6cf
@@ -599,7 +599,7 @@ static PurplePluginInfo info =
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 at gnupdate.org>", /**< author */
============================================================
--- libpurple/plugins/pluginpref_example.c cc27ff6ef305d1bc479fcc4df71ab2d590651cd7
+++ libpurple/plugins/pluginpref_example.c f6d7d0a4499961205186f42ed2be78a2faa15b16
@@ -131,7 +131,7 @@ static PurplePluginInfo info =
"core-pluginpref_example", /**< id */
"Pluginpref Example", /**< name */
- VERSION, /**< version */
+ DISPLAY_VERSION, /**< version */
/** summary */
"An example of how to use pluginprefs",
/** description */
============================================================
--- libpurple/plugins/psychic.c c3af918efeb3e342e34df741c22fd503a0338158
+++ libpurple/plugins/psychic.c 2ed2187349f4c5de5dfd7f7de3668218a03792a6
@@ -147,7 +147,7 @@ static PurplePluginInfo info = {
PLUGIN_ID, /**< id */
PLUGIN_NAME, /**< name */
- VERSION, /**< version */
+ DISPLAY_VERSION, /**< version */
PLUGIN_SUMMARY, /**< summary */
PLUGIN_DESC, /**< description */
PLUGIN_AUTHOR, /**< author */
============================================================
--- libpurple/plugins/signals-test.c 26f2f097461b7b8558bfe8af1d3336ed21c2ae60
+++ libpurple/plugins/signals-test.c c96dd9949ba459aaff0d0d16fdf43e62908eb6c4
@@ -709,7 +709,7 @@ static PurplePluginInfo info =
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 */
============================================================
--- libpurple/plugins/simple.c 981b184854a994384c647a6fc3ddb168f3f5beb4
+++ libpurple/plugins/simple.c 5aae07a2d91598dfdf1fb32ae5604d7996fcb930
@@ -35,7 +35,7 @@ static PurplePluginInfo info =
SIMPLE_PLUGIN_ID, /**< id */
N_("Simple Plugin"), /**< name */
- VERSION, /**< version */
+ DISPLAY_VERSION, /**< version */
/** summary */
N_("Tests to see that most things are working."),
/** description */
============================================================
--- libpurple/plugins/ssl/ssl-gnutls.c 57f7fcd10b49eb8df0ba340ebc862041ca9b9d85
+++ libpurple/plugins/ssl/ssl-gnutls.c c02ee7f053bf0d96e5134b95a7e426e4d97c6e52
@@ -993,7 +993,7 @@ static PurplePluginInfo info =
SSL_GNUTLS_PLUGIN_ID, /**< id */
N_("GNUTLS"), /**< name */
- VERSION, /**< version */
+ DISPLAY_VERSION, /**< version */
/** summary */
N_("Provides SSL support through GNUTLS."),
/** description */
============================================================
--- libpurple/plugins/ssl/ssl-nss.c 3ae0c5446991c81bafe075c62230ac3849a8d532
+++ libpurple/plugins/ssl/ssl-nss.c 32128d27a651ff8eca9babb1ddab49eb17f347bd
@@ -814,7 +814,7 @@ static PurplePluginInfo info =
SSL_NSS_PLUGIN_ID, /**< id */
N_("NSS"), /**< name */
- VERSION, /**< version */
+ DISPLAY_VERSION, /**< version */
/** summary */
N_("Provides SSL support through Mozilla NSS."),
/** description */
============================================================
--- libpurple/plugins/ssl/ssl.c 9dc2588b12321247b32cfae5056cdc714badf457
+++ libpurple/plugins/ssl/ssl.c 98ff6f03e1b7617a3c0d7db6e3a854fb11b875bc
@@ -92,7 +92,7 @@ static PurplePluginInfo info =
SSL_PLUGIN_ID, /**< id */
N_("SSL"), /**< name */
- VERSION, /**< version */
+ DISPLAY_VERSION, /**< version */
/** summary */
N_("Provides a wrapper around SSL support libraries."),
/** description */
============================================================
--- libpurple/plugins/statenotify.c 7f2a06a5dfe2c6224d309fce446929f940a36b19
+++ libpurple/plugins/statenotify.c 7259a6bd31ed97dc3427ddffb86f64642350af20
@@ -146,7 +146,7 @@ static PurplePluginInfo info =
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."),
============================================================
--- libpurple/plugins/tcl/tcl.c 9778bc6e94edfe8639e7a4f09a9f6b6dfbebd335
+++ libpurple/plugins/tcl/tcl.c cb16ebc9c59581de46b879cce8aca63a723712ee
@@ -419,7 +419,7 @@ static PurplePluginInfo tcl_info =
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 at cs.purdue.edu>",
============================================================
--- libpurple/protocols/bonjour/bonjour.c 35660039ccb51a82ef794cd00cbf4464ce229dce
+++ libpurple/protocols/bonjour/bonjour.c 064472bb81a426955460af9c5b943f16b5badc4c
@@ -476,7 +476,7 @@ static PurplePluginInfo info =
"prpl-bonjour", /**< id */
"Bonjour", /**< name */
- VERSION, /**< version */
+ DISPLAY_VERSION, /**< version */
/** summary */
N_("Bonjour Protocol Plugin"),
/** description */
============================================================
--- libpurple/protocols/gg/gg.c 0faf07275cf08a60cb732273804f345f218bfe74
+++ libpurple/protocols/gg/gg.c abbb6ef98a8f364cf55e326c73f4259b4a36f9d5
@@ -2148,7 +2148,7 @@ static PurplePluginInfo info = {
"prpl-gg", /* id */
"Gadu-Gadu", /* name */
- VERSION, /* version */
+ DISPLAY_VERSION, /* version */
N_("Gadu-Gadu Protocol Plugin"), /* summary */
N_("Polish popular IM"), /* description */
============================================================
--- libpurple/protocols/irc/irc.c b094fcd656e74fcc74b8e0f7526d0023ee4ce543
+++ libpurple/protocols/irc/irc.c d91b7eef61fe6b2b9655ca34c3ca18afd3ac32fc
@@ -910,7 +910,7 @@ static PurplePluginInfo info =
"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 */
============================================================
--- libpurple/protocols/jabber/libxmpp.c c6868a2d6cd1cd84dcb3807b86644f2b79257cf8
+++ libpurple/protocols/jabber/libxmpp.c 49207baa230679f82f82208caa92484218c4f307
@@ -165,7 +165,7 @@ static PurplePluginInfo info =
"prpl-jabber", /**< id */
"XMPP", /**< name */
- VERSION, /**< version */
+ DISPLAY_VERSION, /**< version */
/** summary */
N_("XMPP Protocol Plugin"),
/** description */
============================================================
--- libpurple/protocols/msn/msn.c 1283a458be1913c649ba6882d6335b195bb5b2db
+++ libpurple/protocols/msn/msn.c 1ec80f3bfd4982951c561b7f62bee0e069ecc706
@@ -2147,7 +2147,7 @@ static PurplePluginInfo info =
"prpl-msn", /**< id */
"MSN", /**< name */
- VERSION, /**< version */
+ DISPLAY_VERSION, /**< version */
/** summary */
N_("MSN Protocol Plugin"),
/** description */
============================================================
--- libpurple/protocols/novell/novell.c 3961c5977fa6faf1d28df07f87a8e97ec188127b
+++ libpurple/protocols/novell/novell.c 8495742cffbd95e824304289e5822574e520ecc8
@@ -3513,7 +3513,7 @@ static PurplePluginInfo info = {
PURPLE_PRIORITY_DEFAULT, /**< priority */
"prpl-novell", /**< id */
"GroupWise", /**< name */
- VERSION, /**< version */
+ DISPLAY_VERSION, /**< version */
/** summary */
N_("Novell GroupWise Messenger Protocol Plugin"),
/** description */
============================================================
--- libpurple/protocols/oscar/libaim.c fbfcff7be00b1b7cb1d2378c266b75c61becdec3
+++ libpurple/protocols/oscar/libaim.c 4f0da4126161caa4ad878138965c8ee299bf1834
@@ -113,7 +113,7 @@ static PurplePluginInfo info =
"prpl-aim", /**< id */
"AIM", /**< name */
- VERSION, /**< version */
+ DISPLAY_VERSION, /**< version */
/** summary */
N_("AIM Protocol Plugin"),
/** description */
============================================================
--- libpurple/protocols/oscar/libicq.c 98f6a70278379790c188f1a39b15edfc56f08929
+++ libpurple/protocols/oscar/libicq.c 76dbe1a0959977b16091a3dfd1e1e00ccccb11da
@@ -113,7 +113,7 @@ static PurplePluginInfo info =
"prpl-icq", /**< id */
"ICQ", /**< name */
- VERSION, /**< version */
+ DISPLAY_VERSION, /**< version */
/** summary */
N_("ICQ Protocol Plugin"),
/** description */
============================================================
--- libpurple/protocols/qq/qq.c e96d1ecc360a1b7e094e8e81fda90d893e90617b
+++ libpurple/protocols/qq/qq.c 0e1aca5938c6ac8d9f0ddab44cf1c909d7279537
@@ -720,7 +720,7 @@ static PurplePluginInfo info = {
"prpl-qq", /**< id */
"QQ", /**< name */
- VERSION, /**< version */
+ DISPLAY_VERSION, /**< version */
/** summary */
N_("QQ Protocol Plugin"),
/** description */
============================================================
--- libpurple/protocols/sametime/sametime.c 9492835d905c925629542049b4768598fd40bff8
+++ libpurple/protocols/sametime/sametime.c b83a1ce60bf0300289c824fb48ac8b605fe13b83
@@ -5667,7 +5667,7 @@ static PurplePluginInfo mw_plugin_info =
PLUGIN_ID, /**< id */
PLUGIN_NAME, /**< name */
- VERSION, /**< version */
+ DISPLAY_VERSION, /**< version */
PLUGIN_SUMMARY, /**< summary */
PLUGIN_DESC, /**< description */
PLUGIN_AUTHOR, /**< author */
============================================================
--- libpurple/protocols/simple/simple.c 00d0e300f695d4ac85700eea3af76713db10f666
+++ libpurple/protocols/simple/simple.c 3c059c5356c36c66dfa38f3009e95f8b75fc4e88
@@ -1886,7 +1886,7 @@ static PurplePluginInfo info =
"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 at uni-mannheim.de>", /**< author */
============================================================
--- libpurple/protocols/toc/toc.c 01da5f643ec044322b328d1a2fe13b2845e7ac84
+++ libpurple/protocols/toc/toc.c 82d4264c6fbef6b5f6f20011df18e1203c493972
@@ -2301,7 +2301,7 @@ static PurplePluginInfo info =
"prpl-toc", /**< id */
"TOC", /**< name */
- VERSION, /**< version */
+ DISPLAY_VERSION, /**< version */
/** summary */
N_("TOC Protocol Plugin"),
/** description */
============================================================
--- libpurple/protocols/yahoo/yahoo.c 51ac3a509e068ff6637fe5dc941c30df95a676fd
+++ libpurple/protocols/yahoo/yahoo.c a916341773e43b260a404b5ff18ca930eae903ca
@@ -4353,7 +4353,7 @@ static PurplePluginInfo info =
PURPLE_PRIORITY_DEFAULT, /**< priority */
"prpl-yahoo", /**< id */
"Yahoo", /**< name */
- VERSION, /**< version */
+ DISPLAY_VERSION, /**< version */
/** summary */
N_("Yahoo Protocol Plugin"),
/** description */
============================================================
--- libpurple/protocols/zephyr/zephyr.c c06c1748efe6aca2821e412df32469f05cc99873
+++ libpurple/protocols/zephyr/zephyr.c b4d1efcb55c3639b503616bdcbb2f346f63ab901
@@ -2941,7 +2941,7 @@ static PurplePluginInfo info = {
"prpl-zephyr", /**< id */
"Zephyr", /**< name */
- VERSION, /**< version */
+ DISPLAY_VERSION, /**< version */
/** summary */
N_("Zephyr Protocol Plugin"),
/** description */
============================================================
--- libpurple/prpl.h 619fc26a7e52ef07b82536c9ba88bab5b7397de5
+++ libpurple/prpl.h 7f90a070ff6fc4cdc90d45c5727e78683f465ff0
@@ -338,6 +338,11 @@ struct _PurplePluginProtocolInfo
gboolean (*can_receive_file)(PurpleConnection *, const char *who);
void (*send_file)(PurpleConnection *, const char *who, const char *filename);
PurpleXfer *(*new_xfer)(PurpleConnection *, const char *who);
+
+ /** Checks whether offline messages to @a buddy are supported.
+ * @return @c TRUE if @a buddy can be sent messages while they are
+ * offline, or @c FALSE if not.
+ */
gboolean (*offline_message)(const PurpleBuddy *buddy);
PurpleWhiteboardPrplOps *whiteboard_prpl_ops;
============================================================
--- libpurple/util.c 3e8c83d56aec92ddc526b2a0fc612a1072bebb77
+++ libpurple/util.c 63f196b1db9f1545b3820e1d71a54dc315482679
@@ -1659,7 +1659,7 @@ purple_markup_html_to_xhtml(const char *
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;
@@ -3084,9 +3084,6 @@ purple_str_add_cr(const char *text)
ret[j++] = text[i];
}
- purple_debug_misc("purple_str_add_cr", "got: %s, leaving with %s\n",
- text, ret);
-
return ret;
}
============================================================
--- libpurple/win32/global.mak 19afa1ab12b622fcceea51e01702230b4a78e150
+++ libpurple/win32/global.mak b5dcb08c48b464d7c71009b4113603f6384b35cf
@@ -72,6 +72,7 @@ DEFINES += -DVERSION=\"$(PIDGIN_VERSION
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).
============================================================
--- libpurple/win32/win32dep.c 1cecc3fd2b2f91285e307c2f7deb3707d39d69f7
+++ libpurple/win32/win32dep.c de14fb5de4a8e44fc03cfaf2613e34ee0d6fb8bb
@@ -525,7 +525,7 @@ void wpurple_init(void) {
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",
============================================================
--- pidgin/gtkconv.c cfe5d7f1f518ecd540d4fd55c9e7ed1ba225a9b7
+++ pidgin/gtkconv.c acf7c62637a0f94edc3f854a32f62b5b710eafe8
@@ -319,7 +319,7 @@ debug_command_cb(PurpleConversation *con
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);
============================================================
--- pidgin/gtkdialogs.c d50958bafc85818e0cb1f48c5e156fd17c0a497c
+++ pidgin/gtkdialogs.c 4730033dca59ed739fab62032867b46ead554368
@@ -315,7 +315,7 @@ pidgin_logo_versionize(GdkPixbuf **origi
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 @@ void pidgin_dialogs_about()
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 @@ void pidgin_dialogs_about()
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 "
============================================================
--- pidgin/gtkmain.c ca3036e2264dfdf1b45487235066557a098d7aa1
+++ pidgin/gtkmain.c d7aa2eb74b296c2bdc262e050dfc715672ca1d6b
@@ -92,7 +92,7 @@ static SnDisplay *sn_display = NULL;
* Lists of signals we wish to catch and those we wish to ignore.
* Each list terminated with -1
*/
-static int catch_sig_list[] = {
+static const int catch_sig_list[] = {
SIGSEGV,
SIGHUP,
SIGINT,
@@ -103,7 +103,7 @@ static int catch_sig_list[] = {
-1
};
-static int ignore_sig_list[] = {
+static const int ignore_sig_list[] = {
SIGPIPE,
-1
};
@@ -383,7 +383,7 @@ show_usage(const char *name, gboolean te
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"
@@ -394,7 +394,10 @@ show_usage(const char *name, gboolean te
" -n, --nologin don't automatically login\n"
" -l, --login[=NAME] automatically login (optional argument NAME specifies\n"
" account(s) to use, separated by commas)\n"
- " -v, --version display the current version and exit\n"), PIDGIN_NAME, VERSION, name);
+#ifndef WIN32
+ " --display=DISPLAY X display to use\n"
+#endif
+ " -v, --version display the current version and exit\n"), PIDGIN_NAME, DISPLAY_VERSION, name);
}
purple_print_utf8_to_console(stdout, text);
@@ -481,6 +484,7 @@ int main(int argc, char *argv[])
{"nologin", no_argument, NULL, 'n'},
{"session", required_argument, NULL, 's'},
{"version", no_argument, NULL, 'v'},
+ {"display", required_argument, NULL, 'D'},
{0, 0, 0, 0}
};
@@ -509,7 +513,7 @@ int main(int argc, char *argv[])
#ifndef DEBUG
/* We translate this here in case the crash breaks gettext. */
segfault_message_tmp = g_strdup_printf(_(
- "%s has segfaulted and attempted to dump a core file.\n"
+ "%s %s has segfaulted and attempted to dump a core file.\n"
"This is a bug in the software and has happened through\n"
"no fault of your own.\n\n"
"If you can reproduce the crash, please notify the developers\n"
@@ -523,7 +527,7 @@ int main(int argc, char *argv[])
"LSchiere (via AIM). Contact information for Sean and Luke \n"
"on other protocols is at\n"
"%swiki/DeveloperPages\n"),
- PIDGIN_NAME, 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
@@ -626,6 +630,9 @@ int main(int argc, char *argv[])
case 'm': /* do not ensure single instance. */
opt_si = FALSE;
break;
+ case 'D': /* --display */
+ /* handled by gtk_init_check below */
+ break;
case '?': /* show terse help */
default:
show_usage(argv[0], TRUE);
@@ -647,7 +654,7 @@ int main(int argc, char *argv[])
}
/* 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
@@ -684,7 +691,7 @@ int main(int argc, char *argv[])
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);
============================================================
--- pidgin/gtkutils.c bb6fdf091be3c1589f637f07959bfa346078712a
+++ pidgin/gtkutils.c 81bc86cd23af94f421e9ce23a59378e1c2845921
@@ -2858,7 +2858,7 @@ void pidgin_set_urgent(GtkWindow *window
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 @@ void pidgin_set_urgent(GtkWindow *window
XSetWMHints(GDK_WINDOW_XDISPLAY(gdkwin),
GDK_WINDOW_XWINDOW(gdkwin), hints);
XFree(hints);
+#else
+ /* do something else? */
#endif
}
============================================================
--- pidgin/plugins/cap/cap.c e1db77e968070db53bb79b1bf8cd8ef7c7edd589
+++ pidgin/plugins/cap/cap.c f88aa339e4ed5ed1288b509e4ce038c36ce420fa
@@ -934,7 +934,7 @@ static PurplePluginInfo info = {
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 */
============================================================
--- pidgin/plugins/contact_priority.c f6451361b24fec1a374475bf5cfb45286eeb8e51
+++ pidgin/plugins/contact_priority.c 721fbac5882c60b779dcb13ea46a6d2ed83bfaa1
@@ -185,7 +185,7 @@ static PurplePluginInfo info =
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 */
============================================================
--- pidgin/plugins/convcolors.c dc4848c670c3eee458ba20e9ba8e26a94d0a3ec7
+++ pidgin/plugins/convcolors.c 483eecbcbef0716b770f22e9e4791772d64a2e48
@@ -340,7 +340,7 @@ static PurplePluginInfo info =
PLUGIN_ID, /* plugin id */
PLUGIN_NAME, /* name */
- VERSION, /* version */
+ DISPLAY_VERSION, /* version */
PLUGIN_SUMMARY, /* summary */
PLUGIN_DESCRIPTION, /* description */
PLUGIN_AUTHOR, /* author */
============================================================
--- pidgin/plugins/crazychat/cc_pidgin_plugin.c 79a25099f2e33d9e55c0e593f3f4f6508cfa03ce
+++ pidgin/plugins/crazychat/cc_pidgin_plugin.c 5f8a2767a523bd564a3bc96d4df58414e91b3afe
@@ -144,7 +144,7 @@ static PurplePluginInfo info = {
CRAZYCHAT_PLUGIN_ID, /**< id */
N_("Crazychat"), /**< name */
- VERSION, /**< version */
+ DISPLAY_VERSION, /**< version */
/** summary */
N_("Plugin to establish a Crazychat session."),
/** description */
============================================================
--- pidgin/plugins/extplacement.c b2f6bffe7848d5ff3790d7ae0a34d44e0976a2be
+++ pidgin/plugins/extplacement.c 0957541b05af61ab5a7660db4d7bf96a9823c5a4
@@ -144,7 +144,7 @@ static PurplePluginInfo info =
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,"
============================================================
--- pidgin/plugins/gestures/gestures.c a3728b116e2163e62453af2a08af9bf177f5cf24
+++ pidgin/plugins/gestures/gestures.c a15e8bbb57ca9a81b626e69c5273b4b141aa8903
@@ -293,7 +293,7 @@ static PurplePluginInfo info =
GESTURES_PLUGIN_ID, /**< id */
N_("Mouse Gestures"), /**< name */
- VERSION, /**< version */
+ DISPLAY_VERSION, /**< version */
/** summary */
N_("Provides support for mouse gestures"),
/** description */
============================================================
--- pidgin/plugins/gtk-signals-test.c 39f747c8a152e5d57b5651a59da45db53e6d7f82
+++ pidgin/plugins/gtk-signals-test.c bc65cc0262217161cbed19ef2f9df5ce06511e17
@@ -158,7 +158,7 @@ static PurplePluginInfo info =
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 */
============================================================
--- pidgin/plugins/gtkbuddynote.c 1fd6753cdc854757b15b841f0c9724c694c5fe73
+++ pidgin/plugins/gtkbuddynote.c 21f123d90ab88e7c9abcee059d656b022a57cc41
@@ -72,7 +72,7 @@ static PurplePluginInfo info =
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 */
============================================================
--- pidgin/plugins/history.c 9f8f347e2f4581fdb825ae41c84d6645eb2ca496
+++ pidgin/plugins/history.c 28c51cdbef04467e6a067a65d0b5a53409fab0f4
@@ -189,7 +189,7 @@ static PurplePluginInfo info =
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."),
============================================================
--- pidgin/plugins/iconaway.c af279a6fc005fb83f274f65fc9661d951712a996
+++ pidgin/plugins/iconaway.c 30b8d9b6fae4b9ed0c367db3ef7559515ea69bc8
@@ -80,7 +80,7 @@ static PurplePluginInfo info =
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 */
============================================================
--- pidgin/plugins/mailchk.c 8288215d17f6fc85aa2971999d348cad5d0c448c
+++ pidgin/plugins/mailchk.c 6ae526cbe9e9ab03f0584bca32628db8d0189ef9
@@ -158,7 +158,7 @@ static PurplePluginInfo info =
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."),
============================================================
--- pidgin/plugins/markerline.c f4b3ea2e1037723f886b0d023fb094ab48fc7faf
+++ pidgin/plugins/markerline.c 58e1b8aeb9cec0b246973ed0d715ea41ec5e1aa8
@@ -281,7 +281,7 @@ static PurplePluginInfo info = {
PLUGIN_ID, /* plugin id */
PLUGIN_NAME, /* name */
- VERSION, /* version */
+ DISPLAY_VERSION, /* version */
PLUGIN_SUMMARY, /* summary */
PLUGIN_DESCRIPTION, /* description */
PLUGIN_AUTHOR, /* author */
============================================================
--- pidgin/plugins/musicmessaging/musicmessaging.c 5cc37fe09cd0c4f65b7f63783dd729c89ae3a408
+++ pidgin/plugins/musicmessaging/musicmessaging.c bab1d0b3150f1ef81a04c9d583a8e66e49ef5559
@@ -681,7 +681,7 @@ static PurplePluginInfo info = {
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."),
============================================================
--- pidgin/plugins/notify.c 7a5601f0a6f85d8bd90991906a0338e825c08bbc
+++ pidgin/plugins/notify.c 4d1f95e3c8d56ebb6a02c83d148c954fc1bea5ed
@@ -905,7 +905,7 @@ static PurplePluginInfo info =
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 */
============================================================
--- pidgin/plugins/pidgininc.c 9cccc4bca4ea1346bb0c64b9666d765b4988e86f
+++ pidgin/plugins/pidgininc.c 1d5b9484c26f280ecc51cf70ea1cf80babeaf703
@@ -89,7 +89,7 @@ static PurplePluginInfo info =
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 */
============================================================
--- pidgin/plugins/pidginrc.c ac23c6523da0b0f6db761575bd94ae69f4f6f47a
+++ pidgin/plugins/pidginrc.c 16986047addad62f1f9e3f450fc883daa1dc81dd
@@ -542,7 +542,7 @@ static PurplePluginInfo purplerc_info =
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 at eden.rutgers.edu>",
============================================================
--- pidgin/plugins/raw.c 80ca9194193a1db61308371f30710b52984be279
+++ pidgin/plugins/raw.c 03a96a49c27c5d9311400fb6b49c5e1ce77807c1
@@ -173,7 +173,7 @@ static PurplePluginInfo info =
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."),
============================================================
--- pidgin/plugins/relnot.c 5cd2e63cd0ad62265b020d9cc4e526212aaaaf89
+++ pidgin/plugins/relnot.c 31d71931c37815bfd8c12d95d1b21b9bc778a864
@@ -141,7 +141,7 @@ static PurplePluginInfo info =
"gtk-relnot", /**< id */
N_("Release Notification"), /**< name */
- VERSION, /**< version */
+ DISPLAY_VERSION, /**< version */
/** summary */
N_("Checks periodically for new releases."),
/** description */
============================================================
--- pidgin/plugins/spellchk.c ea596cc7b927a1b46d71cc1954363c172e244872
+++ pidgin/plugins/spellchk.c 2b350f823dde049d93e0a5fd57bd855e1b1b6fd3
@@ -2368,7 +2368,7 @@ static PurplePluginInfo info =
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 at warmenhoven.org>",
============================================================
--- pidgin/plugins/ticker/ticker.c 41b7b32fce7a2847c78106e1fcd999fd5ef73271
+++ pidgin/plugins/ticker/ticker.c 9bcb12fe98bd4b0aa82354cdab6ba674a5a300cb
@@ -354,7 +354,7 @@ static PurplePluginInfo info =
TICKER_PLUGIN_ID, /**< id */
N_("Buddy Ticker"), /**< name */
- VERSION, /**< version */
+ DISPLAY_VERSION, /**< version */
/** summary */
N_("A horizontal scrolling version of the buddy list."),
/** description */
============================================================
--- pidgin/plugins/timestamp.c adf6a99d07577ad1d1a513b94498eb1316f08154
+++ pidgin/plugins/timestamp.c 327c567426f9bac36e17fe26f032d90c9bcdc2c7
@@ -200,7 +200,7 @@ static PurplePluginInfo info =
TIMESTAMP_PLUGIN_ID, /**< id */
N_("Timestamp"), /**< name */
- VERSION, /**< version */
+ DISPLAY_VERSION, /**< version */
/** summary */
N_("Display iChat-style timestamps"),
/** description */
============================================================
--- pidgin/plugins/timestamp_format.c 8cf87adb0cdaaf452552be99e0f5185355e1698f
+++ pidgin/plugins/timestamp_format.c 18c4faf115662bdb24d643e7c66090aaee440d88
@@ -149,7 +149,7 @@ static PurplePluginInfo info =
"core-timestamp_format", /**< id */
N_("Message Timestamp Formats"), /**< name */
- VERSION, /**< version */
+ DISPLAY_VERSION, /**< version */
/** summary */
N_("Customizes the message timestamp formats."),
/** description */
============================================================
--- pidgin/plugins/win32/transparency/win2ktrans.c 9601ee40bdec944b0d0a863416b2d6ccf54f3614
+++ pidgin/plugins/win32/transparency/win2ktrans.c c9419c54d8c44ffe281323edf725136838a3a7a2
@@ -691,7 +691,7 @@ static PurplePluginInfo info =
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 */
============================================================
--- pidgin/plugins/win32/winprefs/winprefs.c 2cd4aab26238e162aadbb88cc9b6ce2e1636ef0d
+++ pidgin/plugins/win32/winprefs/winprefs.c 1d4cce6d91d5f1bfc67c123f2e47e3b2a41453c3
@@ -369,7 +369,7 @@ static PurplePluginInfo info =
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 at yahoo.com>",
============================================================
--- pidgin/plugins/xmppconsole.c be5b9805736dd1441508fdcf68a7aba27079683f
+++ pidgin/plugins/xmppconsole.c 80cff9dcd5c30e00d94c5bc534b75c58de93405c
@@ -858,7 +858,7 @@ static PurplePluginInfo info =
"gtk-xmpp", /**< id */
N_("XMPP Console"), /**< name */
- VERSION, /**< version */
+ DISPLAY_VERSION, /**< version */
/** summary */
N_("Send and receive raw XMPP stanzas."),
/** description */
More information about the Commits
mailing list