Mercurial > pidgin
comparison src/plugin.c @ 8759:184b8c3b6d09
[gaim-migrate @ 9514]
Patch by Stu Tomlinson to fix some screwups I made when moving things to
the new plugin API version.
committer: Tailor Script <tailor@pidgin.im>
| author | Christian Hammond <chipx86@chipx86.com> |
|---|---|
| date | Thu, 22 Apr 2004 17:15:56 +0000 |
| parents | d7b8eb1f0a18 |
| children | 8cf32769ba1b |
comparison
equal
deleted
inserted
replaced
| 8758:2db51720fd09 | 8759:184b8c3b6d09 |
|---|---|
| 230 return NULL; | 230 return NULL; |
| 231 } | 231 } |
| 232 | 232 |
| 233 if (plugin->info->api_version != GAIM_PLUGIN_API_VERSION) | 233 if (plugin->info->api_version != GAIM_PLUGIN_API_VERSION) |
| 234 { | 234 { |
| 235 gaim_debug(GAIM_DEBUG_ERROR, "plugins", "%s is unloadable: API version mismatch %d (need %d)\n", | |
| 236 plugin->path, plugin->info->api_version, GAIM_PLUGIN_API_VERSION); | |
| 235 gaim_plugin_destroy(plugin); | 237 gaim_plugin_destroy(plugin); |
| 236 | |
| 237 return NULL; | 238 return NULL; |
| 238 } | 239 } |
| 239 | 240 |
| 240 return plugin; | 241 return plugin; |
| 241 #else | 242 #else |
| 939 loader_info = GAIM_PLUGIN_LOADER_INFO(plugin); | 940 loader_info = GAIM_PLUGIN_LOADER_INFO(plugin); |
| 940 | 941 |
| 941 if (loader_info == NULL || | 942 if (loader_info == NULL || |
| 942 loader_info->api_version != GAIM_LOADER_API_VERSION) | 943 loader_info->api_version != GAIM_LOADER_API_VERSION) |
| 943 { | 944 { |
| 945 gaim_debug(GAIM_DEBUG_ERROR, "plugins", "%s is unloadable: API version mismatch %d (need %d)\n", | |
| 946 plugin->path, loader_info->api_version, GAIM_LOADER_API_VERSION); | |
| 944 return FALSE; | 947 return FALSE; |
| 945 } | 948 } |
| 946 | 949 |
| 947 load_queue = g_list_append(load_queue, plugin); | 950 load_queue = g_list_append(load_queue, plugin); |
| 948 } | 951 } |
| 953 prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(plugin); | 956 prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(plugin); |
| 954 | 957 |
| 955 if (prpl_info == NULL || | 958 if (prpl_info == NULL || |
| 956 prpl_info->api_version != GAIM_PRPL_API_VERSION) | 959 prpl_info->api_version != GAIM_PRPL_API_VERSION) |
| 957 { | 960 { |
| 961 gaim_debug(GAIM_DEBUG_ERROR, "plugins", "%s is unloadable: API version mismatch %d (need %d)\n", | |
| 962 plugin->path, prpl_info->api_version, GAIM_PRPL_API_VERSION); | |
| 958 return FALSE; | 963 return FALSE; |
| 959 } | 964 } |
| 960 | 965 |
| 961 load_queue = g_list_append(load_queue, plugin); | 966 load_queue = g_list_append(load_queue, plugin); |
| 962 } | 967 } |
