Mercurial > pidgin.yaz
diff libpurple/plugin.c @ 15823:32c366eeeb99
sed -ie 's/gaim/purple/g'
| author | Sean Egan <seanegan@gmail.com> |
|---|---|
| date | Mon, 19 Mar 2007 07:01:17 +0000 |
| parents | e9c12873fae0 |
| children | 80ee585fb53c |
line wrap: on
line diff
--- a/libpurple/plugin.c Mon Mar 19 06:11:46 2007 +0000 +++ b/libpurple/plugin.c Mon Mar 19 07:01:17 2007 +0000 @@ -1,7 +1,7 @@ /* - * gaim + * purple * - * Gaim is the legal property of its developers, whose names are too numerous + * Purple is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this * source distribution. * @@ -38,24 +38,24 @@ GHashTable *commands; size_t command_count; -} GaimPluginIpcInfo; +} PurplePluginIpcInfo; typedef struct { - GaimCallback func; - GaimSignalMarshalFunc marshal; + PurpleCallback func; + PurpleSignalMarshalFunc marshal; int num_params; - GaimValue **params; - GaimValue *ret_value; + PurpleValue **params; + PurpleValue *ret_value; -} GaimPluginIpcCommand; +} PurplePluginIpcCommand; static GList *search_paths = NULL; static GList *plugins = NULL; static GList *loaded_plugins = NULL; static GList *protocol_plugins = NULL; -#ifdef GAIM_PLUGINS +#ifdef PURPLE_PLUGINS static GList *load_queue = NULL; static GList *plugin_loaders = NULL; #endif @@ -67,12 +67,12 @@ */ static void (*probe_cb)(void *) = NULL; static void *probe_cb_data = NULL; -static void (*load_cb)(GaimPlugin *, void *) = NULL; +static void (*load_cb)(PurplePlugin *, void *) = NULL; static void *load_cb_data = NULL; -static void (*unload_cb)(GaimPlugin *, void *) = NULL; +static void (*unload_cb)(PurplePlugin *, void *) = NULL; static void *unload_cb_data = NULL; -#ifdef GAIM_PLUGINS +#ifdef PURPLE_PLUGINS static gboolean has_file_extension(const char *filename, const char *ext) @@ -106,7 +106,7 @@ } static char * -gaim_plugin_get_basename(const char *filename) +purple_plugin_get_basename(const char *filename) { const char *basename; const char *last_period; @@ -125,11 +125,11 @@ } static gboolean -loader_supports_file(GaimPlugin *loader, const char *filename) +loader_supports_file(PurplePlugin *loader, const char *filename) { GList *exts; - for (exts = GAIM_PLUGIN_LOADER_INFO(loader)->exts; exts != NULL; exts = exts->next) { + for (exts = PURPLE_PLUGIN_LOADER_INFO(loader)->exts; exts != NULL; exts = exts->next) { if (has_file_extension(filename, (char *)exts->data)) { return TRUE; } @@ -138,19 +138,19 @@ return FALSE; } -static GaimPlugin * -find_loader_for_plugin(const GaimPlugin *plugin) +static PurplePlugin * +find_loader_for_plugin(const PurplePlugin *plugin) { - GaimPlugin *loader; + PurplePlugin *loader; GList *l; if (plugin->path == NULL) return NULL; - for (l = gaim_plugins_get_loaded(); l != NULL; l = l->next) { + for (l = purple_plugins_get_loaded(); l != NULL; l = l->next) { loader = l->data; - if (loader->info->type == GAIM_PLUGIN_LOADER && + if (loader->info->type == PURPLE_PLUGIN_LOADER && loader_supports_file(loader, plugin->path)) { return loader; @@ -162,69 +162,69 @@ return NULL; } -#endif /* GAIM_PLUGINS */ +#endif /* PURPLE_PLUGINS */ /** * Negative if a before b, 0 if equal, positive if a after b. */ static gint -compare_prpl(GaimPlugin *a, GaimPlugin *b) +compare_prpl(PurplePlugin *a, PurplePlugin *b) { - if(GAIM_IS_PROTOCOL_PLUGIN(a)) { - if(GAIM_IS_PROTOCOL_PLUGIN(b)) + if(PURPLE_IS_PROTOCOL_PLUGIN(a)) { + if(PURPLE_IS_PROTOCOL_PLUGIN(b)) return strcmp(a->info->name, b->info->name); else return -1; } else { - if(GAIM_IS_PROTOCOL_PLUGIN(b)) + if(PURPLE_IS_PROTOCOL_PLUGIN(b)) return 1; else return 0; } } -GaimPlugin * -gaim_plugin_new(gboolean native, const char *path) +PurplePlugin * +purple_plugin_new(gboolean native, const char *path) { - GaimPlugin *plugin; + PurplePlugin *plugin; - plugin = g_new0(GaimPlugin, 1); + plugin = g_new0(PurplePlugin, 1); plugin->native_plugin = native; plugin->path = g_strdup(path); - GAIM_DBUS_REGISTER_POINTER(plugin, GaimPlugin); + PURPLE_DBUS_REGISTER_POINTER(plugin, PurplePlugin); return plugin; } -GaimPlugin * -gaim_plugin_probe(const char *filename) +PurplePlugin * +purple_plugin_probe(const char *filename) { -#ifdef GAIM_PLUGINS - GaimPlugin *plugin = NULL; - GaimPlugin *loader; +#ifdef PURPLE_PLUGINS + PurplePlugin *plugin = NULL; + PurplePlugin *loader; gpointer unpunned; gchar *basename = NULL; - gboolean (*gaim_init_plugin)(GaimPlugin *); + gboolean (*purple_init_plugin)(PurplePlugin *); - gaim_debug_misc("plugins", "probing %s\n", filename); + purple_debug_misc("plugins", "probing %s\n", filename); g_return_val_if_fail(filename != NULL, NULL); if (!g_file_test(filename, G_FILE_TEST_EXISTS)) return NULL; /* If this plugin has already been probed then exit */ - basename = gaim_plugin_get_basename(filename); - plugin = gaim_plugins_find_with_basename(basename); + basename = purple_plugin_get_basename(filename); + plugin = purple_plugins_find_with_basename(basename); g_free(basename); if (plugin != NULL) { if (!strcmp(filename, plugin->path)) return plugin; - else if (!gaim_plugin_is_unloadable(plugin)) + else if (!purple_plugin_is_unloadable(plugin)) { - gaim_debug_info("plugins", "Not loading %s. " + purple_debug_info("plugins", "Not loading %s. " "Another plugin with the same name (%s) has already been loaded.\n", filename, plugin->path); return plugin; @@ -236,11 +236,11 @@ * will be loadable, but unless it fails in one of the silent * ways and the first one didn't, it's not any worse. The user * will still see a greyed-out plugin, which is what we want. */ - gaim_plugin_destroy(plugin); + purple_plugin_destroy(plugin); } } - plugin = gaim_plugin_new(has_file_extension(filename, G_MODULE_SUFFIX), filename); + plugin = purple_plugin_new(has_file_extension(filename, G_MODULE_SUFFIX), filename); if (plugin->native_plugin) { const char *error; @@ -265,7 +265,7 @@ if (plugin->handle == NULL) { const char *error = g_module_error(); - if (error != NULL && gaim_str_has_prefix(error, filename)) + if (error != NULL && purple_str_has_prefix(error, filename)) { error = error + strlen(filename); @@ -280,13 +280,13 @@ if (error == NULL || !*error) { plugin->error = g_strdup(_("Unknown error")); - gaim_debug_error("plugins", "%s is not loadable: Unknown error\n", + purple_debug_error("plugins", "%s is not loadable: Unknown error\n", plugin->path); } else { plugin->error = g_strdup(error); - gaim_debug_error("plugins", "%s is not loadable: %s\n", + purple_debug_error("plugins", "%s is not loadable: %s\n", plugin->path, plugin->error); } #if GLIB_CHECK_VERSION(2,3,3) @@ -301,7 +301,7 @@ /* Restore the original error mode */ SetErrorMode(old_error_mode); #endif - gaim_plugin_destroy(plugin); + purple_plugin_destroy(plugin); return NULL; } else @@ -314,18 +314,18 @@ } } - if (!g_module_symbol(plugin->handle, "gaim_init_plugin", + if (!g_module_symbol(plugin->handle, "purple_init_plugin", &unpunned)) { - gaim_debug_error("plugins", "%s is not usable because the " - "'gaim_init_plugin' symbol could not be " + purple_debug_error("plugins", "%s is not usable because the " + "'purple_init_plugin' symbol could not be " "found. Does the plugin call the " - "GAIM_INIT_PLUGIN() macro?\n", plugin->path); + "PURPLE_INIT_PLUGIN() macro?\n", plugin->path); g_module_close(plugin->handle); error = g_module_error(); if (error != NULL) - gaim_debug_error("plugins", "Error closing module %s: %s\n", + purple_debug_error("plugins", "Error closing module %s: %s\n", plugin->path, error); plugin->handle = NULL; @@ -333,10 +333,10 @@ /* Restore the original error mode */ SetErrorMode(old_error_mode); #endif - gaim_plugin_destroy(plugin); + purple_plugin_destroy(plugin); return NULL; } - gaim_init_plugin = unpunned; + purple_init_plugin = unpunned; #ifdef _WIN32 /* Restore the original error mode */ @@ -347,41 +347,41 @@ loader = find_loader_for_plugin(plugin); if (loader == NULL) { - gaim_plugin_destroy(plugin); + purple_plugin_destroy(plugin); return NULL; } - gaim_init_plugin = GAIM_PLUGIN_LOADER_INFO(loader)->probe; + purple_init_plugin = PURPLE_PLUGIN_LOADER_INFO(loader)->probe; } - if (!gaim_init_plugin(plugin) || plugin->info == NULL) + if (!purple_init_plugin(plugin) || plugin->info == NULL) { - gaim_plugin_destroy(plugin); + purple_plugin_destroy(plugin); return NULL; } else if (plugin->info->ui_requirement && - strcmp(plugin->info->ui_requirement, gaim_core_get_ui())) + strcmp(plugin->info->ui_requirement, purple_core_get_ui())) { plugin->error = g_strdup_printf(_("You are using %s, but this plugin requires %s."), - gaim_core_get_ui(), plugin->info->ui_requirement); - gaim_debug_error("plugins", "%s is not loadable: The UI requirement is not met.\n", plugin->path); + purple_core_get_ui(), plugin->info->ui_requirement); + purple_debug_error("plugins", "%s is not loadable: The UI requirement is not met.\n", plugin->path); plugin->unloadable = TRUE; return plugin; } /* Really old plugins. */ - if (plugin->info->magic != GAIM_PLUGIN_MAGIC) + if (plugin->info->magic != PURPLE_PLUGIN_MAGIC) { if (plugin->info->magic >= 2 && plugin->info->magic <= 4) { - struct _GaimPluginInfo2 + struct _PurplePluginInfo2 { unsigned int api_version; - GaimPluginType type; + PurplePluginType type; char *ui_requirement; unsigned long flags; GList *dependencies; - GaimPluginPriority priority; + PurplePluginPriority priority; char *id; char *name; @@ -391,18 +391,18 @@ char *author; char *homepage; - gboolean (*load)(GaimPlugin *plugin); - gboolean (*unload)(GaimPlugin *plugin); - void (*destroy)(GaimPlugin *plugin); + gboolean (*load)(PurplePlugin *plugin); + gboolean (*unload)(PurplePlugin *plugin); + void (*destroy)(PurplePlugin *plugin); void *ui_info; void *extra_info; - GaimPluginUiInfo *prefs_info; - GList *(*actions)(GaimPlugin *plugin, gpointer context); - } *info2 = (struct _GaimPluginInfo2 *)plugin->info; + PurplePluginUiInfo *prefs_info; + GList *(*actions)(PurplePlugin *plugin, gpointer context); + } *info2 = (struct _PurplePluginInfo2 *)plugin->info; /* This leaks... but only for ancient plugins, so deal with it. */ - plugin->info = g_new0(GaimPluginInfo, 1); + plugin->info = g_new0(PurplePluginInfo, 1); /* We don't really need all these to display the plugin info, but * I'm copying them all for good measure. */ @@ -432,41 +432,41 @@ plugin->error = g_strdup_printf(_("Plugin magic mismatch %d (need %d)"), - plugin->info->magic, GAIM_PLUGIN_MAGIC); - gaim_debug_error("plugins", "%s is not loadable: Plugin magic mismatch %d (need %d)\n", - plugin->path, plugin->info->magic, GAIM_PLUGIN_MAGIC); + plugin->info->magic, PURPLE_PLUGIN_MAGIC); + purple_debug_error("plugins", "%s is not loadable: Plugin magic mismatch %d (need %d)\n", + plugin->path, plugin->info->magic, PURPLE_PLUGIN_MAGIC); plugin->unloadable = TRUE; return plugin; } - gaim_debug_error("plugins", "%s is not loadable: Plugin magic mismatch %d (need %d)\n", - plugin->path, plugin->info->magic, GAIM_PLUGIN_MAGIC); - gaim_plugin_destroy(plugin); + purple_debug_error("plugins", "%s is not loadable: Plugin magic mismatch %d (need %d)\n", + plugin->path, plugin->info->magic, PURPLE_PLUGIN_MAGIC); + purple_plugin_destroy(plugin); return NULL; } - if (plugin->info->major_version != GAIM_MAJOR_VERSION || - plugin->info->minor_version > GAIM_MINOR_VERSION) + if (plugin->info->major_version != PURPLE_MAJOR_VERSION || + plugin->info->minor_version > PURPLE_MINOR_VERSION) { plugin->error = g_strdup_printf(_("ABI version mismatch %d.%d.x (need %d.%d.x)"), plugin->info->major_version, plugin->info->minor_version, - GAIM_MAJOR_VERSION, GAIM_MINOR_VERSION); - gaim_debug_error("plugins", "%s is not loadable: ABI version mismatch %d.%d.x (need %d.%d.x)\n", + PURPLE_MAJOR_VERSION, PURPLE_MINOR_VERSION); + purple_debug_error("plugins", "%s is not loadable: ABI version mismatch %d.%d.x (need %d.%d.x)\n", plugin->path, plugin->info->major_version, plugin->info->minor_version, - GAIM_MAJOR_VERSION, GAIM_MINOR_VERSION); + PURPLE_MAJOR_VERSION, PURPLE_MINOR_VERSION); plugin->unloadable = TRUE; return plugin; } - if (plugin->info->type == GAIM_PLUGIN_PROTOCOL) + if (plugin->info->type == PURPLE_PLUGIN_PROTOCOL) { /* If plugin is a PRPL, make sure it implements the required functions */ - if ((GAIM_PLUGIN_PROTOCOL_INFO(plugin)->list_icon == NULL) || - (GAIM_PLUGIN_PROTOCOL_INFO(plugin)->login == NULL) || - (GAIM_PLUGIN_PROTOCOL_INFO(plugin)->close == NULL)) + if ((PURPLE_PLUGIN_PROTOCOL_INFO(plugin)->list_icon == NULL) || + (PURPLE_PLUGIN_PROTOCOL_INFO(plugin)->login == NULL) || + (PURPLE_PLUGIN_PROTOCOL_INFO(plugin)->close == NULL)) { plugin->error = g_strdup(_("Plugin does not implement all required functions")); - gaim_debug_error("plugins", "%s is not loadable: Plugin does not implement all required functions\n", + purple_debug_error("plugins", "%s is not loadable: Plugin does not implement all required functions\n", plugin->path); plugin->unloadable = TRUE; return plugin; @@ -475,7 +475,7 @@ /* For debugging, let's warn about prpl prefs. */ if (plugin->info->prefs_info != NULL) { - gaim_debug_error("plugins", "%s has a prefs_info, but is a prpl. This is no longer supported.\n", + purple_debug_error("plugins", "%s has a prefs_info, but is a prpl. This is no longer supported.\n", plugin->path); } } @@ -483,33 +483,33 @@ return plugin; #else return NULL; -#endif /* !GAIM_PLUGINS */ +#endif /* !PURPLE_PLUGINS */ } -#ifdef GAIM_PLUGINS +#ifdef PURPLE_PLUGINS static gint compare_plugins(gconstpointer a, gconstpointer b) { - const GaimPlugin *plugina = a; - const GaimPlugin *pluginb = b; + const PurplePlugin *plugina = a; + const PurplePlugin *pluginb = b; return strcmp(plugina->info->name, pluginb->info->name); } -#endif /* GAIM_PLUGINS */ +#endif /* PURPLE_PLUGINS */ gboolean -gaim_plugin_load(GaimPlugin *plugin) +purple_plugin_load(PurplePlugin *plugin) { -#ifdef GAIM_PLUGINS +#ifdef PURPLE_PLUGINS GList *dep_list = NULL; GList *l; g_return_val_if_fail(plugin != NULL, FALSE); - if (gaim_plugin_is_loaded(plugin)) + if (purple_plugin_is_loaded(plugin)) return TRUE; - if (gaim_plugin_is_unloadable(plugin)) + if (purple_plugin_is_unloadable(plugin)) return FALSE; g_return_val_if_fail(plugin->error == NULL, FALSE); @@ -522,9 +522,9 @@ for (l = plugin->info->dependencies; l != NULL; l = l->next) { const char *dep_name = (const char *)l->data; - GaimPlugin *dep_plugin; + PurplePlugin *dep_plugin; - dep_plugin = gaim_plugins_find_with_id(dep_name); + dep_plugin = purple_plugins_find_with_id(dep_name); if (dep_plugin == NULL) { @@ -534,7 +534,7 @@ "Please install this plugin and try again."), dep_name); - gaim_notify_error(NULL, NULL, + purple_notify_error(NULL, NULL, _("Unable to load the plugin"), tmp); g_free(tmp); @@ -549,18 +549,18 @@ /* Second pass: load all the required plugins. */ for (l = dep_list; l != NULL; l = l->next) { - GaimPlugin *dep_plugin = (GaimPlugin *)l->data; + PurplePlugin *dep_plugin = (PurplePlugin *)l->data; - if (!gaim_plugin_is_loaded(dep_plugin)) + if (!purple_plugin_is_loaded(dep_plugin)) { - if (!gaim_plugin_load(dep_plugin)) + if (!purple_plugin_load(dep_plugin)) { char *tmp; tmp = g_strdup_printf(_("The required plugin %s was unable to load."), plugin->info->name); - gaim_notify_error(NULL, NULL, + purple_notify_error(NULL, NULL, _("Unable to load your plugin."), tmp); g_free(tmp); @@ -575,7 +575,7 @@ * This is done separately in case we had to bail out earlier. */ for (l = dep_list; l != NULL; l = l->next) { - GaimPlugin *dep_plugin = (GaimPlugin *)l->data; + PurplePlugin *dep_plugin = (PurplePlugin *)l->data; dep_plugin->dependent_plugins = g_list_prepend(dep_plugin->dependent_plugins, plugin->info->id); } @@ -590,15 +590,15 @@ } } else { - GaimPlugin *loader; - GaimPluginLoaderInfo *loader_info; + PurplePlugin *loader; + PurplePluginLoaderInfo *loader_info; loader = find_loader_for_plugin(plugin); if (loader == NULL) return FALSE; - loader_info = GAIM_PLUGIN_LOADER_INFO(loader); + loader_info = PURPLE_PLUGIN_LOADER_INFO(loader); if (loader_info->load != NULL) { @@ -615,34 +615,34 @@ if (load_cb != NULL) load_cb(plugin, load_cb_data); - gaim_signal_emit(gaim_plugins_get_handle(), "plugin-load", plugin); + purple_signal_emit(purple_plugins_get_handle(), "plugin-load", plugin); return TRUE; #else return TRUE; -#endif /* !GAIM_PLUGINS */ +#endif /* !PURPLE_PLUGINS */ } gboolean -gaim_plugin_unload(GaimPlugin *plugin) +purple_plugin_unload(PurplePlugin *plugin) { -#ifdef GAIM_PLUGINS +#ifdef PURPLE_PLUGINS GList *l; g_return_val_if_fail(plugin != NULL, FALSE); loaded_plugins = g_list_remove(loaded_plugins, plugin); - if ((plugin->info != NULL) && GAIM_IS_PROTOCOL_PLUGIN(plugin)) + if ((plugin->info != NULL) && PURPLE_IS_PROTOCOL_PLUGIN(plugin)) protocol_plugins = g_list_remove(protocol_plugins, plugin); - g_return_val_if_fail(gaim_plugin_is_loaded(plugin), FALSE); + g_return_val_if_fail(purple_plugin_is_loaded(plugin), FALSE); - gaim_debug_info("plugins", "Unloading plugin %s\n", plugin->info->name); + purple_debug_info("plugins", "Unloading plugin %s\n", plugin->info->name); /* cancel any pending dialogs the plugin has */ - gaim_request_close_with_handle(plugin); - gaim_notify_close_with_handle(plugin); + purple_request_close_with_handle(plugin); + purple_notify_close_with_handle(plugin); plugin->loaded = FALSE; @@ -650,13 +650,13 @@ while ((l = plugin->dependent_plugins) != NULL) { const char * dep_name = (const char *)l->data; - GaimPlugin *dep_plugin; + PurplePlugin *dep_plugin; - dep_plugin = gaim_plugins_find_with_id(dep_name); + dep_plugin = purple_plugins_find_with_id(dep_name); - if (dep_plugin != NULL && gaim_plugin_is_loaded(dep_plugin)) + if (dep_plugin != NULL && purple_plugin_is_loaded(dep_plugin)) { - if (!gaim_plugin_unload(dep_plugin)) + if (!purple_plugin_unload(dep_plugin)) { char *translated_name = g_strdup(_(dep_plugin->info->name)); char *tmp; @@ -665,7 +665,7 @@ translated_name); g_free(translated_name); - gaim_notify_error(NULL, NULL, + purple_notify_error(NULL, NULL, _("There were errors unloading the plugin."), tmp); g_free(tmp); } @@ -676,9 +676,9 @@ for (l = plugin->info->dependencies; l != NULL; l = l->next) { const char *dep_name = (const char *)l->data; - GaimPlugin *dependency; + PurplePlugin *dependency; - dependency = gaim_plugins_find_with_id(dep_name); + dependency = purple_plugins_find_with_id(dep_name); dependency->dependent_plugins = g_list_remove(dependency->dependent_plugins, plugin->info->id); } @@ -687,17 +687,17 @@ if (plugin->info->unload != NULL) plugin->info->unload(plugin); - if (plugin->info->type == GAIM_PLUGIN_PROTOCOL) { - GaimPluginProtocolInfo *prpl_info; + if (plugin->info->type == PURPLE_PLUGIN_PROTOCOL) { + PurplePluginProtocolInfo *prpl_info; GList *l; - prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(plugin); + prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(plugin); for (l = prpl_info->user_splits; l != NULL; l = l->next) - gaim_account_user_split_destroy(l->data); + purple_account_user_split_destroy(l->data); for (l = prpl_info->protocol_options; l != NULL; l = l->next) - gaim_account_option_destroy(l->data); + purple_account_option_destroy(l->data); if (prpl_info->user_splits != NULL) { g_list_free(prpl_info->user_splits); @@ -711,64 +711,64 @@ } } else { - GaimPlugin *loader; - GaimPluginLoaderInfo *loader_info; + PurplePlugin *loader; + PurplePluginLoaderInfo *loader_info; loader = find_loader_for_plugin(plugin); if (loader == NULL) return FALSE; - loader_info = GAIM_PLUGIN_LOADER_INFO(loader); + loader_info = PURPLE_PLUGIN_LOADER_INFO(loader); if (loader_info->unload != NULL) loader_info->unload(plugin); } - gaim_signals_disconnect_by_handle(plugin); - gaim_plugin_ipc_unregister_all(plugin); + purple_signals_disconnect_by_handle(plugin); + purple_plugin_ipc_unregister_all(plugin); /* TODO */ if (unload_cb != NULL) unload_cb(plugin, unload_cb_data); - gaim_signal_emit(gaim_plugins_get_handle(), "plugin-unload", plugin); + purple_signal_emit(purple_plugins_get_handle(), "plugin-unload", plugin); - gaim_prefs_disconnect_by_handle(plugin); + purple_prefs_disconnect_by_handle(plugin); return TRUE; #else return TRUE; -#endif /* GAIM_PLUGINS */ +#endif /* PURPLE_PLUGINS */ } gboolean -gaim_plugin_reload(GaimPlugin *plugin) +purple_plugin_reload(PurplePlugin *plugin) { -#ifdef GAIM_PLUGINS +#ifdef PURPLE_PLUGINS g_return_val_if_fail(plugin != NULL, FALSE); - g_return_val_if_fail(gaim_plugin_is_loaded(plugin), FALSE); + g_return_val_if_fail(purple_plugin_is_loaded(plugin), FALSE); - if (!gaim_plugin_unload(plugin)) + if (!purple_plugin_unload(plugin)) return FALSE; - if (!gaim_plugin_load(plugin)) + if (!purple_plugin_load(plugin)) return FALSE; return TRUE; #else return TRUE; -#endif /* !GAIM_PLUGINS */ +#endif /* !PURPLE_PLUGINS */ } void -gaim_plugin_destroy(GaimPlugin *plugin) +purple_plugin_destroy(PurplePlugin *plugin) { -#ifdef GAIM_PLUGINS +#ifdef PURPLE_PLUGINS g_return_if_fail(plugin != NULL); - if (gaim_plugin_is_loaded(plugin)) - gaim_plugin_unload(plugin); + if (purple_plugin_is_loaded(plugin)) + purple_plugin_unload(plugin); plugins = g_list_remove(plugins, plugin); @@ -778,8 +778,8 @@ /* true, this may leak a little memory if there is a major version * mismatch, but it's a lot better than trying to free something * we shouldn't, and crashing while trying to load an old plugin */ - if(plugin->info == NULL || plugin->info->magic != GAIM_PLUGIN_MAGIC || - plugin->info->major_version != GAIM_MAJOR_VERSION) + if(plugin->info == NULL || plugin->info->magic != PURPLE_PLUGIN_MAGIC || + plugin->info->major_version != PURPLE_MAJOR_VERSION) { if(plugin->handle) g_module_close(plugin->handle); @@ -787,7 +787,7 @@ g_free(plugin->path); g_free(plugin->error); - GAIM_DBUS_UNREGISTER_POINTER(plugin); + PURPLE_DBUS_UNREGISTER_POINTER(plugin); g_free(plugin); return; @@ -798,21 +798,21 @@ if (plugin->native_plugin) { - if (plugin->info != NULL && plugin->info->type == GAIM_PLUGIN_LOADER) + if (plugin->info != NULL && plugin->info->type == PURPLE_PLUGIN_LOADER) { - GaimPluginLoaderInfo *loader_info; + PurplePluginLoaderInfo *loader_info; GList *exts, *l, *next_l; - GaimPlugin *p2; + PurplePlugin *p2; - loader_info = GAIM_PLUGIN_LOADER_INFO(plugin); + loader_info = PURPLE_PLUGIN_LOADER_INFO(plugin); if (loader_info != NULL && loader_info->exts != NULL) { - for (exts = GAIM_PLUGIN_LOADER_INFO(plugin)->exts; + for (exts = PURPLE_PLUGIN_LOADER_INFO(plugin)->exts; exts != NULL; exts = exts->next) { - for (l = gaim_plugins_get_all(); l != NULL; l = next_l) + for (l = purple_plugins_get_all(); l != NULL; l = next_l) { next_l = l->next; @@ -821,7 +821,7 @@ if (p2->path != NULL && has_file_extension(p2->path, exts->data)) { - gaim_plugin_destroy(p2); + purple_plugin_destroy(p2); } } } @@ -840,14 +840,14 @@ } else { - GaimPlugin *loader; - GaimPluginLoaderInfo *loader_info; + PurplePlugin *loader; + PurplePluginLoaderInfo *loader_info; loader = find_loader_for_plugin(plugin); if (loader != NULL) { - loader_info = GAIM_PLUGIN_LOADER_INFO(loader); + loader_info = PURPLE_PLUGIN_LOADER_INFO(loader); if (loader_info->destroy != NULL) loader_info->destroy(plugin); @@ -857,14 +857,14 @@ g_free(plugin->path); g_free(plugin->error); - GAIM_DBUS_UNREGISTER_POINTER(plugin); + PURPLE_DBUS_UNREGISTER_POINTER(plugin); g_free(plugin); -#endif /* !GAIM_PLUGINS */ +#endif /* !PURPLE_PLUGINS */ } gboolean -gaim_plugin_is_loaded(const GaimPlugin *plugin) +purple_plugin_is_loaded(const PurplePlugin *plugin) { g_return_val_if_fail(plugin != NULL, FALSE); @@ -872,7 +872,7 @@ } gboolean -gaim_plugin_is_unloadable(const GaimPlugin *plugin) +purple_plugin_is_unloadable(const PurplePlugin *plugin) { g_return_val_if_fail(plugin != NULL, FALSE); @@ -880,7 +880,7 @@ } const gchar * -gaim_plugin_get_id(const GaimPlugin *plugin) { +purple_plugin_get_id(const PurplePlugin *plugin) { g_return_val_if_fail(plugin, NULL); g_return_val_if_fail(plugin->info, NULL); @@ -888,7 +888,7 @@ } const gchar * -gaim_plugin_get_name(const GaimPlugin *plugin) { +purple_plugin_get_name(const PurplePlugin *plugin) { g_return_val_if_fail(plugin, NULL); g_return_val_if_fail(plugin->info, NULL); @@ -896,7 +896,7 @@ } const gchar * -gaim_plugin_get_version(const GaimPlugin *plugin) { +purple_plugin_get_version(const PurplePlugin *plugin) { g_return_val_if_fail(plugin, NULL); g_return_val_if_fail(plugin->info, NULL); @@ -904,7 +904,7 @@ } const gchar * -gaim_plugin_get_summary(const GaimPlugin *plugin) { +purple_plugin_get_summary(const PurplePlugin *plugin) { g_return_val_if_fail(plugin, NULL); g_return_val_if_fail(plugin->info, NULL); @@ -912,7 +912,7 @@ } const gchar * -gaim_plugin_get_description(const GaimPlugin *plugin) { +purple_plugin_get_description(const PurplePlugin *plugin) { g_return_val_if_fail(plugin, NULL); g_return_val_if_fail(plugin->info, NULL); @@ -920,7 +920,7 @@ } const gchar * -gaim_plugin_get_author(const GaimPlugin *plugin) { +purple_plugin_get_author(const PurplePlugin *plugin) { g_return_val_if_fail(plugin, NULL); g_return_val_if_fail(plugin->info, NULL); @@ -928,7 +928,7 @@ } const gchar * -gaim_plugin_get_homepage(const GaimPlugin *plugin) { +purple_plugin_get_homepage(const PurplePlugin *plugin) { g_return_val_if_fail(plugin, NULL); g_return_val_if_fail(plugin->info, NULL); @@ -941,30 +941,30 @@ static void destroy_ipc_info(void *data) { - GaimPluginIpcCommand *ipc_command = (GaimPluginIpcCommand *)data; + PurplePluginIpcCommand *ipc_command = (PurplePluginIpcCommand *)data; int i; if (ipc_command->params != NULL) { for (i = 0; i < ipc_command->num_params; i++) - gaim_value_destroy(ipc_command->params[i]); + purple_value_destroy(ipc_command->params[i]); g_free(ipc_command->params); } if (ipc_command->ret_value != NULL) - gaim_value_destroy(ipc_command->ret_value); + purple_value_destroy(ipc_command->ret_value); g_free(ipc_command); } gboolean -gaim_plugin_ipc_register(GaimPlugin *plugin, const char *command, - GaimCallback func, GaimSignalMarshalFunc marshal, - GaimValue *ret_value, int num_params, ...) +purple_plugin_ipc_register(PurplePlugin *plugin, const char *command, + PurpleCallback func, PurpleSignalMarshalFunc marshal, + PurpleValue *ret_value, int num_params, ...) { - GaimPluginIpcInfo *ipc_info; - GaimPluginIpcCommand *ipc_command; + PurplePluginIpcInfo *ipc_info; + PurplePluginIpcCommand *ipc_command; g_return_val_if_fail(plugin != NULL, FALSE); g_return_val_if_fail(command != NULL, FALSE); @@ -973,14 +973,14 @@ if (plugin->ipc_data == NULL) { - ipc_info = plugin->ipc_data = g_new0(GaimPluginIpcInfo, 1); + ipc_info = plugin->ipc_data = g_new0(PurplePluginIpcInfo, 1); ipc_info->commands = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, destroy_ipc_info); } else - ipc_info = (GaimPluginIpcInfo *)plugin->ipc_data; + ipc_info = (PurplePluginIpcInfo *)plugin->ipc_data; - ipc_command = g_new0(GaimPluginIpcCommand, 1); + ipc_command = g_new0(PurplePluginIpcCommand, 1); ipc_command->func = func; ipc_command->marshal = marshal; ipc_command->num_params = num_params; @@ -991,12 +991,12 @@ va_list args; int i; - ipc_command->params = g_new0(GaimValue *, num_params); + ipc_command->params = g_new0(PurpleValue *, num_params); va_start(args, num_params); for (i = 0; i < num_params; i++) - ipc_command->params[i] = va_arg(args, GaimValue *); + ipc_command->params[i] = va_arg(args, PurpleValue *); va_end(args); } @@ -1009,19 +1009,19 @@ } void -gaim_plugin_ipc_unregister(GaimPlugin *plugin, const char *command) +purple_plugin_ipc_unregister(PurplePlugin *plugin, const char *command) { - GaimPluginIpcInfo *ipc_info; + PurplePluginIpcInfo *ipc_info; g_return_if_fail(plugin != NULL); g_return_if_fail(command != NULL); - ipc_info = (GaimPluginIpcInfo *)plugin->ipc_data; + ipc_info = (PurplePluginIpcInfo *)plugin->ipc_data; if (ipc_info == NULL || g_hash_table_lookup(ipc_info->commands, command) == NULL) { - gaim_debug_error("plugins", + purple_debug_error("plugins", "IPC command '%s' was not registered for plugin %s\n", command, plugin->info->name); return; @@ -1041,16 +1041,16 @@ } void -gaim_plugin_ipc_unregister_all(GaimPlugin *plugin) +purple_plugin_ipc_unregister_all(PurplePlugin *plugin) { - GaimPluginIpcInfo *ipc_info; + PurplePluginIpcInfo *ipc_info; g_return_if_fail(plugin != NULL); if (plugin->ipc_data == NULL) return; /* Silently ignore it. */ - ipc_info = (GaimPluginIpcInfo *)plugin->ipc_data; + ipc_info = (PurplePluginIpcInfo *)plugin->ipc_data; g_hash_table_destroy(ipc_info->commands); g_free(ipc_info); @@ -1059,23 +1059,23 @@ } gboolean -gaim_plugin_ipc_get_params(GaimPlugin *plugin, const char *command, - GaimValue **ret_value, int *num_params, - GaimValue ***params) +purple_plugin_ipc_get_params(PurplePlugin *plugin, const char *command, + PurpleValue **ret_value, int *num_params, + PurpleValue ***params) { - GaimPluginIpcInfo *ipc_info; - GaimPluginIpcCommand *ipc_command; + PurplePluginIpcInfo *ipc_info; + PurplePluginIpcCommand *ipc_command; g_return_val_if_fail(plugin != NULL, FALSE); g_return_val_if_fail(command != NULL, FALSE); - ipc_info = (GaimPluginIpcInfo *)plugin->ipc_data; + ipc_info = (PurplePluginIpcInfo *)plugin->ipc_data; if (ipc_info == NULL || (ipc_command = g_hash_table_lookup(ipc_info->commands, command)) == NULL) { - gaim_debug_error("plugins", + purple_debug_error("plugins", "IPC command '%s' was not registered for plugin %s\n", command, plugin->info->name); @@ -1095,11 +1095,11 @@ } void * -gaim_plugin_ipc_call(GaimPlugin *plugin, const char *command, +purple_plugin_ipc_call(PurplePlugin *plugin, const char *command, gboolean *ok, ...) { - GaimPluginIpcInfo *ipc_info; - GaimPluginIpcCommand *ipc_command; + PurplePluginIpcInfo *ipc_info; + PurplePluginIpcCommand *ipc_command; va_list args; void *ret_value; @@ -1109,13 +1109,13 @@ g_return_val_if_fail(plugin != NULL, NULL); g_return_val_if_fail(command != NULL, NULL); - ipc_info = (GaimPluginIpcInfo *)plugin->ipc_data; + ipc_info = (PurplePluginIpcInfo *)plugin->ipc_data; if (ipc_info == NULL || (ipc_command = g_hash_table_lookup(ipc_info->commands, command)) == NULL) { - gaim_debug_error("plugins", + purple_debug_error("plugins", "IPC command '%s' was not registered for plugin %s\n", command, plugin->info->name); @@ -1136,40 +1136,40 @@ * Plugins subsystem **************************************************************************/ void * -gaim_plugins_get_handle(void) { +purple_plugins_get_handle(void) { static int handle; return &handle; } void -gaim_plugins_init(void) { - void *handle = gaim_plugins_get_handle(); +purple_plugins_init(void) { + void *handle = purple_plugins_get_handle(); - gaim_plugins_add_search_path(LIBDIR); + purple_plugins_add_search_path(LIBDIR); - gaim_signal_register(handle, "plugin-load", - gaim_marshal_VOID__POINTER, + purple_signal_register(handle, "plugin-load", + purple_marshal_VOID__POINTER, NULL, 1, - gaim_value_new(GAIM_TYPE_SUBTYPE, - GAIM_SUBTYPE_PLUGIN)); - gaim_signal_register(handle, "plugin-unload", - gaim_marshal_VOID__POINTER, + purple_value_new(PURPLE_TYPE_SUBTYPE, + PURPLE_SUBTYPE_PLUGIN)); + purple_signal_register(handle, "plugin-unload", + purple_marshal_VOID__POINTER, NULL, 1, - gaim_value_new(GAIM_TYPE_SUBTYPE, - GAIM_SUBTYPE_PLUGIN)); + purple_value_new(PURPLE_TYPE_SUBTYPE, + PURPLE_SUBTYPE_PLUGIN)); } void -gaim_plugins_uninit(void) { - gaim_signals_disconnect_by_handle(gaim_plugins_get_handle()); +purple_plugins_uninit(void) { + purple_signals_disconnect_by_handle(purple_plugins_get_handle()); } /************************************************************************** * Plugins API **************************************************************************/ void -gaim_plugins_add_search_path(const char *path) +purple_plugins_add_search_path(const char *path) { g_return_if_fail(path != NULL); @@ -1180,64 +1180,64 @@ } void -gaim_plugins_unload_all(void) +purple_plugins_unload_all(void) { -#ifdef GAIM_PLUGINS +#ifdef PURPLE_PLUGINS while (loaded_plugins != NULL) - gaim_plugin_unload(loaded_plugins->data); + purple_plugin_unload(loaded_plugins->data); -#endif /* GAIM_PLUGINS */ +#endif /* PURPLE_PLUGINS */ } void -gaim_plugins_destroy_all(void) +purple_plugins_destroy_all(void) { -#ifdef GAIM_PLUGINS +#ifdef PURPLE_PLUGINS while (plugins != NULL) - gaim_plugin_destroy(plugins->data); + purple_plugin_destroy(plugins->data); -#endif /* GAIM_PLUGINS */ +#endif /* PURPLE_PLUGINS */ } void -gaim_plugins_save_loaded(const char *key) +purple_plugins_save_loaded(const char *key) { -#ifdef GAIM_PLUGINS +#ifdef PURPLE_PLUGINS GList *pl; GList *files = NULL; - GaimPlugin *p; + PurplePlugin *p; - for (pl = gaim_plugins_get_loaded(); pl != NULL; pl = pl->next) { + for (pl = purple_plugins_get_loaded(); pl != NULL; pl = pl->next) { p = pl->data; - if (p->info->type != GAIM_PLUGIN_PROTOCOL && - p->info->type != GAIM_PLUGIN_LOADER) { + if (p->info->type != PURPLE_PLUGIN_PROTOCOL && + p->info->type != PURPLE_PLUGIN_LOADER) { files = g_list_append(files, p->path); } } - gaim_prefs_set_path_list(key, files); + purple_prefs_set_path_list(key, files); g_list_free(files); #endif } void -gaim_plugins_load_saved(const char *key) +purple_plugins_load_saved(const char *key) { -#ifdef GAIM_PLUGINS +#ifdef PURPLE_PLUGINS GList *f, *files; g_return_if_fail(key != NULL); - files = gaim_prefs_get_path_list(key); + files = purple_prefs_get_path_list(key); for (f = files; f; f = f->next) { char *filename; char *basename; - GaimPlugin *plugin; + PurplePlugin *plugin; if (f->data == NULL) continue; @@ -1258,23 +1258,23 @@ /* Strip the extension */ if (basename) - basename = gaim_plugin_get_basename(filename); + basename = purple_plugin_get_basename(filename); - if ((plugin = gaim_plugins_find_with_filename(filename)) != NULL) + if ((plugin = purple_plugins_find_with_filename(filename)) != NULL) { - gaim_debug_info("plugins", "Loading saved plugin %s\n", + purple_debug_info("plugins", "Loading saved plugin %s\n", plugin->path); - gaim_plugin_load(plugin); + purple_plugin_load(plugin); } - else if (basename && (plugin = gaim_plugins_find_with_basename(basename)) != NULL) + else if (basename && (plugin = purple_plugins_find_with_basename(basename)) != NULL) { - gaim_debug_info("plugins", "Loading saved plugin %s\n", + purple_debug_info("plugins", "Loading saved plugin %s\n", plugin->path); - gaim_plugin_load(plugin); + purple_plugin_load(plugin); } else { - gaim_debug_error("plugins", "Unable to find saved plugin %s\n", + purple_debug_error("plugins", "Unable to find saved plugin %s\n", filename); } @@ -1284,18 +1284,18 @@ } g_list_free(files); -#endif /* GAIM_PLUGINS */ +#endif /* PURPLE_PLUGINS */ } void -gaim_plugins_probe(const char *ext) +purple_plugins_probe(const char *ext) { -#ifdef GAIM_PLUGINS +#ifdef PURPLE_PLUGINS GDir *dir; const gchar *file; gchar *path; - GaimPlugin *plugin; + PurplePlugin *plugin; GList *cur; const char *search_path; @@ -1316,7 +1316,7 @@ path = g_build_filename(search_path, file, NULL); if (ext == NULL || has_file_extension(file, ext)) - plugin = gaim_plugin_probe(path); + plugin = purple_plugin_probe(path); g_free(path); } @@ -1328,47 +1328,47 @@ /* See if we have any plugins waiting to load */ while (load_queue != NULL) { - plugin = (GaimPlugin *)load_queue->data; + plugin = (PurplePlugin *)load_queue->data; load_queue = g_list_remove(load_queue, plugin); if (plugin == NULL || plugin->info == NULL) continue; - if (plugin->info->type == GAIM_PLUGIN_LOADER) + if (plugin->info->type == PURPLE_PLUGIN_LOADER) { /* We'll just load this right now. */ - if (!gaim_plugin_load(plugin)) + if (!purple_plugin_load(plugin)) { - gaim_plugin_destroy(plugin); + purple_plugin_destroy(plugin); continue; } plugin_loaders = g_list_append(plugin_loaders, plugin); - for (cur = GAIM_PLUGIN_LOADER_INFO(plugin)->exts; + for (cur = PURPLE_PLUGIN_LOADER_INFO(plugin)->exts; cur != NULL; cur = cur->next) { - gaim_plugins_probe(cur->data); + purple_plugins_probe(cur->data); } } - else if (plugin->info->type == GAIM_PLUGIN_PROTOCOL) + else if (plugin->info->type == PURPLE_PLUGIN_PROTOCOL) { /* We'll just load this right now. */ - if (!gaim_plugin_load(plugin)) + if (!purple_plugin_load(plugin)) { - gaim_plugin_destroy(plugin); + purple_plugin_destroy(plugin); continue; } /* Make sure we don't load two PRPLs with the same name? */ - if (gaim_find_prpl(plugin->info->id)) + if (purple_find_prpl(plugin->info->id)) { /* Nothing to see here--move along, move along */ - gaim_plugin_destroy(plugin); + purple_plugin_destroy(plugin); continue; } @@ -1380,11 +1380,11 @@ if (probe_cb != NULL) probe_cb(probe_cb_data); -#endif /* GAIM_PLUGINS */ +#endif /* PURPLE_PLUGINS */ } gboolean -gaim_plugin_register(GaimPlugin *plugin) +purple_plugin_register(PurplePlugin *plugin) { g_return_val_if_fail(plugin != NULL, FALSE); @@ -1393,40 +1393,40 @@ return TRUE; /* Ensure the plugin has the requisite information */ - if (plugin->info->type == GAIM_PLUGIN_LOADER) + if (plugin->info->type == PURPLE_PLUGIN_LOADER) { - GaimPluginLoaderInfo *loader_info; + PurplePluginLoaderInfo *loader_info; - loader_info = GAIM_PLUGIN_LOADER_INFO(plugin); + loader_info = PURPLE_PLUGIN_LOADER_INFO(plugin); if (loader_info == NULL) { - gaim_debug_error("plugins", "%s is not loadable, loader plugin missing loader_info\n", + purple_debug_error("plugins", "%s is not loadable, loader plugin missing loader_info\n", plugin->path); return FALSE; } } - else if (plugin->info->type == GAIM_PLUGIN_PROTOCOL) + else if (plugin->info->type == PURPLE_PLUGIN_PROTOCOL) { - GaimPluginProtocolInfo *prpl_info; + PurplePluginProtocolInfo *prpl_info; - prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(plugin); + prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(plugin); if (prpl_info == NULL) { - gaim_debug_error("plugins", "%s is not loadable, protocol plugin missing prpl_info\n", + purple_debug_error("plugins", "%s is not loadable, protocol plugin missing prpl_info\n", plugin->path); return FALSE; } } -#ifdef GAIM_PLUGINS +#ifdef PURPLE_PLUGINS /* This plugin should be probed and maybe loaded--add it to the queue */ load_queue = g_list_append(load_queue, plugin); #else if (plugin->info != NULL) { - if (plugin->info->type == GAIM_PLUGIN_PROTOCOL) + if (plugin->info->type == PURPLE_PLUGIN_PROTOCOL) protocol_plugins = g_list_insert_sorted(protocol_plugins, plugin, (GCompareFunc)compare_prpl); if (plugin->info->load != NULL) @@ -1441,9 +1441,9 @@ } gboolean -gaim_plugins_enabled(void) +purple_plugins_enabled(void) { -#ifdef GAIM_PLUGINS +#ifdef PURPLE_PLUGINS return TRUE; #else return FALSE; @@ -1451,7 +1451,7 @@ } void -gaim_plugins_register_probe_notify_cb(void (*func)(void *), void *data) +purple_plugins_register_probe_notify_cb(void (*func)(void *), void *data) { /* TODO */ probe_cb = func; @@ -1459,7 +1459,7 @@ } void -gaim_plugins_unregister_probe_notify_cb(void (*func)(void *)) +purple_plugins_unregister_probe_notify_cb(void (*func)(void *)) { /* TODO */ probe_cb = NULL; @@ -1467,7 +1467,7 @@ } void -gaim_plugins_register_load_notify_cb(void (*func)(GaimPlugin *, void *), +purple_plugins_register_load_notify_cb(void (*func)(PurplePlugin *, void *), void *data) { /* TODO */ @@ -1476,7 +1476,7 @@ } void -gaim_plugins_unregister_load_notify_cb(void (*func)(GaimPlugin *, void *)) +purple_plugins_unregister_load_notify_cb(void (*func)(PurplePlugin *, void *)) { /* TODO */ load_cb = NULL; @@ -1484,7 +1484,7 @@ } void -gaim_plugins_register_unload_notify_cb(void (*func)(GaimPlugin *, void *), +purple_plugins_register_unload_notify_cb(void (*func)(PurplePlugin *, void *), void *data) { /* TODO */ @@ -1493,17 +1493,17 @@ } void -gaim_plugins_unregister_unload_notify_cb(void (*func)(GaimPlugin *, void *)) +purple_plugins_unregister_unload_notify_cb(void (*func)(PurplePlugin *, void *)) { /* TODO */ unload_cb = NULL; unload_cb_data = NULL; } -GaimPlugin * -gaim_plugins_find_with_name(const char *name) +PurplePlugin * +purple_plugins_find_with_name(const char *name) { - GaimPlugin *plugin; + PurplePlugin *plugin; GList *l; for (l = plugins; l != NULL; l = l->next) { @@ -1516,10 +1516,10 @@ return NULL; } -GaimPlugin * -gaim_plugins_find_with_filename(const char *filename) +PurplePlugin * +purple_plugins_find_with_filename(const char *filename) { - GaimPlugin *plugin; + PurplePlugin *plugin; GList *l; for (l = plugins; l != NULL; l = l->next) { @@ -1532,11 +1532,11 @@ return NULL; } -GaimPlugin * -gaim_plugins_find_with_basename(const char *basename) +PurplePlugin * +purple_plugins_find_with_basename(const char *basename) { -#ifdef GAIM_PLUGINS - GaimPlugin *plugin; +#ifdef PURPLE_PLUGINS + PurplePlugin *plugin; GList *l; char *tmp; @@ -1544,10 +1544,10 @@ for (l = plugins; l != NULL; l = l->next) { - plugin = (GaimPlugin *)l->data; + plugin = (PurplePlugin *)l->data; if (plugin->path != NULL) { - tmp = gaim_plugin_get_basename(plugin->path); + tmp = purple_plugin_get_basename(plugin->path); if (!strcmp(tmp, basename)) { g_free(tmp); @@ -1557,15 +1557,15 @@ } } -#endif /* GAIM_PLUGINS */ +#endif /* PURPLE_PLUGINS */ return NULL; } -GaimPlugin * -gaim_plugins_find_with_id(const char *id) +PurplePlugin * +purple_plugins_find_with_id(const char *id) { - GaimPlugin *plugin; + PurplePlugin *plugin; GList *l; g_return_val_if_fail(id != NULL, NULL); @@ -1582,28 +1582,28 @@ } GList * -gaim_plugins_get_loaded(void) +purple_plugins_get_loaded(void) { return loaded_plugins; } GList * -gaim_plugins_get_protocols(void) +purple_plugins_get_protocols(void) { return protocol_plugins; } GList * -gaim_plugins_get_all(void) +purple_plugins_get_all(void) { return plugins; } -GaimPluginAction * -gaim_plugin_action_new(const char* label, void (*callback)(GaimPluginAction *)) +PurplePluginAction * +purple_plugin_action_new(const char* label, void (*callback)(PurplePluginAction *)) { - GaimPluginAction *act = g_new0(GaimPluginAction, 1); + PurplePluginAction *act = g_new0(PurplePluginAction, 1); act->label = g_strdup(label); act->callback = callback; @@ -1612,7 +1612,7 @@ } void -gaim_plugin_action_free(GaimPluginAction *action) +purple_plugin_action_free(PurplePluginAction *action) { g_return_if_fail(action != NULL);