Mercurial > pidgin3 / changeset

--- a/configure.ac	Fri Nov 09 08:33:47 2007 +0000
+++ b/configure.ac	Fri Nov 09 08:39:14 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	Fri Nov 09 08:33:47 2007 +0000
+++ b/finch/finch.c	Fri Nov 09 08:39:14 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	Fri Nov 09 08:33:47 2007 +0000
+++ b/finch/gntconv.c	Fri Nov 09 08:39:14 2007 +0000
@@ -1011,7 +1011,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	Fri Nov 09 08:33:47 2007 +0000
+++ b/finch/plugins/gntclipboard.c	Fri Nov 09 08:39:14 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	Fri Nov 09 08:33:47 2007 +0000
+++ b/finch/plugins/gntgf.c	Fri Nov 09 08:39:14 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	Fri Nov 09 08:33:47 2007 +0000
+++ b/finch/plugins/gnthistory.c	Fri Nov 09 08:39:14 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	Fri Nov 09 08:33:47 2007 +0000
+++ b/finch/plugins/lastlog.c	Fri Nov 09 08:39:14 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/conversation.h	Fri Nov 09 08:33:47 2007 +0000
+++ b/libpurple/conversation.h	Fri Nov 09 08:39:14 2007 +0000
@@ -172,9 +172,12 @@
 	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,

--- a/libpurple/plugins/autoaccept.c	Fri Nov 09 08:33:47 2007 +0000
+++ b/libpurple/plugins/autoaccept.c	Fri Nov 09 08:39:14 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	Fri Nov 09 08:33:47 2007 +0000
+++ b/libpurple/plugins/buddynote.c	Fri Nov 09 08:39:14 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	Fri Nov 09 08:33:47 2007 +0000
+++ b/libpurple/plugins/ciphertest.c	Fri Nov 09 08:39:14 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	Fri Nov 09 08:33:47 2007 +0000
+++ b/libpurple/plugins/dbus-example.c	Fri Nov 09 08:39:14 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	Fri Nov 09 08:33:47 2007 +0000
+++ b/libpurple/plugins/debug_example.c	Fri Nov 09 08:39:14 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	Fri Nov 09 08:33:47 2007 +0000
+++ b/libpurple/plugins/filectl.c	Fri Nov 09 08:39:14 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	Fri Nov 09 08:33:47 2007 +0000
+++ b/libpurple/plugins/helloworld.c	Fri Nov 09 08:39:14 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	Fri Nov 09 08:33:47 2007 +0000
+++ b/libpurple/plugins/idle.c	Fri Nov 09 08:39:14 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	Fri Nov 09 08:33:47 2007 +0000
+++ b/libpurple/plugins/ipc-test-client.c	Fri Nov 09 08:39:14 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	Fri Nov 09 08:33:47 2007 +0000
+++ b/libpurple/plugins/ipc-test-server.c	Fri Nov 09 08:39:14 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	Fri Nov 09 08:33:47 2007 +0000
+++ b/libpurple/plugins/joinpart.c	Fri Nov 09 08:39:14 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	Fri Nov 09 08:33:47 2007 +0000
+++ b/libpurple/plugins/log_reader.c	Fri Nov 09 08:39:14 2007 +0000
@@ -2918,7 +2918,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	Fri Nov 09 08:33:47 2007 +0000
+++ b/libpurple/plugins/mono/loader/mono.c	Fri Nov 09 08:39:14 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	Fri Nov 09 08:33:47 2007 +0000
+++ b/libpurple/plugins/newline.c	Fri Nov 09 08:39:14 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	Fri Nov 09 08:33:47 2007 +0000
+++ b/libpurple/plugins/notify_example.c	Fri Nov 09 08:39:14 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	Fri Nov 09 08:33:47 2007 +0000
+++ b/libpurple/plugins/offlinemsg.c	Fri Nov 09 08:39:14 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	Fri Nov 09 08:33:47 2007 +0000
+++ b/libpurple/plugins/perl/perl.c	Fri Nov 09 08:39:14 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	Fri Nov 09 08:33:47 2007 +0000
+++ b/libpurple/plugins/pluginpref_example.c	Fri Nov 09 08:39:14 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	Fri Nov 09 08:33:47 2007 +0000
+++ b/libpurple/plugins/psychic.c	Fri Nov 09 08:39:14 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	Fri Nov 09 08:33:47 2007 +0000
+++ b/libpurple/plugins/signals-test.c	Fri Nov 09 08:39:14 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	Fri Nov 09 08:33:47 2007 +0000
+++ b/libpurple/plugins/simple.c	Fri Nov 09 08:39:14 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	Fri Nov 09 08:33:47 2007 +0000
+++ b/libpurple/plugins/ssl/ssl-gnutls.c	Fri Nov 09 08:39:14 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	Fri Nov 09 08:33:47 2007 +0000
+++ b/libpurple/plugins/ssl/ssl-nss.c	Fri Nov 09 08:39:14 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	Fri Nov 09 08:33:47 2007 +0000
+++ b/libpurple/plugins/ssl/ssl.c	Fri Nov 09 08:39:14 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	Fri Nov 09 08:33:47 2007 +0000
+++ b/libpurple/plugins/statenotify.c	Fri Nov 09 08:39:14 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	Fri Nov 09 08:33:47 2007 +0000
+++ b/libpurple/plugins/tcl/tcl.c	Fri Nov 09 08:39:14 2007 +0000
@@ -419,7 +419,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	Fri Nov 09 08:33:47 2007 +0000
+++ b/libpurple/protocols/bonjour/bonjour.c	Fri Nov 09 08:39:14 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	Fri Nov 09 08:33:47 2007 +0000
+++ b/libpurple/protocols/gg/gg.c	Fri Nov 09 08:39:14 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	Fri Nov 09 08:33:47 2007 +0000
+++ b/libpurple/protocols/irc/irc.c	Fri Nov 09 08:39:14 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	Fri Nov 09 08:33:47 2007 +0000
+++ b/libpurple/protocols/jabber/libxmpp.c	Fri Nov 09 08:39:14 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	Fri Nov 09 08:33:47 2007 +0000
+++ b/libpurple/protocols/msn/msn.c	Fri Nov 09 08:39:14 2007 +0000
@@ -2147,7 +2147,7 @@
 
 	"prpl-msn",                                       /**< id             */
 	"MSN",                                            /**< name           */
-	VERSION,                                          /**< version        */
+	DISPLAY_VERSION,                                  /**< version        */
 	                                                  /**  summary        */
 	N_("MSN Protocol Plugin"),
 	                                                  /**  description    */

--- a/libpurple/protocols/novell/novell.c	Fri Nov 09 08:33:47 2007 +0000
+++ b/libpurple/protocols/novell/novell.c	Fri Nov 09 08:39:14 2007 +0000
@@ -3513,7 +3513,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	Fri Nov 09 08:33:47 2007 +0000
+++ b/libpurple/protocols/oscar/libaim.c	Fri Nov 09 08:39:14 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	Fri Nov 09 08:33:47 2007 +0000
+++ b/libpurple/protocols/oscar/libicq.c	Fri Nov 09 08:39:14 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	Fri Nov 09 08:33:47 2007 +0000
+++ b/libpurple/protocols/qq/qq.c	Fri Nov 09 08:39:14 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	Fri Nov 09 08:33:47 2007 +0000
+++ b/libpurple/protocols/sametime/sametime.c	Fri Nov 09 08:39:14 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/simple/simple.c	Fri Nov 09 08:33:47 2007 +0000
+++ b/libpurple/protocols/simple/simple.c	Fri Nov 09 08:39:14 2007 +0000
@@ -1886,7 +1886,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/toc/toc.c	Fri Nov 09 08:33:47 2007 +0000
+++ b/libpurple/protocols/toc/toc.c	Fri Nov 09 08:39:14 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	Fri Nov 09 08:33:47 2007 +0000
+++ b/libpurple/protocols/yahoo/yahoo.c	Fri Nov 09 08:39:14 2007 +0000
@@ -4353,7 +4353,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	Fri Nov 09 08:33:47 2007 +0000
+++ b/libpurple/protocols/zephyr/zephyr.c	Fri Nov 09 08:39:14 2007 +0000
@@ -2941,7 +2941,7 @@
 
 	"prpl-zephyr",					   /**< id	       */
 	"Zephyr",						 /**< name	     */
-	VERSION,						  /**< version	      */
+	DISPLAY_VERSION,					  /**< version	      */
 	/**  summary	    */
 	N_("Zephyr Protocol Plugin"),
 	/**  description    */

--- a/libpurple/prpl.h	Fri Nov 09 08:33:47 2007 +0000
+++ b/libpurple/prpl.h	Fri Nov 09 08:39:14 2007 +0000
@@ -338,6 +338,11 @@
 	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;

--- a/libpurple/util.c	Fri Nov 09 08:33:47 2007 +0000
+++ b/libpurple/util.c	Fri Nov 09 08:39:14 2007 +0000
@@ -1659,7 +1659,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;
@@ -3084,9 +3084,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	Fri Nov 09 08:33:47 2007 +0000
+++ b/libpurple/win32/global.mak	Fri Nov 09 08:39:14 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	Fri Nov 09 08:33:47 2007 +0000
+++ b/libpurple/win32/win32dep.c	Fri Nov 09 08:39:14 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	Fri Nov 09 08:33:47 2007 +0000
+++ b/pidgin/gtkconv.c	Fri Nov 09 08:39:14 2007 +0000
@@ -319,7 +319,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	Fri Nov 09 08:33:47 2007 +0000
+++ b/pidgin/gtkdialogs.c	Fri Nov 09 08:39:14 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	Fri Nov 09 08:33:47 2007 +0000
+++ b/pidgin/gtkmain.c	Fri Nov 09 08:39:14 2007 +0000
@@ -92,7 +92,7 @@
  * 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 @@
 	-1
 };
 
-static int ignore_sig_list[] = {
+static const int ignore_sig_list[] = {
 	SIGPIPE,
 	-1
 };
@@ -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"
@@ -394,7 +394,10 @@
 		       "  -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 @@
 		{"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 @@
 #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 @@
 			"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 @@
 		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 @@
 	}
 	/* 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 @@
 	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	Fri Nov 09 08:33:47 2007 +0000
+++ b/pidgin/gtkutils.c	Fri Nov 09 08:39:14 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	Fri Nov 09 08:33:47 2007 +0000
+++ b/pidgin/plugins/cap/cap.c	Fri Nov 09 08:39:14 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	Fri Nov 09 08:33:47 2007 +0000
+++ b/pidgin/plugins/contact_priority.c	Fri Nov 09 08:39:14 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	Fri Nov 09 08:33:47 2007 +0000
+++ b/pidgin/plugins/convcolors.c	Fri Nov 09 08:39:14 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	Fri Nov 09 08:33:47 2007 +0000
+++ b/pidgin/plugins/crazychat/cc_pidgin_plugin.c	Fri Nov 09 08:39:14 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	Fri Nov 09 08:33:47 2007 +0000
+++ b/pidgin/plugins/extplacement.c	Fri Nov 09 08:39:14 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	Fri Nov 09 08:33:47 2007 +0000
+++ b/pidgin/plugins/gestures/gestures.c	Fri Nov 09 08:39:14 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/gtk-signals-test.c	Fri Nov 09 08:33:47 2007 +0000
+++ b/pidgin/plugins/gtk-signals-test.c	Fri Nov 09 08:39:14 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	Fri Nov 09 08:33:47 2007 +0000
+++ b/pidgin/plugins/gtkbuddynote.c	Fri Nov 09 08:39:14 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	Fri Nov 09 08:33:47 2007 +0000
+++ b/pidgin/plugins/history.c	Fri Nov 09 08:39:14 2007 +0000
@@ -189,7 +189,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	Fri Nov 09 08:33:47 2007 +0000
+++ b/pidgin/plugins/iconaway.c	Fri Nov 09 08:39:14 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	Fri Nov 09 08:33:47 2007 +0000
+++ b/pidgin/plugins/mailchk.c	Fri Nov 09 08:39:14 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	Fri Nov 09 08:33:47 2007 +0000
+++ b/pidgin/plugins/markerline.c	Fri Nov 09 08:39:14 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	Fri Nov 09 08:33:47 2007 +0000
+++ b/pidgin/plugins/musicmessaging/musicmessaging.c	Fri Nov 09 08:39:14 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	Fri Nov 09 08:33:47 2007 +0000
+++ b/pidgin/plugins/notify.c	Fri Nov 09 08:39:14 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	Fri Nov 09 08:33:47 2007 +0000
+++ b/pidgin/plugins/pidgininc.c	Fri Nov 09 08:39:14 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	Fri Nov 09 08:33:47 2007 +0000
+++ b/pidgin/plugins/pidginrc.c	Fri Nov 09 08:39:14 2007 +0000
@@ -542,7 +542,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	Fri Nov 09 08:33:47 2007 +0000
+++ b/pidgin/plugins/raw.c	Fri Nov 09 08:39:14 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	Fri Nov 09 08:33:47 2007 +0000
+++ b/pidgin/plugins/relnot.c	Fri Nov 09 08:39:14 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	Fri Nov 09 08:33:47 2007 +0000
+++ b/pidgin/plugins/spellchk.c	Fri Nov 09 08:39:14 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	Fri Nov 09 08:33:47 2007 +0000
+++ b/pidgin/plugins/ticker/ticker.c	Fri Nov 09 08:39:14 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	Fri Nov 09 08:33:47 2007 +0000
+++ b/pidgin/plugins/timestamp.c	Fri Nov 09 08:39:14 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	Fri Nov 09 08:33:47 2007 +0000
+++ b/pidgin/plugins/timestamp_format.c	Fri Nov 09 08:39:14 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	Fri Nov 09 08:33:47 2007 +0000
+++ b/pidgin/plugins/win32/transparency/win2ktrans.c	Fri Nov 09 08:39:14 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	Fri Nov 09 08:33:47 2007 +0000
+++ b/pidgin/plugins/win32/winprefs/winprefs.c	Fri Nov 09 08:39:14 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	Fri Nov 09 08:33:47 2007 +0000
+++ b/pidgin/plugins/xmppconsole.c	Fri Nov 09 08:39:14 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    */