Mercurial > pidgin
changeset 15940:2b8d4fabc103
merge of '479ec3bc42bb56e872fb1e8d5975ee5cc73f9cb8'
and 'af97194f292b3a82f2a36fc3094f579a3dfc2841'
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Mon, 26 Mar 2007 03:01:33 +0000 |
| parents | 4a7a13521709 (diff) 5f9b7e2652f0 (current diff) |
| children | 5d9e85f2eba4 |
| files | doc/gaims_funniest_home_convos.txt gaim.apspec.in libpurple/gconf/gaim.schemas.in libpurple/plugin.c libpurple/plugins/gaim.pl m4macros/gaim.m4 pidgin/pixmaps/gaim.ico pidgin/pixmaps/gaim.png pidgin/pixmaps/gaim.svg pidgin/pixmaps/pidgin.png pidgin/plugins/crazychat/cc_gaim_plugin.c pidgin/plugins/gaimrc.c |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/plugin.c Mon Mar 26 02:48:09 2007 +0000 +++ b/libpurple/plugin.c Mon Mar 26 03:01:33 2007 +0000 @@ -375,7 +375,7 @@ * enter an infinite loop in certain situations by passing * purple_find_plugin_by_id a NULL value. -- ecoffey */ - if (!plugin->info->id || !strcmp(plugin->info->id, "")) + if (plugin->info->id == NULL || *plugin->info->id == '\0') { plugin->error = g_strdup_printf(_("This plugin has not defined an ID.")); purple_debug_error("plugins", "%s is not loadable: info->id is not defined.\n", plugin->path);