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

2 files changed, 31 insertions, 38 deletions

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 78283abdd3..03636bdb0f 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,9 @@
+2000-10-05  Michael Meeks  <michael@helixcode.com>
+
+	* gui/calendar-commands.c: upd.
+	(calendar_control_activate): upd.
+	(calendar_control_deactivate): upd.
+
 2000-10-05  Damon Chaplin  <damon@helixcode.com>
 
 	* gui/e-day-view.c: 
diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c
index 0870f70be1..676d3944de 100644
--- a/calendar/gui/calendar-commands.c
+++ b/calendar/gui/calendar-commands.c
@@ -483,17 +483,17 @@ static GnomeUIInfo gnome_toolbar_view_buttons [] = {
 #endif
 
 BonoboUIVerb verbs [] = {
-	BONOBO_UI_VERB ("CalendarNew", new_calendar_cmd),
-	BONOBO_UI_VERB ("CalendarOpen", open_calendar_cmd),
-	BONOBO_UI_VERB ("CalendarSaveAs", save_as_calendar_cmd),
-	BONOBO_UI_VERB ("CalendarPrint", file_print_cb),
-	BONOBO_UI_VERB ("EditNewAppointment", new_appointment_cb),
-	BONOBO_UI_VERB ("CalendarPreferences", properties_cmd),
-
-	BONOBO_UI_VERB ("CalendarPrev", previous_clicked),
-	BONOBO_UI_VERB ("CalendarToday", today_clicked),
-	BONOBO_UI_VERB ("CalendarNext", next_clicked),
-	BONOBO_UI_VERB ("CalendarGoto", goto_clicked),
+	BONOBO_UI_UNSAFE_VERB ("CalendarNew", new_calendar_cmd),
+	BONOBO_UI_UNSAFE_VERB ("CalendarOpen", open_calendar_cmd),
+	BONOBO_UI_UNSAFE_VERB ("CalendarSaveAs", save_as_calendar_cmd),
+	BONOBO_UI_UNSAFE_VERB ("CalendarPrint", file_print_cb),
+	BONOBO_UI_UNSAFE_VERB ("EditNewAppointment", new_appointment_cb),
+	BONOBO_UI_UNSAFE_VERB ("CalendarPreferences", properties_cmd),
+
+	BONOBO_UI_UNSAFE_VERB ("CalendarPrev", previous_clicked),
+	BONOBO_UI_UNSAFE_VERB ("CalendarToday", today_clicked),
+	BONOBO_UI_UNSAFE_VERB ("CalendarNext", next_clicked),
+	BONOBO_UI_UNSAFE_VERB ("CalendarGoto", goto_clicked),
 
 	BONOBO_UI_VERB_END
 };
@@ -503,15 +503,15 @@ calendar_control_activate (BonoboControl *control,
 			   GnomeCalendar *cal)
 {
 	Bonobo_UIContainer remote_uih;
-	BonoboUIHandler *uih;
+	BonoboUIComponent *uic;
 
-	uih = bonobo_control_get_ui_handler (control);
-	g_assert (uih != NULL);
+	uic = bonobo_control_get_ui_component (control);
+	g_assert (uic != NULL);
 
 	g_print ("In calendar_control_activate\n");
 
-	remote_uih = bonobo_control_get_remote_ui_handler (control);
-	bonobo_ui_handler_set_container (uih, remote_uih);
+	remote_uih = bonobo_control_get_remote_ui_container (control);
+	bonobo_ui_component_set_container (uic, remote_uih);
 	bonobo_object_release_unref (remote_uih, NULL);
 
 #if 0
@@ -557,38 +557,25 @@ calendar_control_activate (BonoboControl *control,
 				    1, 1, 0);
 #endif
 	
-	{
-		Bonobo_UIContainer container;
-		BonoboUIComponent *component;
+	bonobo_ui_component_add_verb_list_with_data (
+		uic, verbs, cal);
 
-		component = bonobo_ui_compat_get_component (uih);
-		bonobo_ui_component_add_verb_list_with_data (
-			component, verbs, cal);
-
-		container = bonobo_ui_compat_get_container (uih);
-		g_return_if_fail (container != CORBA_OBJECT_NIL);
-
-		bonobo_ui_util_set_ui (component, container,
-				       EVOLUTION_DATADIR,
-				       "evolution-calendar.xml",
-				       "evolution-calendar");
-	}
+	bonobo_ui_util_set_ui (uic, EVOLUTION_DATADIR,
+			       "evolution-calendar.xml",
+			       "evolution-calendar");
 }
 
 
 void
 calendar_control_deactivate (BonoboControl *control)
 {
-	BonoboUIHandler *uih = bonobo_control_get_ui_handler (control);
-	g_assert (uih);
+	BonoboUIComponent *uic = bonobo_control_get_ui_component (control);
+	g_assert (uic != NULL);
 
 	g_print ("In calendar_control_deactivate\n");
 
-	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);
 }