#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

1 files changed, 29 insertions, 34 deletions

diff --git a/calendar/gui/dialogs/comp-editor-page.c b/calendar/gui/dialogs/comp-editor-page.c
index d2de97586e..bd72e026f6 100644
--- a/calendar/gui/dialogs/comp-editor-page.c
+++ b/calendar/gui/dialogs/comp-editor-page.c
@@ -23,7 +23,6 @@
 #endif
 
 #include <gtk/gtksignal.h>
-#include <libgnome/gnome-defs.h>
 #include <libgnome/gnome-i18n.h>
 #include <libgnomeui/gnome-dialog.h>
 #include <libgnomeui/gnome-dialog-util.h>
@@ -49,7 +48,7 @@ enum {
 
 static guint comp_editor_page_signals[LAST_SIGNAL];
 
-#define CLASS(page) (COMP_EDITOR_PAGE_CLASS (GTK_OBJECT (page)->klass))
+#define CLASS(page) (COMP_EDITOR_PAGE_CLASS (G_OBJECT_GET_CLASS (page)))
 
 
 
@@ -97,44 +96,40 @@ comp_editor_page_class_init (CompEditorPageClass *class)
 	parent_class = gtk_type_class (GTK_TYPE_OBJECT);
 
 	comp_editor_page_signals[CHANGED] =
-		gtk_signal_new ("changed",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (CompEditorPageClass,
-						   changed),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
+		g_signal_new ("changed",
+			      G_TYPE_FROM_CLASS (class),
+			      G_SIGNAL_RUN_FIRST,
+			      G_STRUCT_OFFSET (CompEditorPageClass, changed),
+			      NULL, NULL,
+			      g_cclosure_marshal_VOID__VOID,
+			      G_TYPE_NONE, 0);
 
 	comp_editor_page_signals[NEEDS_SEND] =
-		gtk_signal_new ("needs_send",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (CompEditorPageClass,
-						   needs_send),
-				gtk_marshal_NONE__NONE,
-				GTK_TYPE_NONE, 0);
+		g_signal_new ("needs_send",
+			      G_TYPE_FROM_CLASS (class),
+			      G_SIGNAL_RUN_FIRST,
+			      G_STRUCT_OFFSET (CompEditorPageClass, needs_send),
+			      NULL, NULL,
+			      g_cclosure_marshal_VOID__VOID,
+			      G_TYPE_NONE, 0);
 
 	comp_editor_page_signals[SUMMARY_CHANGED] =
-		gtk_signal_new ("summary_changed",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (CompEditorPageClass,
-						   summary_changed),
-				gtk_marshal_NONE__POINTER,
-				GTK_TYPE_NONE, 1, GTK_TYPE_POINTER);
+		g_signal_new ("summary_changed",
+			      G_TYPE_FROM_CLASS (class),
+			      G_SIGNAL_RUN_FIRST,
+			      G_STRUCT_OFFSET (CompEditorPageClass, summary_changed),
+			      NULL, NULL,
+			      g_cclosure_marshal_VOID__POINTER,
+			      G_TYPE_NONE, 1, G_TYPE_POINTER);
 
 	comp_editor_page_signals[DATES_CHANGED] =
-		gtk_signal_new ("dates_changed",
-				GTK_RUN_FIRST,
-				object_class->type,
-				GTK_SIGNAL_OFFSET (CompEditorPageClass,
-						   dates_changed),
-				gtk_marshal_NONE__POINTER,
-				GTK_TYPE_NONE, 1, GTK_TYPE_POINTER);
-
-	gtk_object_class_add_signals (object_class,
-				      comp_editor_page_signals,
-				      LAST_SIGNAL);
+		g_signal_new ("dates_changed",
+			      G_TYPE_FROM_CLASS (class),
+			      G_SIGNAL_RUN_FIRST,
+			      G_STRUCT_OFFSET (CompEditorPageClass, dates_changed),
+			      NULL, NULL,
+			      g_cclosure_marshal_VOID__POINTER,
+			      G_TYPE_NONE, 1, G_TYPE_POINTER);
 
 	class->changed = NULL;
 	class->summary_changed = NULL;