pidgin: 2f74488d: More Pidgin updates for GTK+ 3.0. Remove...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 2f74488ded7cd1eab2d144578340b6d13f570b7a
Ancestor: d06861c0233a08c48f31b253b29595bf9af87618
Author: qulogic at pidgin.im
Date: 2009-04-08T01:40:39
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/2f74488ded7cd1eab2d144578340b6d13f570b7a

Modified files:
        pidgin/gtkplugin.c
        pidgin/plugins/musicmessaging/musicmessaging.c

ChangeLog: 

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


-------------- next part --------------
============================================================
--- pidgin/gtkplugin.c	a3793dab0ac2994ca67261de71b0dfbcebd390e9
+++ pidgin/gtkplugin.c	945abb36ea0268ff6990f5443685afddca0db71f
@@ -135,7 +135,13 @@ update_plugin_list(void *data)
 
 		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);
 
============================================================
--- pidgin/plugins/musicmessaging/musicmessaging.c	bab1d0b3150f1ef81a04c9d583a8e66e49ef5559
+++ pidgin/plugins/musicmessaging/musicmessaging.c	34f80aa9155433618e769dbce3930186684798da
@@ -529,7 +529,7 @@ static void run_editor (MMConversation *
 	
 	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;