# HG changeset patch
# User Elliott Sales de Andrade <qulogic@pidgin.im>
# Date 1239154839 0
# Node ID 865ed80b17e131df0c82b3768e7457bc2a745e65
# Parent  c5920a8cf83fea03ee794722f24e5cbd993b2d72
More Pidgin updates for GTK+ 3.0. Removes any deprecated functions for GLib
only.
This should now compile with:
-DG_DISABLE_SINGLE_INCLUDES
-DG_DISABLE_DEPRECATED
-DGDK_DISABLE_SINGLE_INCLUDES
-DGTK_DISABLE_SINGLE_INCLUDES

diff -r c5920a8cf83f -r 865ed80b17e1 pidgin/gtkplugin.c
--- a/pidgin/gtkplugin.c	Tue Apr 07 23:26:33 2009 +0000
+++ b/pidgin/gtkplugin.c	Wed Apr 08 01:40:39 2009 +0000
@@ -135,7 +135,13 @@
 
 		gtk_list_store_append (ls, &iter);
 
-		name = g_markup_escape_text(plug->info->name ? _(plug->info->name) : g_basename(plug->path), -1);
+		if (plug->info->name) {
+			name = g_markup_escape_text(_(plug->info->name), -1);
+		} else {
+			char *tmp = g_path_get_basename(plug->path);
+			name = g_markup_escape_text(tmp, -1);
+			g_free(tmp);
+		}
 		version = g_markup_escape_text(purple_plugin_get_version(plug), -1);
 		summary = g_markup_escape_text(purple_plugin_get_summary(plug), -1);
 
diff -r c5920a8cf83f -r 865ed80b17e1 pidgin/plugins/musicmessaging/musicmessaging.c
--- a/pidgin/plugins/musicmessaging/musicmessaging.c	Tue Apr 07 23:26:33 2009 +0000
+++ b/pidgin/plugins/musicmessaging/musicmessaging.c	Wed Apr 08 01:40:39 2009 +0000
@@ -529,7 +529,7 @@
 	
 	args[1] = "-session_id";
 	session_id = g_string_new("");
-	g_string_sprintfa(session_id, "%d", mmconv_from_conv_loc(mmconv->conv));
+	g_string_append_printf(session_id, "%d", mmconv_from_conv_loc(mmconv->conv));
 	args[2] = session_id->str;
 	
 	args[3] = NULL;