Shell and UI manager cleanups.

Replace the EVO_EXPRESS environment variable with an --express command
line option.  (Note, this adds a new translatable string for --help.)

Add an EUIManager class with an "express-mode" property and custom load
functions that use our new "express" preprocessor.  This replaces the UI
manager functions in e-utils.c.

(Also going to see if I can get GTK+ to add an "add_ui_from_string"
method to GtkUIManagerClass that we can override.  Then we could just
call gtk_ui_manager_add_ui_from_string() and the preprocessor would
automatically do its thing and chain up.)

Add an "express-mode" read-only GObject property to EShell.

Add e_shell_configure_ui_manager() to e-shell-utils.c.  For now this
just creates a one-way property binding:

    EShell:express-mode -> EUIManager:express-mode

Call this immediately after e_ui_manager_new().  (EUIManager can't do
this itself because it lives too low in the dependency hierarchy and
doesn't know about EShell.)

4 files changed, 8 insertions, 7 deletions

diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index e002f6afd4..15384d829d 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -66,6 +66,7 @@
 #include "widgets/misc/e-attachment-paned.h"
 
 #include "e-util/e-alert-dialog.h"
+#include "e-util/e-ui-manager.h"
 
 #define COMP_EDITOR_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
@@ -1608,7 +1609,7 @@ comp_editor_init (CompEditor *editor)
 	priv->warned = FALSE;
 	priv->is_group_item = FALSE;
 
-	priv->ui_manager = gtk_ui_manager_new ();
+	priv->ui_manager = e_ui_manager_new ();
 
 	if (comp_lite)
 		gtk_window_set_default_size ((GtkWindow *) editor, 800, 450);
diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c
index 23256adff0..6e8b049bee 100644
--- a/calendar/gui/dialogs/event-editor.c
+++ b/calendar/gui/dialogs/event-editor.c
@@ -507,8 +507,8 @@ event_editor_init (EventEditor *ee)
 	gtk_ui_manager_add_ui_from_string (ui_manager, ui, -1, &error);
 
 	id = "org.gnome.evolution.event-editor";
-	e_plugin_ui_register_manager (ui_manager, id, ee);
-	e_plugin_ui_enable_manager (ui_manager, id);
+	e_plugin_ui_register_manager (E_UI_MANAGER (ui_manager), id, ee);
+	e_plugin_ui_enable_manager (E_UI_MANAGER (ui_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 8e988c00a5..8e2a5619dd 100644
--- a/calendar/gui/dialogs/memo-editor.c
+++ b/calendar/gui/dialogs/memo-editor.c
@@ -143,8 +143,8 @@ memo_editor_init (MemoEditor *me)
 	gtk_ui_manager_add_ui_from_string (ui_manager, ui, -1, &error);
 
 	id = "org.gnome.evolution.memo-editor";
-	e_plugin_ui_register_manager (ui_manager, id, me);
-	e_plugin_ui_enable_manager (ui_manager, id);
+	e_plugin_ui_register_manager (E_UI_MANAGER (ui_manager), id, me);
+	e_plugin_ui_enable_manager (E_UI_MANAGER (ui_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 a3d4baec46..c7e0440eda 100644
--- a/calendar/gui/dialogs/task-editor.c
+++ b/calendar/gui/dialogs/task-editor.c
@@ -365,8 +365,8 @@ task_editor_init (TaskEditor *te)
 	gtk_ui_manager_add_ui_from_string (ui_manager, ui, -1, &error);
 
 	id = "org.gnome.evolution.task-editor";
-	e_plugin_ui_register_manager (ui_manager, id, te);
-	e_plugin_ui_enable_manager (ui_manager, id);
+	e_plugin_ui_register_manager (E_UI_MANAGER (ui_manager), id, te);
+	e_plugin_ui_enable_manager (E_UI_MANAGER (ui_manager), id);
 
 	if (error != NULL) {
 		g_critical ("%s: %s", G_STRFUNC, error->message);