** Fixes bug #525241 (EPluginUI)

2008-05-08  Matthew Barnes  <mbarnes@redhat.com>

	** Fixes bug #525241 (EPluginUI)

	* e-util/Makefile.am:
	Add e-plugin-ui.[ch].

	* e-util/e-plugin.h (EPluginClass):
	Add a "get_symbol" method for extracting arbitrary symbols
	from an EPlugin.  Implementation of the method is optional.

	* e-util/e-plugin.c (e_plugin_get_symbol):
	New function invokes the new "get_symbol" EPlugin method.

	* e-util/e-plugin.c (epl_get_symbol):
	New function implements the new "get_symbol" EPlugin method.
	It extracts the given symbol name from the GModule.

	* e-util/e-plugin-ui.[ch]:
	New EPluginHook subclass that allows plugins to extend menus,
	toolbars, and popups that are managed by GtkUIManager instead
	of BonoboUI.  Should eventually replace EMenu/EPopup.

	* shell/main.c (main): Register the EPluginUIHook type.

	* composer/e-msg-composer.c (msg_composer_destroy),
	(msg_composer_init): Rip out the EMenu logic.

	* composer/e-msg-composer.c (msg_composer_init):
	Register the GtkUIManager with EPluginUI.

	* plugins/face/Makefile.am:
	* plugins/face/org-gnome-face-ui.xml:
	Remove org-gnome-face-ui.xml (obsolete).

	* plugins/face/face.c (e_plugin_ui_init):
	Initialization callback for EPluginUI.  Adds a "face" action to
	the EMsgComposer instance's "composer" action group.

	* plugins/face/org-gnome-face.eplug.xml:
	Replace the "bonobomenu" hook definition with a new one for
	EPluginUI.  Include the UI definition inline.


svn path=/trunk/; revision=35485

1 files changed, 74 insertions, 0 deletions

diff --git a/e-util/e-plugin-ui.h b/e-util/e-plugin-ui.h
new file mode 100644
index 0000000000..8bcaaa3d01
--- /dev/null
+++ b/e-util/e-plugin-ui.h
@@ -0,0 +1,74 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * Copyright (C) 2008 Novell, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU Lesser General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef E_PLUGIN_UI_H
+#define E_PLUGIN_UI_H
+
+#include <gtk/gtk.h>
+#include "e-plugin.h"
+
+/* Standard GObject macros */
+#define E_TYPE_PLUGIN_UI_HOOK \
+	(e_plugin_ui_hook_get_type ())
+#define E_PLUGIN_UI_HOOK(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_PLUGIN_UI_HOOK, EPluginUIHook))
+#define E_PLUGIN_UI_HOOK_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_PLUGIN_UI_HOOK, EPluginUIHookClass))
+#define E_IS_PLUGIN_UI_HOOK(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_PLUGIN_UI_HOOK))
+#define E_IS_PLUGIN_UI_HOOK_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_PLUGIN_UI_HOOK))
+#define E_PLUGIN_UI_HOOK_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_PLUGIN_UI_HOOK, EPluginUIHookClass))
+
+G_BEGIN_DECLS
+
+typedef struct _EPluginUIHook EPluginUIHook;
+typedef struct _EPluginUIHookClass EPluginUIHookClass;
+typedef struct _EPluginUIHookPrivate EPluginUIHookPrivate;
+
+struct _EPluginUIHook {
+	EPluginHook parent;
+	EPluginUIHookPrivate *priv;
+};
+
+struct _EPluginUIHookClass {
+	EPluginHookClass parent_class;
+};
+
+/* Plugins with "org.gnome.evolution.ui" hooks should define a
+ * function named e_plugin_ui_init() having this signature. */
+typedef gboolean	(*EPluginUIInitFunc)	(GtkUIManager *manager,
+						 gpointer user_data);
+
+GType		e_plugin_ui_hook_get_type	(void);
+
+void		e_plugin_ui_register_manager	(const gchar *id,
+						 GtkUIManager *manager,
+						 gpointer user_data);
+const gchar *	e_plugin_ui_get_manager_id	(GtkUIManager *manager);
+
+G_END_DECLS
+
+#endif /* E_PLUGIN_UI_H */