Updates for the Bonobo changes from Michael who is having some

troubles with CVS at home (so I commit this on his behalf).

svn path=/trunk/; revision=5560

11 files changed, 55 insertions, 96 deletions

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 58ebc73c11..0c1302fdeb 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,9 @@
+2000-09-22  Michael Meeks  <michael@helixcode.com>
+
+	* gui/component/addressbook.c (control_activate): update.
+
+	* contact-editor/e-contact-editor.c (create_ui): upd.
+
 2000-09-22  Chris Toshok  <toshok@helixcode.com>
 
 	* backend/pas/pas-backend-ldap.c: lots of changes.  flesh out the
diff --git a/addressbook/contact-editor/e-contact-editor.c b/addressbook/contact-editor/e-contact-editor.c
index 07c4bf9dc3..42782fc549 100644
--- a/addressbook/contact-editor/e-contact-editor.c
+++ b/addressbook/contact-editor/e-contact-editor.c
@@ -739,7 +739,7 @@ static void
 create_ui (EContactEditor *ce)
 {
 	char *fname;
-	xmlNode *ui;
+	BonoboUINode *ui;
 	BonoboUIComponent *component;
 	Bonobo_UIContainer container;
 
@@ -748,17 +748,11 @@ create_ui (EContactEditor *ce)
 	
 	bonobo_ui_component_add_verb_list_with_data (
 		component, verbs, ce);
-	
-	fname = bonobo_ui_util_get_ui_fname (
-		EVOLUTION_DATADIR, "evolution-contact-editor.xml");
-	g_warning ("Attempting ui load from '%s'", fname);
-
-	ui = bonobo_ui_util_new_ui (component, fname, "evolution-contact-editor");
-
-	bonobo_ui_component_set_tree (component, container, "/", ui, NULL);
 
-	g_free (fname);
-	xmlFreeNode (ui);
+	bonobo_ui_util_set_ui (component, container,
+			       EVOLUTION_DATADIR,
+			       "evolution-contact-editor.xml",
+			       "evolution-contact-editor");
 }
 
 /* Callback used when the dialog box is destroyed */
diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c
index a632c61ead..1c0aa4ada7 100644
--- a/addressbook/gui/component/addressbook.c
+++ b/addressbook/gui/component/addressbook.c
@@ -345,8 +345,6 @@ control_activate (BonoboControl *control, BonoboUIHandler *uih,
 		  AddressbookView *view)
 {
 	Bonobo_UIContainer remote_uih;
-	char *fname;
-	xmlNode *ui;
 	Bonobo_UIContainer container;
 	BonoboUIComponent *component;
 	GtkWidget *quick_search_widget;
@@ -366,21 +364,13 @@ control_activate (BonoboControl *control, BonoboUIHandler *uih,
 	
 	bonobo_ui_container_freeze (container, NULL);
 
+	bonobo_ui_util_set_ui (component, container, EVOLUTION_DATADIR,
 #ifdef HAVE_LDAP
-	fname = bonobo_ui_util_get_ui_fname (
-		EVOLUTION_DATADIR, "evolution-addressbook-ldap.xml");
+			       "evolution-addressbook-ldap.xml",
 #else
-	fname = bonobo_ui_util_get_ui_fname (
-		EVOLUTION_DATADIR, "evolution-addressbook.xml");
+			       "evolution-addressbook.xml",
 #endif
-	g_warning ("Attempting ui load from '%s'", fname);
-		
-	ui = bonobo_ui_util_new_ui (component, fname, "evolution-addressbook");
-
-	bonobo_ui_component_set_tree (component, container, "/", ui, NULL);
-
-	g_free (fname);
-	xmlFreeNode (ui);
+			       "evolution-addressbook");
 
 	quick_search_widget = make_quick_search_widget (
 		search_entry_activated, view);
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index 07c4bf9dc3..42782fc549 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -739,7 +739,7 @@ static void
 create_ui (EContactEditor *ce)
 {
 	char *fname;
-	xmlNode *ui;
+	BonoboUINode *ui;
 	BonoboUIComponent *component;
 	Bonobo_UIContainer container;
 
@@ -748,17 +748,11 @@ create_ui (EContactEditor *ce)
 	
 	bonobo_ui_component_add_verb_list_with_data (
 		component, verbs, ce);
-	
-	fname = bonobo_ui_util_get_ui_fname (
-		EVOLUTION_DATADIR, "evolution-contact-editor.xml");
-	g_warning ("Attempting ui load from '%s'", fname);
-
-	ui = bonobo_ui_util_new_ui (component, fname, "evolution-contact-editor");
-
-	bonobo_ui_component_set_tree (component, container, "/", ui, NULL);
 
-	g_free (fname);
-	xmlFreeNode (ui);
+	bonobo_ui_util_set_ui (component, container,
+			       EVOLUTION_DATADIR,
+			       "evolution-contact-editor.xml",
+			       "evolution-contact-editor");
 }
 
 /* Callback used when the dialog box is destroyed */
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 8aaee757ad..8650f31077 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,7 @@
+2000-09-22  Michael Meeks  <michael@helixcode.com>
+
+	* gui/calendar-commands.c (calendar_control_activate): upd.
+
 2000-09-21  Federico Mena Quintero  <federico@helixcode.com>
 
 	* gui/calendar-commands.c (verbs): Removed the "about calendar"
diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c
index 8443323f43..0870f70be1 100644
--- a/calendar/gui/calendar-commands.c
+++ b/calendar/gui/calendar-commands.c
@@ -557,9 +557,7 @@ calendar_control_activate (BonoboControl *control,
 				    1, 1, 0);
 #endif
 	
-	{ /* FIXME: sweeten this whole function */
-		char *fname;
-		xmlNode *ui;
+	{
 		Bonobo_UIContainer container;
 		BonoboUIComponent *component;
 
@@ -569,17 +567,11 @@ calendar_control_activate (BonoboControl *control,
 
 		container = bonobo_ui_compat_get_container (uih);
 		g_return_if_fail (container != CORBA_OBJECT_NIL);
-		
-		fname = bonobo_ui_util_get_ui_fname (
-			EVOLUTION_DATADIR, "evolution-calendar.xml");
-		g_warning ("Attempting ui load from '%s'", fname);
-		
-		ui = bonobo_ui_util_new_ui (component, fname, "evolution-calendar");
-		
-		bonobo_ui_component_set_tree (component, container, "/", ui, NULL);
-
-		g_free (fname);
-		xmlFreeNode (ui);
+
+		bonobo_ui_util_set_ui (component, container,
+				       EVOLUTION_DATADIR,
+				       "evolution-calendar.xml",
+				       "evolution-calendar");
 	}
 }
 
diff --git a/mail/ChangeLog b/mail/ChangeLog
index b04ad0d151..ffe6d54400 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,8 @@
+2000-09-23  Michael Meeks  <michael@helixcode.com>
+
+	* folder-browser-factory.c (set_pixmap): upd.
+	(control_activate): upd.
+
 2000-09-23  Ettore Perazzoli  <ettore@helixcode.com>
 
 	* message-list.c (internet_address_new_from_string): Skip spaces
diff --git a/mail/folder-browser-factory.c b/mail/folder-browser-factory.c
index 1ba9a16c80..c14dd999e0 100644
--- a/mail/folder-browser-factory.c
+++ b/mail/folder-browser-factory.c
@@ -122,28 +122,18 @@ set_pixmap (Bonobo_UIContainer container,
 	    const char        *xml_path,
 	    const char        *icon)
 {
-	char *path, *parent_path;
-	xmlNode *node;
+	char *path;
 	GdkPixbuf *pixbuf;
 
 	path = g_concat_dir_and_file (EVOLUTION_DATADIR "/images/evolution/buttons", icon);
 
 	pixbuf = gdk_pixbuf_new_from_file (path);
 	g_return_if_fail (pixbuf != NULL);
-	
-	node = bonobo_ui_container_get_tree (container, xml_path, FALSE, NULL);
 
-	g_return_if_fail (node != NULL);
+	bonobo_ui_util_set_pixbuf (container, xml_path, pixbuf);
 
-	bonobo_ui_util_xml_set_pixbuf (node, pixbuf);
 	gdk_pixbuf_unref (pixbuf);
 
-	parent_path = bonobo_ui_xml_get_parent_path (xml_path);
-	bonobo_ui_component_set_tree (NULL, container, parent_path, node, NULL);
-
-	xmlFreeNode (node);
-
-	g_free (parent_path);
 	g_free (path);
 }
 
@@ -182,21 +172,10 @@ control_activate (BonoboControl *control, BonoboUIHandler *uih,
 
 	bonobo_ui_container_freeze (container, NULL);
 
-	{ /* FIXME: sweeten this whole function */
-		char *fname;
-		xmlNode *ui;
-
-		fname = bonobo_ui_util_get_ui_fname (
-			EVOLUTION_DATADIR, "evolution-mail.xml");
-		g_warning ("Attempting ui load from '%s'", fname);
-		
-		ui = bonobo_ui_util_new_ui (component, fname, "evolution-mail");
-		
-		bonobo_ui_component_set_tree (component, container, "/", ui, NULL);
-
-		g_free (fname);
-		xmlFreeNode (ui);
-	}
+	bonobo_ui_util_set_ui (
+		component, container,
+		EVOLUTION_DATADIR, "evolution-mail.xml",
+		"evolution-mail");
 
 	if (mail_config_thread_list ())
 		bonobo_ui_container_set_prop (
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 2e335a2bbf..e1f0f638cd 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,7 @@
+2000-09-22  Michael Meeks  <michael@helixcode.com>
+
+	* e-shell-view-menu.c (e_shell_view_menu_setup): upd.
+
 2000-09-21  Federico Mena Quintero  <federico@helixcode.com>
 
 	* e-shell-view-menu.c: Fix mis-spelling of "calendar".
diff --git a/shell/e-shell-view-menu.c b/shell/e-shell-view-menu.c
index 78e62953d7..13ec5c4cb8 100644
--- a/shell/e-shell-view-menu.c
+++ b/shell/e-shell-view-menu.c
@@ -448,8 +448,6 @@ e_shell_view_menu_setup (EShellView *shell_view)
 	BonoboUIHandler *uih;
 	Bonobo_UIContainer container;
 	BonoboUIComponent *component;
-	char *fname;
-	xmlNode *ui;
 
 	g_return_if_fail (shell_view != NULL);
 	g_return_if_fail (E_IS_SHELL_VIEW (shell_view));
@@ -472,16 +470,9 @@ e_shell_view_menu_setup (EShellView *shell_view)
 
 	bonobo_ui_container_freeze (container, NULL);
 
-	fname = bonobo_ui_util_get_ui_fname (
-		EVOLUTION_DATADIR, "evolution.xml");
-	g_warning ("Attempting ui load from '%s'", fname);
-
-	ui = bonobo_ui_util_new_ui (component, fname, "evolution");
-
-	bonobo_ui_component_set_tree (component, container, "/", ui, NULL);
-
-	g_free (fname);
-	xmlFreeNode (ui);
+	bonobo_ui_util_set_ui (component, container, 
+			       EVOLUTION_DATADIR, "evolution.xml",
+			       "evolution");
 
 	menu_do_misc (component, shell_view);
 
diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c
index a7a0a766e5..b1444cd6ac 100644
--- a/shell/e-shell-view.c
+++ b/shell/e-shell-view.c
@@ -212,13 +212,13 @@ storage_set_view_box_map_cb (GtkWidget *widget,
 	shell_view = E_SHELL_VIEW (data);
 	priv = shell_view->priv;
 
-	if ((gdk_pointer_grab (widget->window, TRUE,
-			       (GDK_BUTTON_PRESS_MASK
-				| GDK_BUTTON_RELEASE_MASK
-				| GDK_ENTER_NOTIFY_MASK
-				| GDK_LEAVE_NOTIFY_MASK
-				| GDK_POINTER_MOTION_MASK),
-			       NULL, NULL, GDK_CURRENT_TIME) != 0)) {
+	if (gdk_pointer_grab (widget->window, TRUE,
+			      (GDK_BUTTON_PRESS_MASK
+			       | GDK_BUTTON_RELEASE_MASK
+			       | GDK_ENTER_NOTIFY_MASK
+			       | GDK_LEAVE_NOTIFY_MASK
+			       | GDK_POINTER_MOTION_MASK),
+			      NULL, NULL, GDK_CURRENT_TIME) != 0) {
 		g_warning ("%s -- pointer grab failed.", __FUNCTION__);
 		e_shell_view_set_folder_bar_mode (shell_view, E_SHELL_VIEW_SUBWINDOW_STICKY);
 		return;