# HG changeset patch
# User Ethan Blanton <elb@pidgin.im>
# Date 1240949648 0
# Node ID 2a34a3f5da2e66d63f3702cfa72bda5c3ac7cbf3
# Parent  96814f0cfe49698c1847d1e218504824b8963d55
applied changes from 20269e8849976ad6a0996f79ccbc0a12a311484f
             through e9af692071731a2eec5087a51005e19b74012e93

applied changes from e1b1e80d999e393a80f201a484ef61289c258fbe
             through 20269e8849976ad6a0996f79ccbc0a12a311484f

applied changes from e9af692071731a2eec5087a51005e19b74012e93
             through e0170b7d1bb1bb03c7354d57d2d249842528f163

Add libpurple version info to pidgin --version, /debug, and About.

diff -r 96814f0cfe49 -r 2a34a3f5da2e pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Mon Mar 02 02:29:53 2009 +0000
+++ b/pidgin/gtkconv.c	Tue Apr 28 20:14:08 2009 +0000
@@ -329,7 +329,8 @@
 	PurpleCmdStatus status;
 
 	if (!g_ascii_strcasecmp(args[0], "version")) {
-		tmp = g_strdup_printf("me is using %s v%s.", "Pidgin", DISPLAY_VERSION);
+		tmp = g_strdup_printf("me is using Pidgin v%s with libpurple v%s.",
+				DISPLAY_VERSION, purple_core_get_version());
 		markup = g_markup_escape_text(tmp, -1);
 
 		status = purple_cmd_do_command(conv, tmp, markup, error);
diff -r 96814f0cfe49 -r 2a34a3f5da2e pidgin/gtkdialogs.c
--- a/pidgin/gtkdialogs.c	Mon Mar 02 02:29:53 2009 +0000
+++ b/pidgin/gtkdialogs.c	Tue Apr 28 20:14:08 2009 +0000
@@ -33,6 +33,7 @@
 #include "prpl.h"
 #include "request.h"
 #include "util.h"
+#include "core.h"
 
 #include "gtkblist.h"
 #include "gtkdialogs.h"
@@ -441,7 +442,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, DISPLAY_VERSION);
+		"<CENTER><FONT SIZE=\"4\"><B>%s %s</B></FONT></CENTER><BR>(libpurple %s)<BR><BR>", PIDGIN_NAME, DISPLAY_VERSION, purple_core_get_version());
 
 	g_string_append_printf(str,
 		_("%s is a graphical modular messaging client based on "
diff -r 96814f0cfe49 -r 2a34a3f5da2e pidgin/gtkmain.c
--- a/pidgin/gtkmain.c	Mon Mar 02 02:29:53 2009 +0000
+++ b/pidgin/gtkmain.c	Tue Apr 28 20:14:08 2009 +0000
@@ -665,7 +665,8 @@
 	}
 	/* show version message */
 	if (opt_version) {
-		printf("%s %s\n", PIDGIN_NAME, DISPLAY_VERSION);
+		printf("%s %s (libpurple %s)\n", PIDGIN_NAME, DISPLAY_VERSION,
+		                                 purple_core_get_version());
 #ifdef HAVE_SIGNAL_H
 		g_free(segfault_message);
 #endif