Mercurial > pidgin
changeset 26534:1141d9c3c350
merge of '2f74488ded7cd1eab2d144578340b6d13f570b7a'
and '3cb7456ced922a751171f95e0ab55d0beef7d1ec'
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Fri, 10 Apr 2009 07:31:51 +0000 |
| parents | 865ed80b17e1 (diff) b1b166fa99e2 (current diff) |
| children | a9ce6dedbf35 65d599736f3d |
| files | |
| diffstat | 2 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkplugin.c Fri Apr 10 07:30:32 2009 +0000 +++ b/pidgin/gtkplugin.c Fri Apr 10 07:31:51 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 Fri Apr 10 07:30:32 2009 +0000 +++ b/pidgin/plugins/musicmessaging/musicmessaging.c Fri Apr 10 07:31:51 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;