Disable summary stuff, it appears to be badly broken.

2000-10-05  Michael Meeks  <michael@helixcode.com>

	* component-factory.c (summary_fn, component_factory_init): Disable
	summary stuff, it appears to be badly broken.

	* Makefile.am (evolution_mail_SOURCES): add mail-summary.[ch]

	* subscribe-dialog.c (update_pixmaps): upd.
	(set_pixmap): upd.
	(subscribe_dialog_gui_init): upd.
	remove redundant and annoying forward definitions.

	* folder-browser-factory.c (control_deactivate): upd.
	(control_activate_cb): upd.
	(control_activate): upd.
	(set_pixmap): upd.
	(update_pixmaps): upd.
	(register_ondemand): upd.
	(create_ondemand_hooks): upd.

2000-10-05  Michael Meeks  <michael@helixcode.com>

	* e-shell-view-menu.c (shortcut_bar_mode_changed_cb): upd.
	(folder_bar_mode_changed_cb): upd.
	(command_xml_dump): clobber.
	(e_shell_view_menu_setup): upd.

	* e-shell-view.c (shell_view_interface_set_message_cb): upd.
	(shell_view_interface_unset_message_cb): upd.
	(e_shell_view_construct): upd.
	(get_control_for_uri): upd.
	(e_shell_view_get_bonobo_ui_component): upd.

2000-10-05  Michael Meeks  <michael@helixcode.com>

	* contact-editor/e-contact-editor.c (create_ui): upd.
	(e_contact_editor_init): upd.

	* gui/component/addressbook.c (control_activate_cb): upd.
	(control_deactivate): kill.
	(control_activate): upd.

2000-10-05  Michael Meeks  <michael@helixcode.com>

	* gui/calendar-commands.c: upd.
	(calendar_control_activate): upd.
	(calendar_control_deactivate): upd.

2000-10-05  Michael Meeks  <michael@helixcode.com>

	* component/e-summary-factory.c (control_activate): upd.
	(set_pixmap): upd. (update_pixmaps): upd.
	(control_activate_cb): upd.
	(control_deactivate): upd.

svn path=/trunk/; revision=5742

4 files changed, 152 insertions, 138 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index b0c35dfeb4..aaa855c8a0 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,23 @@
+2000-10-05  Michael Meeks  <michael@helixcode.com>
+
+	* component-factory.c (summary_fn, component_factory_init): Disable
+	summary stuff, it appears to be badly broken.
+
+	* Makefile.am (evolution_mail_SOURCES): add mail-summary.[ch]
+
+	* subscribe-dialog.c (update_pixmaps): upd.
+	(set_pixmap): upd.
+	(subscribe_dialog_gui_init): upd.
+	remove redundant and annoying forward definitions.
+
+	* folder-browser-factory.c (control_deactivate): upd.
+	(control_activate_cb): upd.
+	(control_activate): upd.
+	(set_pixmap): upd.
+	(update_pixmaps): upd.
+	(register_ondemand): upd.
+	(create_ondemand_hooks): upd.
+
 2000-10-04  Jeffrey Stedfast  <fejj@helixcode.com>
 
 	* message-list.c (address_compare): Use CamelInternetAddress
diff --git a/mail/component-factory.c b/mail/component-factory.c
index 27fd585840..69f7a4b110 100644
--- a/mail/component-factory.c
+++ b/mail/component-factory.c
@@ -41,9 +41,11 @@
 #include <gal/widgets/e-gui-utils.h>
 #include "mail-local-storage.h"
 
-#include <executive-summary/evolution-services/executive-summary-component.h>
 #include "component-factory.h"
+#ifdef THIS_WAS_BROKEN_AND_WASTED_TIME
+#include <executive-summary/evolution-services/executive-summary-component.h>
 #include "mail-summary.h"
+#endif
 
 CamelFolder *drafts_folder = NULL;
 CamelFolder *outbox_folder = NULL;
@@ -165,16 +167,17 @@ factory_destroy (BonoboEmbeddable *embeddable,
 	gtk_main_quit ();
 }
 
+#ifdef THIS_WAS_BROKEN_AND_WASTED_TIME
 static BonoboObject *
 summary_fn (BonoboGenericFactory *factory, void *closure)
 {
 	ExecutiveSummaryComponent *summary_component;
 
-	summary_component = executive_summary_component_new (NULL,
-							     create_summary_view, 
-							     NULL, NULL);
+	summary_component = executive_summary_component_new (
+		NULL, create_summary_view, NULL, NULL);
 	return BONOBO_OBJECT (summary_component);
 }
+#endif
 
 static BonoboObject *
 factory_fn (BonoboGenericFactory *factory, void *closure)
@@ -207,7 +210,9 @@ component_factory_init (void)
 		return;
 
 	factory = bonobo_generic_factory_new (COMPONENT_FACTORY_ID, factory_fn, NULL);
+#ifdef THIS_WAS_BROKEN_AND_WASTED_TIME
 	summary_factory = bonobo_generic_factory_new (SUMMARY_FACTORY_ID, summary_fn, NULL);
+#endif
 
 	if (factory == NULL) {
 		e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,
@@ -215,10 +220,12 @@ component_factory_init (void)
 		exit (1);
 	}
 
+#ifdef THIS_WAS_BROKEN_AND_WASTED_TIME
 	if (summary_factory == NULL) {
 		e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,
 			  _("Cannot initialize Evolution's mail summary component."));
 	}
+#endif
 }
 
 /* FIXME: remove */
diff --git a/mail/folder-browser-factory.c b/mail/folder-browser-factory.c
index 4dca006a25..c629e00151 100644
--- a/mail/folder-browser-factory.c
+++ b/mail/folder-browser-factory.c
@@ -35,7 +35,8 @@ static void
 register_ondemand (RuleContext *f, FilterRule *rule, gpointer data)
 {
 	FolderBrowser *fb = FOLDER_BROWSER (data);
-	BonoboUIHandler *uih = gtk_object_get_data (GTK_OBJECT (fb), "uih");
+	BonoboUIComponent *uic = gtk_object_get_data (GTK_OBJECT (fb), "uih");
+	BonoboUIHandler *uih;
 	gchar *text;
 	struct fb_ondemand_closure *oc;
 	
@@ -43,7 +44,11 @@ register_ondemand (RuleContext *f, FilterRule *rule, gpointer data)
 	oc->rule = rule;
 	oc->fb = fb;
 	oc->path = g_strdup_printf ("/*Component Placeholder*/Folder/Filter-%s", rule->name);
-	
+
+#warning FIXME: this should not use the bonobo_ui_handler API.
+
+	uih = bonobo_ui_handler_new_from_component (uic);
+
 	if (fb->filter_menu_paths == NULL)
 		bonobo_ui_handler_menu_new_separator (uih, "/*Component Placeholder*/Folder/separator1", -1);
 	
@@ -59,14 +64,14 @@ register_ondemand (RuleContext *f, FilterRule *rule, gpointer data)
 }
 
 static void
-create_ondemand_hooks (FolderBrowser *fb, BonoboUIHandler *uih)
+create_ondemand_hooks (FolderBrowser *fb, BonoboUIComponent *uic)
 {
 	gchar *system, *user;
 	
 	user = g_strdup_printf ("%s/filters.xml", evolution_dir);
 	system = EVOLUTION_DATADIR "/evolution/filtertypes.xml";
 	fb->filter_context = filter_context_new();
-	gtk_object_set_data (GTK_OBJECT (fb), "uih", uih);
+	gtk_object_set_data (GTK_OBJECT (fb), "uih", uic);
 	rule_context_load ((RuleContext *) fb->filter_context, system, user,
 			   register_ondemand, fb);
 	gtk_object_remove_data (GTK_OBJECT (fb), "uih");
@@ -77,55 +82,55 @@ create_ondemand_hooks (FolderBrowser *fb, BonoboUIHandler *uih)
  * Add with 'folder_browser'
  */
 BonoboUIVerb verbs [] = {
-	BONOBO_UI_VERB ("PrintMessage", print_msg),
-	BONOBO_UI_VERB ("PrintPreviewMessage", print_preview_msg),
+	BONOBO_UI_UNSAFE_VERB ("PrintMessage", print_msg),
+	BONOBO_UI_UNSAFE_VERB ("PrintPreviewMessage", print_preview_msg),
 	
 	/* Edit Menu */
-	BONOBO_UI_VERB ("EditSelectAll", select_all),
-	BONOBO_UI_VERB ("EditInvertSelection", invert_selection),
+	BONOBO_UI_UNSAFE_VERB ("EditSelectAll", select_all),
+	BONOBO_UI_UNSAFE_VERB ("EditInvertSelection", invert_selection),
 	
 	/* Settings Menu */
-	BONOBO_UI_VERB ("SetMailFilter", filter_edit),
-	BONOBO_UI_VERB ("VFolderEdit", vfolder_edit_vfolders),
-	BONOBO_UI_VERB ("SetMailConfig", providers_config),
-	BONOBO_UI_VERB ("SetSubscribe", manage_subscriptions),
-	BONOBO_UI_VERB ("SetForgetPwd", forget_passwords),
+	BONOBO_UI_UNSAFE_VERB ("SetMailFilter", filter_edit),
+	BONOBO_UI_UNSAFE_VERB ("VFolderEdit", vfolder_edit_vfolders),
+	BONOBO_UI_UNSAFE_VERB ("SetMailConfig", providers_config),
+	BONOBO_UI_UNSAFE_VERB ("SetSubscribe", manage_subscriptions),
+	BONOBO_UI_UNSAFE_VERB ("SetForgetPwd", forget_passwords),
 	
 	/* Message Menu */
-	BONOBO_UI_VERB ("MessageOpenNewWnd", view_message),
-	BONOBO_UI_VERB ("MessageEdit", edit_message),
-	BONOBO_UI_VERB ("MessagePrint", print_msg),
-	BONOBO_UI_VERB ("MessageReplySndr", reply_to_sender),
-	BONOBO_UI_VERB ("MessageReplyAll", reply_to_all),
-	BONOBO_UI_VERB ("MessageForward", forward_msg),
+	BONOBO_UI_UNSAFE_VERB ("MessageOpenNewWnd", view_message),
+	BONOBO_UI_UNSAFE_VERB ("MessageEdit", edit_message),
+	BONOBO_UI_UNSAFE_VERB ("MessagePrint", print_msg),
+	BONOBO_UI_UNSAFE_VERB ("MessageReplySndr", reply_to_sender),
+	BONOBO_UI_UNSAFE_VERB ("MessageReplyAll", reply_to_all),
+	BONOBO_UI_UNSAFE_VERB ("MessageForward", forward_msg),
 	
-	BONOBO_UI_VERB ("MessageMarkAsRead", mark_as_seen),
-	BONOBO_UI_VERB ("MessageMarkAsUnRead", mark_as_unseen),
-	BONOBO_UI_VERB ("MessageDelete", delete_msg),
-	BONOBO_UI_VERB ("MessageMove", move_msg),
-	BONOBO_UI_VERB ("MessageCopy", copy_msg),
+	BONOBO_UI_UNSAFE_VERB ("MessageMarkAsRead", mark_as_seen),
+	BONOBO_UI_UNSAFE_VERB ("MessageMarkAsUnRead", mark_as_unseen),
+	BONOBO_UI_UNSAFE_VERB ("MessageDelete", delete_msg),
+	BONOBO_UI_UNSAFE_VERB ("MessageMove", move_msg),
+	BONOBO_UI_UNSAFE_VERB ("MessageCopy", copy_msg),
 	
-	BONOBO_UI_VERB ("MessageVFolderSubj", vfolder_subject),
-	BONOBO_UI_VERB ("MessageVFolderSndr", vfolder_sender),
-	BONOBO_UI_VERB ("MessageVFolderRecip", vfolder_recipient),
+	BONOBO_UI_UNSAFE_VERB ("MessageVFolderSubj", vfolder_subject),
+	BONOBO_UI_UNSAFE_VERB ("MessageVFolderSndr", vfolder_sender),
+	BONOBO_UI_UNSAFE_VERB ("MessageVFolderRecip", vfolder_recipient),
 	
-	BONOBO_UI_VERB ("MessageFilterSubj", filter_subject),
-	BONOBO_UI_VERB ("MessageFilderSndr", filter_sender),
-	BONOBO_UI_VERB ("MessageFilderRecip", filter_recipient),
+	BONOBO_UI_UNSAFE_VERB ("MessageFilterSubj", filter_subject),
+	BONOBO_UI_UNSAFE_VERB ("MessageFilderSndr", filter_sender),
+	BONOBO_UI_UNSAFE_VERB ("MessageFilderRecip", filter_recipient),
 	
 	/* Folder Menu */
-	BONOBO_UI_VERB ("FolderExpunge", expunge_folder),
-	BONOBO_UI_VERB ("FolderConfig", configure_folder),
+	BONOBO_UI_UNSAFE_VERB ("FolderExpunge", expunge_folder),
+	BONOBO_UI_UNSAFE_VERB ("FolderConfig", configure_folder),
 	
 	/* Toolbar specific */
-	BONOBO_UI_VERB ("MailGet", send_receieve_mail),
-	BONOBO_UI_VERB ("MailCompose", compose_msg),
+	BONOBO_UI_UNSAFE_VERB ("MailGet", send_receieve_mail),
+	BONOBO_UI_UNSAFE_VERB ("MailCompose", compose_msg),
 	
 	BONOBO_UI_VERB_END
 };
 
 static void
-set_pixmap (Bonobo_UIContainer container,
+set_pixmap (BonoboUIComponent *uic,
 	    const char        *xml_path,
 	    const char        *icon)
 {
@@ -137,7 +142,7 @@ set_pixmap (Bonobo_UIContainer container,
 	pixbuf = gdk_pixbuf_new_from_file (path);
 	g_return_if_fail (pixbuf != NULL);
 
-	bonobo_ui_util_set_pixbuf (container, xml_path, pixbuf);
+	bonobo_ui_util_set_pixbuf (uic, xml_path, pixbuf);
 
 	gdk_pixbuf_unref (pixbuf);
 
@@ -145,74 +150,69 @@ set_pixmap (Bonobo_UIContainer container,
 }
 
 static void
-update_pixmaps (Bonobo_UIContainer container)
+update_pixmaps (BonoboUIComponent *uic)
 {
-	set_pixmap (container, "/Toolbar/MailGet", "fetch-mail.png");
-	set_pixmap (container, "/Toolbar/MailCompose", "compose-message.png");
-	set_pixmap (container, "/Toolbar/Reply", "reply.png");
-	set_pixmap (container, "/Toolbar/ReplyAll", "reply-to-all.png");
-	set_pixmap (container, "/Toolbar/Forward", "forward.png");
-	set_pixmap (container, "/Toolbar/Move", "move-message.png");
-	set_pixmap (container, "/Toolbar/Copy", "copy-message.png");
+	set_pixmap (uic, "/Toolbar/MailGet", "fetch-mail.png");
+	set_pixmap (uic, "/Toolbar/MailCompose", "compose-message.png");
+	set_pixmap (uic, "/Toolbar/Reply", "reply.png");
+	set_pixmap (uic, "/Toolbar/ReplyAll", "reply-to-all.png");
+	set_pixmap (uic, "/Toolbar/Forward", "forward.png");
+	set_pixmap (uic, "/Toolbar/Move", "move-message.png");
+	set_pixmap (uic, "/Toolbar/Copy", "copy-message.png");
 }
 
 static void
-control_activate (BonoboControl *control, BonoboUIHandler *uih,
-		  FolderBrowser *fb)
+control_activate (BonoboControl     *control,
+		  BonoboUIComponent *uic,
+		  FolderBrowser     *fb)
 {
 	GtkWidget         *folder_browser;
-	BonoboUIComponent *component;
 	Bonobo_UIContainer container;
 
-	container = bonobo_control_get_remote_ui_handler (control);
-	bonobo_ui_handler_set_container (uih, container);
+	container = bonobo_control_get_remote_ui_container (control);
+	bonobo_ui_component_set_container (uic, container);
 	bonobo_object_release_unref (container, NULL);
 
-	g_assert (container == bonobo_ui_compat_get_container (uih));
+	g_assert (container == bonobo_ui_component_get_container (uic));
 	g_return_if_fail (container != CORBA_OBJECT_NIL);
 		
 	folder_browser = bonobo_control_get_widget (control);
 
-	component = bonobo_ui_compat_get_component (uih);
 	bonobo_ui_component_add_verb_list_with_data (
-		component, verbs, folder_browser);
+		uic, verbs, folder_browser);
 
-	bonobo_ui_container_freeze (container, NULL);
+	bonobo_ui_component_freeze (uic, NULL);
 
 	bonobo_ui_util_set_ui (
-		component, container,
-		EVOLUTION_DATADIR, "evolution-mail.xml",
-		"evolution-mail");
+		uic, EVOLUTION_DATADIR,
+		"evolution-mail.xml", "evolution-mail");
 
 	if (mail_config_thread_list ())
-		bonobo_ui_container_set_prop (
-			container, "/menu/View/Threaded", "state", "1", NULL);
+		bonobo_ui_component_set_prop (
+			uic, "/menu/View/Threaded", "state", "1", NULL);
 	else
-		bonobo_ui_container_set_prop (
-			container, "/menu/View/Threaded", "state", "0", NULL);
+		bonobo_ui_component_set_prop (
+			uic, "/menu/View/Threaded", "state", "0", NULL);
 
 	bonobo_ui_component_add_verb (
-		component, "ViewThreaded",
+		uic, "ViewThreaded",
 		(BonoboUIVerbFn) message_list_toggle_threads,
 		FOLDER_BROWSER (folder_browser)->message_list);
 
-	create_ondemand_hooks (fb, uih);
+	create_ondemand_hooks (fb, uic);
 
-	update_pixmaps (container);
+	update_pixmaps (uic);
 
-	bonobo_ui_container_thaw (container, NULL);
+	bonobo_ui_component_thaw (uic, NULL);
 }
 
 static void
-control_deactivate (BonoboControl *control,
-		    BonoboUIHandler *uih,
-		    FolderBrowser *fb)
+control_deactivate (BonoboControl     *control,
+		    BonoboUIComponent *uic,
+		    FolderBrowser     *fb)
 {
-	bonobo_ui_component_rm (
-		bonobo_ui_compat_get_component (uih),
-		bonobo_ui_compat_get_container (uih), "/", NULL);
-
- 	bonobo_ui_handler_unset_container (uih);
+	bonobo_ui_component_rm (uic, "/", NULL);
+ 	bonobo_ui_component_unset_container (uic);
 
 	mail_do_sync_folder (fb->folder);
 }
@@ -222,15 +222,15 @@ control_activate_cb (BonoboControl *control,
 		     gboolean activate, 
 		     gpointer user_data)
 {
-	BonoboUIHandler  *uih;
+	BonoboUIComponent *uic;
 
-	uih = bonobo_control_get_ui_handler (control);
-	g_assert (uih);
+	uic = bonobo_control_get_ui_component (control);
+	g_assert (uic != NULL);
 
 	if (activate)
-		control_activate (control, uih, user_data);
+		control_activate (control, uic, user_data);
 	else
-		control_deactivate (control, uih, user_data);
+		control_deactivate (control, uic, user_data);
 }
 
 static void
diff --git a/mail/subscribe-dialog.c b/mail/subscribe-dialog.c
index ef1daa72f6..1d037af1aa 100644
--- a/mail/subscribe-dialog.c
+++ b/mail/subscribe-dialog.c
@@ -74,34 +74,8 @@ typedef struct {
 
 static GtkObjectClass *subscribe_dialog_parent_class;
 
-static void subscribe_close (BonoboUIHandler *uih, void *user_data, const char *path);
-static void subscribe_select_all (BonoboUIHandler *uih, void *user_data, const char *path);
-static void subscribe_unselect_all (BonoboUIHandler *uih, void *user_data, const char *path);
-static void subscribe_folder (GtkWidget *widget, gpointer user_data);
-static void unsubscribe_folder (GtkWidget *widget, gpointer user_data);
-static void subscribe_refresh_list (GtkWidget *widget, gpointer user_data);
-static void subscribe_search (GtkWidget *widget, gpointer user_data);
-
-static BonoboUIVerb verbs [] = {
-	/* File Menu */
-	BONOBO_UI_VERB ("FileCloseWin", subscribe_close),
-
-	/* Edit Menu */
-	BONOBO_UI_VERB ("EditSelectAll", subscribe_select_all),
-	BONOBO_UI_VERB ("EditUnSelectAll", subscribe_unselect_all),
-	
-	/* Folder Menu / Toolbar */
-	BONOBO_UI_VERB ("SubscribeFolder", subscribe_folder),
-	BONOBO_UI_VERB ("UnsubscribeFolder", unsubscribe_folder),
-
-	/* Toolbar Specific */
-	BONOBO_UI_VERB ("RefreshList", subscribe_refresh_list),
-
-	BONOBO_UI_VERB_END
-};
-
 static void
-set_pixmap (Bonobo_UIContainer container,
+set_pixmap (BonoboUIComponent *component,
 	    const char        *xml_path,
 	    const char        *icon)
 {
@@ -113,7 +87,7 @@ set_pixmap (Bonobo_UIContainer container,
 	pixbuf = gdk_pixbuf_new_from_file (path);
 	g_return_if_fail (pixbuf != NULL);
 
-	bonobo_ui_util_set_pixbuf (container, xml_path, pixbuf);
+	bonobo_ui_util_set_pixbuf (component, xml_path, pixbuf);
 
 	gdk_pixbuf_unref (pixbuf);
 
@@ -121,11 +95,11 @@ set_pixmap (Bonobo_UIContainer container,
 }
 
 static void
-update_pixmaps (Bonobo_UIContainer container)
+update_pixmaps (BonoboUIComponent *component)
 {
-	set_pixmap (container, "/Toolbar/SubscribeFolder", "fetch-mail.png"); /* XXX */
-	set_pixmap (container, "/Toolbar/UnsubscribeFolder", "compose-message.png"); /* XXX */
-	set_pixmap (container, "/Toolbar/RefreshList", "forward.png"); /* XXX */
+	set_pixmap (component, "/Toolbar/SubscribeFolder", "fetch-mail.png"); /* XXX */
+	set_pixmap (component, "/Toolbar/UnsubscribeFolder", "compose-message.png"); /* XXX */
+	set_pixmap (component, "/Toolbar/RefreshList", "forward.png"); /* XXX */
 }
 
 static GtkWidget*
@@ -154,7 +128,7 @@ make_folder_search_widget (GtkSignalFunc start_search_func,
 
 
 static void
-subscribe_close (BonoboUIHandler *uih,
+subscribe_close (BonoboUIComponent *uic,
 		 void *user_data, const char *path)
 {
 	SubscribeDialog *sc = (SubscribeDialog*)user_data;
@@ -163,13 +137,13 @@ subscribe_close (BonoboUIHandler *uih,
 }
 
 static void
-subscribe_select_all (BonoboUIHandler *uih,
+subscribe_select_all (BonoboUIComponent *uic,
 		      void *user_data, const char *path)
 {
 }
 
 static void
-subscribe_unselect_all (BonoboUIHandler *uih,
+subscribe_unselect_all (BonoboUIComponent *uic,
 			void *user_data, const char *path)
 {
 }
@@ -391,6 +365,24 @@ storage_selected_cb (EvolutionStorageSetViewListener *listener,
 "          earth. Their tags shall blink until the end of days. \n" \
 "                 from The Book of Mozilla, 12:10"
 
+static BonoboUIVerb verbs [] = {
+	/* File Menu */
+	BONOBO_UI_UNSAFE_VERB ("FileCloseWin", subscribe_close),
+
+	/* Edit Menu */
+	BONOBO_UI_UNSAFE_VERB ("EditSelectAll", subscribe_select_all),
+	BONOBO_UI_UNSAFE_VERB ("EditUnSelectAll", subscribe_unselect_all),
+	
+	/* Folder Menu / Toolbar */
+	BONOBO_UI_UNSAFE_VERB ("SubscribeFolder", subscribe_folder),
+	BONOBO_UI_UNSAFE_VERB ("UnsubscribeFolder", unsubscribe_folder),
+
+	/* Toolbar Specific */
+	BONOBO_UI_UNSAFE_VERB ("RefreshList", subscribe_refresh_list),
+
+	BONOBO_UI_VERB_END
+};
+
 static void
 subscribe_dialog_gui_init (SubscribeDialog *sc)
 {
@@ -399,7 +391,7 @@ subscribe_dialog_gui_init (SubscribeDialog *sc)
 	ETableHeader *e_table_header;
 	GdkPixbuf *toggles[2];
 	BonoboUIComponent *component;
-	Bonobo_UIContainer container;
+	BonoboUIContainer *container;
 	GtkWidget         *folder_search_widget, *vbox, *storage_set_title_bar;
 	BonoboControl     *search_control;
 	CORBA_Environment ev;
@@ -410,31 +402,26 @@ subscribe_dialog_gui_init (SubscribeDialog *sc)
 	sc->app = bonobo_win_new ("subscribe-dialog", "Manage Subscriptions");
 
 	/* Build the menu and toolbar */
-	sc->uih = bonobo_ui_handler_new ();
-	if (!sc->uih) {
-		g_message ("subscribe_dialog_gui_init(): eeeeek, could not create the UI handler!");
-		return;
-	}
-
-	bonobo_ui_handler_set_app (sc->uih, BONOBO_WIN (sc->app));
+	container = bonobo_ui_container_new ();
+	bonobo_ui_container_set_win (container, BONOBO_WIN (sc->app));
 
 	/* set up the bonobo stuff */
-	component = bonobo_ui_compat_get_component (sc->uih);
-	container = bonobo_ui_compat_get_container (sc->uih);
+	component = bonobo_ui_component_new_default ();
+	bonobo_ui_component_set_container (
+		component, bonobo_object_corba_objref (BONOBO_OBJECT (container)));
 	
 	bonobo_ui_component_add_verb_list_with_data (
 		component, verbs, sc);
 
-	bonobo_ui_container_freeze (container, NULL);
+	bonobo_ui_component_freeze (component, NULL);
 
-	bonobo_ui_util_set_ui (component, container,
-			       EVOLUTION_DATADIR,
+	bonobo_ui_util_set_ui (component, EVOLUTION_DATADIR,
 			       "evolution-subscribe.xml",
 			       "evolution-subscribe");
 
-	update_pixmaps (container);
+	update_pixmaps (component);
 
-	bonobo_ui_container_thaw (container, NULL);
+	bonobo_ui_component_thaw (component, NULL);
 
 	sc->storage_set_control = Evolution_Shell_create_storage_set_view (sc->shell, &ev);
 	sc->storage_set_view = Bonobo_Unknown_query_interface (sc->storage_set_control,
@@ -444,9 +431,10 @@ subscribe_dialog_gui_init (SubscribeDialog *sc)
 	/* we just want to show storages */
 	Evolution_StorageSetView__set_show_folders (sc->storage_set_view, FALSE, &ev);
 
-	sc->storage_set_view_widget = bonobo_widget_new_control_from_objref (sc->storage_set_control,
-									     container);
-
+	sc->storage_set_view_widget =
+		bonobo_widget_new_control_from_objref (
+			sc->storage_set_control,
+			bonobo_object_corba_objref (BONOBO_OBJECT (container)));
 
 	/* we also want a listener so we can tell when storages are selected */
 	sc->listener = evolution_storage_set_view_listener_new ();
@@ -480,10 +468,9 @@ subscribe_dialog_gui_init (SubscribeDialog *sc)
 	gtk_widget_show_all (folder_search_widget);
 	search_control = bonobo_control_new (folder_search_widget);
 
-	bonobo_ui_container_object_set (container,
-					"/Toolbar/FolderSearch",
-					bonobo_object_corba_objref (BONOBO_OBJECT (search_control)),
-					NULL);
+	bonobo_ui_component_object_set (
+		component, "/Toolbar/FolderSearch",
+		bonobo_object_corba_objref (BONOBO_OBJECT (search_control)), NULL);
 					
 	/* set our our contents */
 	sc->description = html_new (TRUE);