Redesign EPluginUI to accommodate merging and unmerging shell views.

Get the "mark-all-read" and "plugin-manager" plugins working.

svn path=/branches/kill-bonobo/; revision=37125

6 files changed, 18 insertions, 3 deletions

diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c
index 72cbf37823..620600369e 100644
--- a/calendar/gui/dialogs/event-editor.c
+++ b/calendar/gui/dialogs/event-editor.c
@@ -465,6 +465,7 @@ event_editor_init (EventEditor *ee)
 	GtkUIManager *manager;
 	GtkActionGroup *action_group;
 	GtkAction *action;
+	const gchar *id;
 	GError *error = NULL;
 
 	ee->priv = EVENT_EDITOR_GET_PRIVATE (ee);
@@ -487,7 +488,10 @@ event_editor_init (EventEditor *ee)
 
 	manager = comp_editor_get_ui_manager (editor);
 	gtk_ui_manager_add_ui_from_string (manager, ui, -1, &error);
-	e_plugin_ui_register_manager ("event-editor", manager, ee);
+
+	id = "org.gnome.evolution.event-editor";
+	e_plugin_ui_register_manager (manager, id, ee);
+	e_plugin_ui_enable_manager (manager, id);
 
 	if (error != NULL) {
 		g_critical ("%s: %s", G_STRFUNC, error->message);
diff --git a/calendar/gui/dialogs/memo-editor.c b/calendar/gui/dialogs/memo-editor.c
index 90c77f2349..5e01327703 100644
--- a/calendar/gui/dialogs/memo-editor.c
+++ b/calendar/gui/dialogs/memo-editor.c
@@ -134,6 +134,7 @@ memo_editor_init (MemoEditor *me)
 {
 	CompEditor *editor = COMP_EDITOR (me);
 	GtkUIManager *manager;
+	const gchar *id;
 	GError *error = NULL;
 
 	me->priv = MEMO_EDITOR_GET_PRIVATE (me);
@@ -141,7 +142,10 @@ memo_editor_init (MemoEditor *me)
 
 	manager = comp_editor_get_ui_manager (editor);
 	gtk_ui_manager_add_ui_from_string (manager, ui, -1, &error);
-	e_plugin_ui_register_manager ("memo-editor", manager, me);
+
+	id = "org.gnome.evolution.memo-editor";
+	e_plugin_ui_register_manager (manager, id, me);
+	e_plugin_ui_enable_manager (manager, id);
 
 	if (error != NULL) {
 		g_critical ("%s: %s", G_STRFUNC, error->message);
diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c
index 656e7b4836..773dea4a47 100644
--- a/calendar/gui/dialogs/task-editor.c
+++ b/calendar/gui/dialogs/task-editor.c
@@ -303,6 +303,7 @@ task_editor_init (TaskEditor *te)
 	CompEditor *editor = COMP_EDITOR (te);
 	GtkUIManager *manager;
 	GtkActionGroup *action_group;
+	const gchar *id;
 	GError *error = NULL;
 
 	te->priv = TASK_EDITOR_GET_PRIVATE (te);
@@ -345,7 +346,10 @@ task_editor_init (TaskEditor *te)
 
 	manager = comp_editor_get_ui_manager (editor);
 	gtk_ui_manager_add_ui_from_string (manager, ui, -1, &error);
-	e_plugin_ui_register_manager ("task-editor", manager, te);
+
+	id = "org.gnome.evolution.task-editor";
+	e_plugin_ui_register_manager (manager, id, te);
+	e_plugin_ui_enable_manager (manager, id);
 
 	if (error != NULL) {
 		g_critical ("%s: %s", G_STRFUNC, error->message);
diff --git a/calendar/modules/e-cal-shell-view.c b/calendar/modules/e-cal-shell-view.c
index ca6264efef..67f7d788a4 100644
--- a/calendar/modules/e-cal-shell-view.c
+++ b/calendar/modules/e-cal-shell-view.c
@@ -194,6 +194,7 @@ cal_shell_view_class_init (ECalShellViewClass *class,
 	shell_view_class->label = _("Calendar");
 	shell_view_class->icon_name = "x-office-calendar";
 	shell_view_class->ui_definition = "evolution-calendars.ui";
+	shell_view_class->ui_manager_id = "org.gnome.evolution.calendars";
 	shell_view_class->search_options = "/calendar-search-options";
 	shell_view_class->search_rules = "caltypes.xml";
 	shell_view_class->type_module = type_module;
diff --git a/calendar/modules/e-memo-shell-view.c b/calendar/modules/e-memo-shell-view.c
index 0237e84e27..89efd8f15d 100644
--- a/calendar/modules/e-memo-shell-view.c
+++ b/calendar/modules/e-memo-shell-view.c
@@ -199,6 +199,7 @@ memo_shell_view_class_init (EMemoShellViewClass *class,
 	shell_view_class->label = _("Memos");
 	shell_view_class->icon_name = "evolution-memos";
 	shell_view_class->ui_definition = "evolution-memos.ui";
+	shell_view_class->ui_manager_id = "org.gnome.evolution.memos";
 	shell_view_class->search_options = "/memo-search-options";
 	shell_view_class->search_rules = "memotypes.xml";
 	shell_view_class->type_module = type_module;
diff --git a/calendar/modules/e-task-shell-view.c b/calendar/modules/e-task-shell-view.c
index 9c893d259a..3bf84100cc 100644
--- a/calendar/modules/e-task-shell-view.c
+++ b/calendar/modules/e-task-shell-view.c
@@ -232,6 +232,7 @@ task_shell_view_class_init (ETaskShellViewClass *class,
 	shell_view_class->label = _("Tasks");
 	shell_view_class->icon_name = "evolution-tasks";
 	shell_view_class->ui_definition = "evolution-tasks.ui";
+	shell_view_class->ui_manager_id = "org.gnome.evolution.tasks";
 	shell_view_class->search_options = "/task-search-options";
 	shell_view_class->search_rules = "tasktypes.xml";
 	shell_view_class->type_module = type_module;