From 04305b8fa35d87d97e48b11f93d24604cef5155d Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 15 Mar 2010 12:11:26 -0400 Subject: Revert some bad assumptions I made in EPluginUI. We can't require the use of EUIManager everywhere because we don't control all the UI manager instances -- the most compelling example being the composer, whose UI manager comes from GtkhtmlEditor. Instead, EPluginUI will check the instance type and pick an appropriate "load_from_string" function. --- e-util/e-plugin-ui.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'e-util/e-plugin-ui.h') diff --git a/e-util/e-plugin-ui.h b/e-util/e-plugin-ui.h index e0cbb32f2d..e59b5f5222 100644 --- a/e-util/e-plugin-ui.h +++ b/e-util/e-plugin-ui.h @@ -20,7 +20,6 @@ #include -#include #include /* Standard GObject macros */ @@ -59,17 +58,17 @@ struct _EPluginUIHookClass { /* Plugins with "org.gnome.evolution.ui" hooks should define a * function named e_plugin_ui_init() having this signature. */ -typedef gboolean (*EPluginUIInitFunc) (EUIManager *ui_manager, +typedef gboolean (*EPluginUIInitFunc) (GtkUIManager *ui_manager, gpointer user_data); GType e_plugin_ui_hook_get_type (void); -void e_plugin_ui_register_manager (EUIManager *ui_manager, +void e_plugin_ui_register_manager (GtkUIManager *ui_manager, const gchar *id, gpointer user_data); -void e_plugin_ui_enable_manager (EUIManager *ui_manager, +void e_plugin_ui_enable_manager (GtkUIManager *ui_manager, const gchar *id); -void e_plugin_ui_disable_manager (EUIManager *ui_manager, +void e_plugin_ui_disable_manager (GtkUIManager *ui_manager, const gchar *id); G_END_DECLS -- cgit v1.2.3