pidgin.2.5.6: 28add44d: applied changes from 20269e8849976ad6a09...

[elb at pidgin.im]

-----------------------------------------------------------------
Revision: 28add44da066ea7181a5dd3392ca65eaf1786183
Ancestor: f29c90f0da72e27c601fd8c4e1aff2a250a52473
Author: elb at pidgin.im
Date: 2009-04-28T20:14:08
Branch: im.pidgin.pidgin.2.5.6
URL: http://d.pidgin.im/viewmtn/revision/info/28add44da066ea7181a5dd3392ca65eaf1786183

Modified files:
        pidgin/gtkconv.c pidgin/gtkdialogs.c pidgin/gtkmain.c

ChangeLog: 

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.

-------------- next part --------------
============================================================
--- pidgin/gtkconv.c	8d45df2ef52a6e98834f204573ab46f707480df7
+++ pidgin/gtkconv.c	6a26a652bb520e070bfb5764e23d23d10f2c388d
@@ -329,7 +329,8 @@ 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", 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);
============================================================
--- pidgin/gtkdialogs.c	4e18815eb6221b2a6bd5d29819da4ce2bb67991a
+++ pidgin/gtkdialogs.c	b7ff7cf543bf35b4225b9420d0c55398780c693e
@@ -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 @@ 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, 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 "
============================================================
--- pidgin/gtkmain.c	9969c0180c98f26e1312f35b33092667914b9dea
+++ pidgin/gtkmain.c	42a28424a12df1de6b2555ed67e3b8aa75ccf8c4
@@ -665,7 +665,8 @@ int main(int argc, char *argv[])
 	}
 	/* 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