Mercurial > pidgin.yaz
changeset 10386:232808c6d6ab
[gaim-migrate @ 11612]
<datallah> i've got a little crash fix for missing plugin info (ala bug 1083900)
There's a yahoo whitespace fix thrown in there too.
committer: Tailor Script <tailor@pidgin.im>
| author | Tim Ringenbach <marv@pidgin.im> |
|---|---|
| date | Thu, 16 Dec 2004 01:31:26 +0000 |
| parents | 5ea6c9dd10a2 |
| children | 00cd0c08bb04 |
| files | src/gtkprefs.c src/protocols/yahoo/yahoo.c |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gtkprefs.c Wed Dec 15 22:59:13 2004 +0000 +++ b/src/gtkprefs.c Thu Dec 16 01:31:26 2004 +0000 @@ -1797,13 +1797,13 @@ "<span size=\"larger\">%s %s</span>\n\n" "<span weight=\"bold\" color=\"red\">%s</span>\n\n" "%s", - pname, plug->info->version, perr, pdesc); + pname, plug->info->version, perr, pdesc ? pdesc : ""); g_free(perr); } else { buf = g_strdup_printf( "<span size=\"larger\">%s %s</span>\n\n%s", - pname, plug->info->version, pdesc); + pname, plug->info->version, pdesc ? pdesc : ""); } gtk_label_set_markup(GTK_LABEL(plugin_description), buf); g_free(buf); @@ -1820,7 +1820,7 @@ "<span weight=\"bold\">URL:</span> %s\n" "<span weight=\"bold\">File name:</span> %s"), #endif - pname, plug->info->version, pauth, pweb, plug->path); + pname, plug->info->version, pauth ? pauth : "", pweb ? pweb : "", plug->path); gtk_label_set_markup(GTK_LABEL(plugin_details), buf); g_value_unset(&val);
--- a/src/protocols/yahoo/yahoo.c Wed Dec 15 22:59:13 2004 +0000 +++ b/src/protocols/yahoo/yahoo.c Thu Dec 16 01:31:26 2004 +0000 @@ -881,7 +881,7 @@ } } else if (pkt->status == 2) { gaim_notify_error(gc, NULL, - _("Your Yahoo! message did not get sent."), NULL); + _("Your Yahoo! message did not get sent."), NULL); } for (l = list; l; l = l->next) {