From 4dec64f37372d00c85060c11837fa818d5dc7bcc Mon Sep 17 00:00:00 2001
From: Rodrigo Moya <rodrigo@ximian.com>
Date: Thu, 7 Nov 2002 02:00:56 +0000
Subject: #include gtkoptionmenu.h. (cal_prefs_dialog_new): adapted to changes
 in

2002-11-06  Rodrigo Moya <rodrigo@ximian.com>

	* gui/cal-prefs-dialog.c: #include gtkoptionmenu.h.
	(cal_prefs_dialog_new): adapted to changes in glade_xml_new.

	* gui/dialogs/event-page.h:
	* gui/dialogs/meeting-page.h:
	* gui/dialogs/recurrence-page.h:
	* gui/dialogs/schedule-page.h:
	* gui/dialogs/task-details-page.h:
	* gui/dialogs/task-page.h:
	* gui/cal-prefs-dialog.h: use correctly the macros.

	* gui/dialogs/cancel-comp.c:
	* gui/dialogs/changed-comp.c:
	* gui/dialogs/comp-editor-page.c:
	* gui/gnome-cal.h: removed non-existent headers.

	* gui/dialogs/comp-editor.c: remove non-existent headers.
	(close_dialog): gtk_widget_destroy the widget.
	(setup_widgets, comp_editor_merge_ui): use BonoboWindow correctly.
	(comp_editor_set_cal_client, comp_editor_send_comp,
	 comp_editor_edit_comp): use G_OBJECT_GET_CLASS for
	getting the class of an object.

	* gui/dialogs/comp-editor-page.c (comp_editor_page_class_init):
	use g_signal_* functions.

	* gui/dialogs/comp-editor-util.c: converted to BonoboActivation.

	* gui/dialogs/comp-editor.h: #include bonobo-window.h, not
	bonobo-win.h.

svn path=/trunk/; revision=18622
---
 calendar/gui/dialogs/comp-editor-util.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'calendar/gui/dialogs/comp-editor-util.c')

diff --git a/calendar/gui/dialogs/comp-editor-util.c b/calendar/gui/dialogs/comp-editor-util.c
index 4975a9d8f4..165cd43744 100644
--- a/calendar/gui/dialogs/comp-editor-util.c
+++ b/calendar/gui/dialogs/comp-editor-util.c
@@ -26,12 +26,10 @@
 #include <string.h>
 #include <ical.h>
 #include <glib.h>
-#include <libgnome/gnome-defs.h>
 #include <libgnome/gnome-i18n.h>
-#include <liboaf/liboaf.h>
+#include <bonobo-activation/bonobo-activation.h>
 #include <bonobo/bonobo-control.h>
 #include <bonobo/bonobo-widget.h>
-#include <gal/unicode/gunicode.h>
 #include <ebook/e-destination.h>
 #include <e-util/e-time-utils.h>
 #include <cal-util/timeutil.h>
@@ -283,11 +281,11 @@ comp_editor_create_contacts_component (void)
 	CORBA_Environment ev;
 
 	CORBA_exception_init (&ev);
-	corba_select_names = oaf_activate_from_id (SELECT_NAMES_OAFID, 0,
-						   NULL, &ev);
+	corba_select_names = bonobo_activation_activate_from_id (SELECT_NAMES_OAFID, 0,
+								 NULL, &ev);
 
 	/* OAF seems to be broken -- it can return a CORBA_OBJECT_NIL without
-           raising an exception in `ev'.  */
+           raising an exception in `ev'.  Is this true with BonoboActivation? */
 	if (ev._major != CORBA_NO_EXCEPTION
 	    || corba_select_names == CORBA_OBJECT_NIL) {
 		g_warning ("Cannot activate -- %s", SELECT_NAMES_OAFID);
-- 
cgit v1.2.3