From 4dec64f37372d00c85060c11837fa818d5dc7bcc Mon Sep 17 00:00:00 2001 From: Rodrigo Moya 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 * 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/cal-prefs-dialog.c | 3 +- calendar/gui/dialogs/cal-prefs-dialog.h | 4 +- calendar/gui/dialogs/cancel-comp.c | 1 - calendar/gui/dialogs/changed-comp.c | 1 - calendar/gui/dialogs/comp-editor-page.c | 63 +++++++++++++++----------------- calendar/gui/dialogs/comp-editor-util.c | 10 ++--- calendar/gui/dialogs/comp-editor.c | 26 ++++++------- calendar/gui/dialogs/comp-editor.h | 6 +-- calendar/gui/dialogs/event-page.h | 4 +- calendar/gui/dialogs/meeting-page.h | 4 +- calendar/gui/dialogs/recurrence-page.h | 4 +- calendar/gui/dialogs/schedule-page.h | 4 +- calendar/gui/dialogs/task-details-page.h | 4 +- calendar/gui/dialogs/task-page.h | 4 +- 14 files changed, 66 insertions(+), 72 deletions(-) (limited to 'calendar/gui/dialogs') diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c index 6f4378f7a8..bac958f259 100644 --- a/calendar/gui/dialogs/cal-prefs-dialog.c +++ b/calendar/gui/dialogs/cal-prefs-dialog.c @@ -37,6 +37,7 @@ #include "../calendar-commands.h" #include "../e-tasks.h" +#include #include #include #include @@ -134,7 +135,7 @@ cal_prefs_dialog_new (void) /* Load the content widgets */ - dialog_data->xml = glade_xml_new (EVOLUTION_GLADEDIR "/cal-prefs-dialog.glade", NULL); + dialog_data->xml = glade_xml_new (EVOLUTION_GLADEDIR "/cal-prefs-dialog.glade", NULL, NULL); if (!dialog_data->xml) { g_message ("cal_prefs_dialog_construct(): Could not load the Glade XML file!"); return NULL; diff --git a/calendar/gui/dialogs/cal-prefs-dialog.h b/calendar/gui/dialogs/cal-prefs-dialog.h index ce3f46736c..db6f5a75fa 100644 --- a/calendar/gui/dialogs/cal-prefs-dialog.h +++ b/calendar/gui/dialogs/cal-prefs-dialog.h @@ -32,8 +32,10 @@ #include "evolution-config-control.h" +G_BEGIN_DECLS + EvolutionConfigControl *cal_prefs_dialog_new (void); -END_GNOME_DECLS +G_END_DECLS #endif /* _CAL_PREFS_DIALOG_H_ */ diff --git a/calendar/gui/dialogs/cancel-comp.c b/calendar/gui/dialogs/cancel-comp.c index 9156877016..a0e84b4421 100644 --- a/calendar/gui/dialogs/cancel-comp.c +++ b/calendar/gui/dialogs/cancel-comp.c @@ -23,7 +23,6 @@ #endif #include -#include #include #include #include diff --git a/calendar/gui/dialogs/changed-comp.c b/calendar/gui/dialogs/changed-comp.c index 4282307859..7fa2c1d0be 100644 --- a/calendar/gui/dialogs/changed-comp.c +++ b/calendar/gui/dialogs/changed-comp.c @@ -23,7 +23,6 @@ #endif #include -#include #include #include #include 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 -#include #include #include #include @@ -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; 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 #include #include -#include #include -#include +#include #include #include -#include #include #include #include @@ -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); diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c index a1bf930579..123b08089b 100644 --- a/calendar/gui/dialogs/comp-editor.c +++ b/calendar/gui/dialogs/comp-editor.c @@ -28,12 +28,11 @@ #include #include #include -#include +#include #include #include #include #include -#include #include #include #include @@ -204,22 +203,23 @@ setup_widgets (CompEditor *editor) priv = editor->priv; /* Window and basic vbox */ - bonobo_window_construct (BONOBO_WINDOW (editor), - "event-editor", "iCalendar Editor"); + container = bonobo_ui_container_new (); + editor = (CompEditor *) bonobo_window_construct (BONOBO_WINDOW (editor), container, + "event-editor", "iCalendar Editor"); gtk_signal_connect (GTK_OBJECT (editor), "delete_event", GTK_SIGNAL_FUNC (delete_event_cb), editor); priv->uic = bonobo_ui_component_new_default (); - container = bonobo_ui_container_new (); - bonobo_ui_container_set_win (container, BONOBO_WINDOW (editor)); - bonobo_ui_component_set_container (priv->uic, BONOBO_OBJREF (container)); + bonobo_ui_component_set_container (priv->uic, + bonobo_object_corba_objref (BONOBO_OBJECT (container)), + NULL); bonobo_ui_engine_config_set_path (bonobo_window_get_ui_engine (BONOBO_WINDOW (editor)), "/evolution/UIConf/kvps"); bonobo_ui_component_add_verb_list_with_data (priv->uic, verbs, editor); bonobo_ui_util_set_ui (priv->uic, EVOLUTION_DATADIR, "evolution-comp-editor.xml", - "evolution-calendar"); + "evolution-calendar", NULL); e_pixmaps_update (priv->uic, pixmaps); vbox = gtk_vbox_new (FALSE, GNOME_PAD_SMALL); @@ -452,7 +452,7 @@ close_dialog (CompEditor *editor) priv = editor->priv; - gtk_object_destroy (GTK_OBJECT (editor)); + gtk_widget_destroy (GTK_WIDGET (editor)); } @@ -758,7 +758,7 @@ comp_editor_set_cal_client (CompEditor *editor, CalClient *client) g_return_if_fail (editor != NULL); g_return_if_fail (IS_COMP_EDITOR (editor)); - klass = COMP_EDITOR_CLASS (GTK_OBJECT (editor)->klass); + klass = COMP_EDITOR_CLASS (G_OBJECT_GET_CLASS (editor)); if (klass->set_cal_client) klass->set_cal_client (editor, client); @@ -996,7 +996,7 @@ comp_editor_edit_comp (CompEditor *editor, CalComponent *comp) g_return_if_fail (comp != NULL); g_return_if_fail (IS_CAL_COMPONENT (comp)); - klass = COMP_EDITOR_CLASS (GTK_OBJECT (editor)->klass); + klass = COMP_EDITOR_CLASS (G_OBJECT_GET_CLASS (editor)); if (klass->edit_comp) klass->edit_comp (editor, comp); @@ -1075,7 +1075,7 @@ comp_editor_send_comp (CompEditor *editor, CalComponentItipMethod method) g_return_val_if_fail (editor != NULL, FALSE); g_return_val_if_fail (IS_COMP_EDITOR (editor), FALSE); - klass = COMP_EDITOR_CLASS (GTK_OBJECT (editor)->klass); + klass = COMP_EDITOR_CLASS (G_OBJECT_GET_CLASS (editor)); if (klass->send_comp) return klass->send_comp (editor, method); @@ -1121,7 +1121,7 @@ comp_editor_merge_ui (CompEditor *editor, priv = editor->priv; - bonobo_ui_util_set_ui (priv->uic, EVOLUTION_DATADIR, filename, "evolution-calendar"); + bonobo_ui_util_set_ui (priv->uic, EVOLUTION_DATADIR, filename, "evolution-calendar", NULL); bonobo_ui_component_add_verb_list_with_data (priv->uic, verbs, editor); if (component_pixmaps != NULL) diff --git a/calendar/gui/dialogs/comp-editor.h b/calendar/gui/dialogs/comp-editor.h index 1f678c1950..879d8f7252 100644 --- a/calendar/gui/dialogs/comp-editor.h +++ b/calendar/gui/dialogs/comp-editor.h @@ -22,7 +22,7 @@ #define COMP_EDITOR_H #include -#include +#include #include #include #include "cal-client.h" @@ -30,7 +30,7 @@ #include "comp-editor-page.h" #include "evolution-shell-component-utils.h" -BEGIN_GNOME_DECLS +G_BEGIN_DECLS @@ -104,6 +104,6 @@ void comp_editor_focus (CompEditor *editor); -END_GNOME_DECLS +G_END_DECLS #endif diff --git a/calendar/gui/dialogs/event-page.h b/calendar/gui/dialogs/event-page.h index 3da59f4ada..885d98025b 100644 --- a/calendar/gui/dialogs/event-page.h +++ b/calendar/gui/dialogs/event-page.h @@ -26,7 +26,7 @@ #include "comp-editor-page.h" -BEGIN_GNOME_DECLS +G_BEGIN_DECLS @@ -56,6 +56,6 @@ EventPage *event_page_new (void); -END_GNOME_DECLS +G_END_DECLS #endif diff --git a/calendar/gui/dialogs/meeting-page.h b/calendar/gui/dialogs/meeting-page.h index be55aecf98..ac4b1115b7 100644 --- a/calendar/gui/dialogs/meeting-page.h +++ b/calendar/gui/dialogs/meeting-page.h @@ -27,7 +27,7 @@ #include "../e-meeting-model.h" #include "comp-editor-page.h" -BEGIN_GNOME_DECLS +G_BEGIN_DECLS @@ -61,6 +61,6 @@ CalComponent *meeting_page_get_cancel_comp (MeetingPage *mpage); -END_GNOME_DECLS +G_END_DECLS #endif diff --git a/calendar/gui/dialogs/recurrence-page.h b/calendar/gui/dialogs/recurrence-page.h index 29395f586f..f22fc42269 100644 --- a/calendar/gui/dialogs/recurrence-page.h +++ b/calendar/gui/dialogs/recurrence-page.h @@ -26,7 +26,7 @@ #include "comp-editor-page.h" -BEGIN_GNOME_DECLS +G_BEGIN_DECLS @@ -56,6 +56,6 @@ RecurrencePage *recurrence_page_new (void); -END_GNOME_DECLS +G_END_DECLS #endif diff --git a/calendar/gui/dialogs/schedule-page.h b/calendar/gui/dialogs/schedule-page.h index c485ba0f9e..b0a2d1c4d6 100644 --- a/calendar/gui/dialogs/schedule-page.h +++ b/calendar/gui/dialogs/schedule-page.h @@ -24,7 +24,7 @@ #include "../e-meeting-model.h" #include "comp-editor-page.h" -BEGIN_GNOME_DECLS +G_BEGIN_DECLS @@ -54,6 +54,6 @@ SchedulePage *schedule_page_new (EMeetingModel *emm); -END_GNOME_DECLS +G_END_DECLS #endif diff --git a/calendar/gui/dialogs/task-details-page.h b/calendar/gui/dialogs/task-details-page.h index 580388cb8d..f9db58557f 100644 --- a/calendar/gui/dialogs/task-details-page.h +++ b/calendar/gui/dialogs/task-details-page.h @@ -26,7 +26,7 @@ #include "comp-editor-page.h" -BEGIN_GNOME_DECLS +G_BEGIN_DECLS @@ -56,6 +56,6 @@ TaskDetailsPage *task_details_page_new (void); -END_GNOME_DECLS +G_END_DECLS #endif diff --git a/calendar/gui/dialogs/task-page.h b/calendar/gui/dialogs/task-page.h index 55c8ebc923..ba94400b3f 100644 --- a/calendar/gui/dialogs/task-page.h +++ b/calendar/gui/dialogs/task-page.h @@ -26,7 +26,7 @@ #include "comp-editor-page.h" -BEGIN_GNOME_DECLS +G_BEGIN_DECLS @@ -55,6 +55,6 @@ TaskPage *task_page_new (void); -END_GNOME_DECLS +G_END_DECLS #endif -- cgit v1.2.3