Mercurial > pidgin.yaz
changeset 26594:865ed80b17e1
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
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Wed, 08 Apr 2009 01:40:39 +0000 |
| parents | c5920a8cf83f |
| children | 1141d9c3c350 |
| files | pidgin/gtkplugin.c pidgin/plugins/musicmessaging/musicmessaging.c |
| diffstat | 2 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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);
--- 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;