From 97f274dffdca39bca33296a9f39411dd2680b4ec Mon Sep 17 00:00:00 2001
From: Michael Meeks <michael.meeks@novell.com>
Date: Wed, 3 Mar 2010 14:02:41 +0000
Subject: Disable a chunk of UI from the mail-to-task plugin Allow plugins to
 disable chunks of their UI - *NB* requires patched intltool, that doesn't
 elide comments in XML Remove some debug

---
 e-util/e-plugin-ui.c                                  | 4 +---
 e-util/e-util.c                                       | 2 --
 plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml | 4 ++++
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/e-util/e-plugin-ui.c b/e-util/e-plugin-ui.c
index 3ca8703d5a..133455b108 100644
--- a/e-util/e-plugin-ui.c
+++ b/e-util/e-plugin-ui.c
@@ -450,9 +450,7 @@ plugin_ui_hook_construct (EPluginHook *hook,
 
 		/* Extract the XML content below <ui-manager> */
 		buffer = xmlBufferCreate ();
-		for (child = xmlFirstElementChild (node); child != NULL;
-			child = xmlNextElementSibling (child)) {
-
+		for (child = node->children; child != NULL; child = child->next) {
 			xmlNodeDump (buffer, node->doc, child, 2, 1);
 			temp = (const gchar *) xmlBufferContent (buffer);
 			g_string_append (content, temp);
diff --git a/e-util/e-util.c b/e-util/e-util.c
index f86ee1bff4..3573952244 100644
--- a/e-util/e-util.c
+++ b/e-util/e-util.c
@@ -315,7 +315,6 @@ void
 e_load_ui_manager_set_express (GtkUIManager *ui_manager,
 			       gboolean      express)
 {
-	fprintf (stderr, "set express on %p to %d\n", ui_manager, express);
 	g_object_set_data (G_OBJECT (ui_manager),
 			   "e-ui-mgr-express",
 			   GUINT_TO_POINTER (express));
@@ -327,7 +326,6 @@ e_load_ui_manager_get_express (GtkUIManager *ui_manager)
 	gboolean express = GPOINTER_TO_UINT (
 		g_object_get_data (G_OBJECT (ui_manager),
 				   "e-ui-mgr-express"));
-	fprintf (stderr, "get express on %p to %d\n", ui_manager, express);
 	return express;
 }
 
diff --git a/plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml b/plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml
index c708ee3ad1..9cb3909f7a 100644
--- a/plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml
+++ b/plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml
@@ -7,6 +7,7 @@
     <hook class="org.gnome.evolution.ui:1.0">
       <ui-manager id="org.gnome.evolution.mail.browser"
                   callback="mail_browser_init">
+<!-- if !EXPRESS -->
         <menubar name='main-menu'>
           <placeholder name='custom-menus'>
             <menu action="mail-message-menu">
@@ -27,9 +28,11 @@
             <menuitem action="mail-convert-to-memo"/>
           </placeholder>
         </popup>
+<!-- endif -->
       </ui-manager>
       <ui-manager id="org.gnome.evolution.mail"
                   callback="mail_shell_view_init">
+<!-- if !EXPRESS -->
         <menubar name='main-menu'>
           <placeholder name='custom-menus'>
             <menu action="mail-message-menu">
@@ -58,6 +61,7 @@
             <menuitem action="mail-convert-to-memo"/>
           </placeholder>
         </popup>
+<!-- endif -->
       </ui-manager>
     </hook>
 
-- 
cgit v1.2.3