diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-11-10 23:45:06 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-11-10 23:47:11 +0800 |
| commit | 54fe7e3b2affbe5fd962460ec5ba6942a77b747c (patch) | |
| tree | 5a3380e1ef3af206fa566b790c1377985ebad020 | |
| parent | 26889bef61bc32efd202bad6e736ac2fcaf586e0 (diff) | |
| download | gsoc2013-evolution-54fe7e3b2affbe5fd962460ec5ba6942a77b747c.tar gsoc2013-evolution-54fe7e3b2affbe5fd962460ec5ba6942a77b747c.tar.gz gsoc2013-evolution-54fe7e3b2affbe5fd962460ec5ba6942a77b747c.tar.bz2 gsoc2013-evolution-54fe7e3b2affbe5fd962460ec5ba6942a77b747c.tar.lz gsoc2013-evolution-54fe7e3b2affbe5fd962460ec5ba6942a77b747c.tar.xz gsoc2013-evolution-54fe7e3b2affbe5fd962460ec5ba6942a77b747c.tar.zst gsoc2013-evolution-54fe7e3b2affbe5fd962460ec5ba6942a77b747c.zip | |
Fix EPluginLib callback signatures.
Dynamically loaded library plugins do not need to know about EPluginLib
specifically. Passing them an EPlugin pointer is sufficient.
| -rw-r--r-- | modules/plugin-lib/e-plugin-lib.c | 8 | ||||
| -rw-r--r-- | modules/plugin-lib/e-plugin-lib.h | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/modules/plugin-lib/e-plugin-lib.c b/modules/plugin-lib/e-plugin-lib.c index c7a0233bb3..7b72053e45 100644 --- a/modules/plugin-lib/e-plugin-lib.c +++ b/modules/plugin-lib/e-plugin-lib.c @@ -57,7 +57,7 @@ plugin_lib_loadmodule (EPlugin *plugin) } if (g_module_symbol (plugin_lib->module, "e_plugin_lib_enable", (gpointer)&enable)) { - if (enable (plugin_lib, TRUE) != 0) { + if (enable (plugin, TRUE) != 0) { plugin->enabled = FALSE; g_module_close (plugin_lib->module); plugin_lib->module = NULL; @@ -87,7 +87,7 @@ plugin_lib_invoke (EPlugin *plugin, const gchar *name, gpointer data) return NULL; } - return cb (plugin_lib, data); + return cb (plugin, data); } static gpointer @@ -162,7 +162,7 @@ plugin_lib_get_configure_widget (EPlugin *plugin) } if (g_module_symbol (plugin_lib->module, "e_plugin_lib_get_configure_widget", (gpointer)&get_configure_widget)) { - return (GtkWidget*) get_configure_widget (plugin_lib); + return (GtkWidget*) get_configure_widget (plugin); } return NULL; } @@ -184,7 +184,7 @@ plugin_lib_enable (EPlugin *plugin, gint state) return; if (g_module_symbol (plugin_lib->module, "e_plugin_lib_enable", (gpointer) &enable)) { - if (enable (plugin_lib, state) != 0) + if (enable (plugin, state) != 0) return; } } diff --git a/modules/plugin-lib/e-plugin-lib.h b/modules/plugin-lib/e-plugin-lib.h index b485d9625e..6ca7d697a9 100644 --- a/modules/plugin-lib/e-plugin-lib.h +++ b/modules/plugin-lib/e-plugin-lib.h @@ -50,14 +50,14 @@ typedef struct _EPluginLib EPluginLib; typedef struct _EPluginLibClass EPluginLibClass; /* The callback signature used for epluginlib methods */ -typedef gpointer (*EPluginLibFunc) (EPluginLib *ep, gpointer data); +typedef gpointer (*EPluginLibFunc) (EPlugin *ep, gpointer data); /* The setup method, this will be called when the plugin is * initialized. In the future it may also be called when the plugin * is disabled. */ -typedef gint (*EPluginLibEnableFunc) (EPluginLib *ep, gint enable); +typedef gint (*EPluginLibEnableFunc) (EPlugin *ep, gint enable); -typedef gpointer (*EPluginLibGetConfigureWidgetFunc) (EPluginLib *ep); +typedef gpointer (*EPluginLibGetConfigureWidgetFunc) (EPlugin *ep); /** * struct _EPluginLib - |