Mercurial > pidgin
comparison libpurple/plugin.c @ 27347:4fd6b50d03b3
merge of '91a5d80aa52d8c1ca101bfaa0dfc3f7a2feb99ec'
and 'ee2ad24a7d051b291259bd2fc8ce8e57f24c0cbb'
| author | Etan Reisner <pidgin@unreliablesource.net> |
|---|---|
| date | Sat, 04 Jul 2009 17:36:07 +0000 |
| parents | a42d6d83ec36 627d23bfdb05 |
| children | 386265b369c9 |
comparison
equal
deleted
inserted
replaced
| 27346:9a2c1c6ad899 | 27347:4fd6b50d03b3 |
|---|---|
| 220 { | 220 { |
| 221 if (purple_strequal(filename, plugin->path)) | 221 if (purple_strequal(filename, plugin->path)) |
| 222 return plugin; | 222 return plugin; |
| 223 else if (!purple_plugin_is_unloadable(plugin)) | 223 else if (!purple_plugin_is_unloadable(plugin)) |
| 224 { | 224 { |
| 225 purple_debug_info("plugins", "Not loading %s. " | 225 purple_debug_warning("plugins", "Not loading %s. " |
| 226 "Another plugin with the same name (%s) has already been loaded.\n", | 226 "Another plugin with the same name (%s) has already been loaded.\n", |
| 227 filename, plugin->path); | 227 filename, plugin->path); |
| 228 return plugin; | 228 return plugin; |
| 229 } | 229 } |
| 230 else | 230 else |