# HG changeset patch # User Tim Ringenbach # Date 1103160686 0 # Node ID 232808c6d6ab0b6bd874db5a1f3cfa83e60c6a7d # Parent 5ea6c9dd10a2c31a937401aa1cfc40dd38c407d9 [gaim-migrate @ 11612] 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 diff -r 5ea6c9dd10a2 -r 232808c6d6ab src/gtkprefs.c --- 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 @@ "%s %s\n\n" "%s\n\n" "%s", - pname, plug->info->version, perr, pdesc); + pname, plug->info->version, perr, pdesc ? pdesc : ""); g_free(perr); } else { buf = g_strdup_printf( "%s %s\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 @@ "URL: %s\n" "File name: %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); diff -r 5ea6c9dd10a2 -r 232808c6d6ab src/protocols/yahoo/yahoo.c --- 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) {