diff options
29 files changed, 343 insertions, 337 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 373fb1f31f..f895ecf5a9 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,9 @@ +2002-11-27 Not Zed <NotZed@Ximian.com> + + * gui/itip-utils.[ch]: run fix.sh over this. + + * gui/dialogs/*.[ch]: run fix.sh over all of this. + 2002-11-26 Richard Li <Richard.Li@Sun.COM> * cal-client/cal-client.c (cal_client_construct): removed extra call diff --git a/calendar/gui/dialogs/alarm-options.c b/calendar/gui/dialogs/alarm-options.c index 8d53affacb..937d54eaca 100644 --- a/calendar/gui/dialogs/alarm-options.c +++ b/calendar/gui/dialogs/alarm-options.c @@ -185,19 +185,19 @@ init_widgets (Dialog *dialog) dialog->canceled = TRUE; - gtk_signal_connect (GTK_OBJECT (dialog->toplevel), "delete_event", - GTK_SIGNAL_FUNC (toplevel_delete_event_cb), dialog); + g_signal_connect((dialog->toplevel), "delete_event", + G_CALLBACK (toplevel_delete_event_cb), dialog); - gtk_signal_connect (GTK_OBJECT (dialog->button_ok), "clicked", - GTK_SIGNAL_FUNC (button_ok_clicked_cb), dialog); + g_signal_connect((dialog->button_ok), "clicked", + G_CALLBACK (button_ok_clicked_cb), dialog); - gtk_signal_connect (GTK_OBJECT (dialog->button_cancel), "clicked", - GTK_SIGNAL_FUNC (button_cancel_clicked_cb), dialog); + g_signal_connect((dialog->button_cancel), "clicked", + G_CALLBACK (button_cancel_clicked_cb), dialog); /* Alarm repeat */ - gtk_signal_connect (GTK_OBJECT (dialog->repeat_toggle), "toggled", - GTK_SIGNAL_FUNC (repeat_toggle_toggled_cb), dialog); + g_signal_connect((dialog->repeat_toggle), "toggled", + G_CALLBACK (repeat_toggle_toggled_cb), dialog); } /* Fills the audio alarm widgets with the values from the alarm component */ @@ -599,7 +599,7 @@ alarm_options_dialog_run (CalComponentAlarm *alarm) } if (!get_widgets (&dialog)) { - gtk_object_unref (GTK_OBJECT (dialog.xml)); + g_object_unref((dialog.xml)); return FALSE; } @@ -614,7 +614,7 @@ alarm_options_dialog_run (CalComponentAlarm *alarm) dialog_to_alarm (&dialog, alarm); gtk_widget_destroy (dialog.toplevel); - gtk_object_unref (GTK_OBJECT (dialog.xml)); + g_object_unref((dialog.xml)); return TRUE; } diff --git a/calendar/gui/dialogs/alarm-page.c b/calendar/gui/dialogs/alarm-page.c index f16c7198b9..64e79d8f9d 100644 --- a/calendar/gui/dialogs/alarm-page.c +++ b/calendar/gui/dialogs/alarm-page.c @@ -170,7 +170,7 @@ alarm_page_class_init (AlarmPageClass *class) editor_page_class = (CompEditorPageClass *) class; object_class = (GtkObjectClass *) class; - parent_class = gtk_type_class (TYPE_COMP_EDITOR_PAGE); + parent_class = g_type_class_ref(TYPE_COMP_EDITOR_PAGE); editor_page_class->get_widget = alarm_page_get_widget; editor_page_class->focus_main_widget = alarm_page_focus_main_widget; @@ -235,7 +235,7 @@ alarm_page_destroy (GtkObject *object) priv = apage->priv; if (priv->xml) { - gtk_object_unref (GTK_OBJECT (priv->xml)); + g_object_unref((priv->xml)); priv->xml = NULL; } @@ -823,22 +823,22 @@ init_widgets (AlarmPage *apage) priv = apage->priv; /* Reminder buttons */ - gtk_signal_connect (GTK_OBJECT (priv->add), "clicked", - GTK_SIGNAL_FUNC (add_clicked_cb), apage); - gtk_signal_connect (GTK_OBJECT (priv->delete), "clicked", - GTK_SIGNAL_FUNC (delete_clicked_cb), apage); + g_signal_connect((priv->add), "clicked", + G_CALLBACK (add_clicked_cb), apage); + g_signal_connect((priv->delete), "clicked", + G_CALLBACK (delete_clicked_cb), apage); /* Connect the default signal handler to use to make sure we notify * upstream of changes to the widget values. */ - gtk_signal_connect (GTK_OBJECT (priv->add), "clicked", - GTK_SIGNAL_FUNC (field_changed_cb), apage); - gtk_signal_connect (GTK_OBJECT (priv->delete), "clicked", - GTK_SIGNAL_FUNC (field_changed_cb), apage); + g_signal_connect((priv->add), "clicked", + G_CALLBACK (field_changed_cb), apage); + g_signal_connect((priv->delete), "clicked", + G_CALLBACK (field_changed_cb), apage); /* Options button */ - gtk_signal_connect (GTK_OBJECT (priv->button_options), "clicked", - GTK_SIGNAL_FUNC (button_options_clicked_cb), apage); + g_signal_connect((priv->button_options), "clicked", + G_CALLBACK (button_options_clicked_cb), apage); } @@ -893,7 +893,7 @@ alarm_page_new (void) apage = gtk_type_new (TYPE_ALARM_PAGE); if (!alarm_page_construct (apage)) { - gtk_object_unref (GTK_OBJECT (apage)); + g_object_unref((apage)); return NULL; } diff --git a/calendar/gui/dialogs/alarm-page.h b/calendar/gui/dialogs/alarm-page.h index e0d862ad41..4209ab013c 100644 --- a/calendar/gui/dialogs/alarm-page.h +++ b/calendar/gui/dialogs/alarm-page.h @@ -31,10 +31,10 @@ G_BEGIN_DECLS #define TYPE_ALARM_PAGE (alarm_page_get_type ()) -#define ALARM_PAGE(obj) (GTK_CHECK_CAST ((obj), TYPE_ALARM_PAGE, AlarmPage)) -#define ALARM_PAGE_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), TYPE_ALARM_PAGE, AlarmPageClass)) -#define IS_ALARM_PAGE(obj) (GTK_CHECK_TYPE ((obj), TYPE_ALARM_PAGE)) -#define IS_ALARM_PAGE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), TYPE_ALARM_PAGE)) +#define ALARM_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_ALARM_PAGE, AlarmPage)) +#define ALARM_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_ALARM_PAGE, AlarmPageClass)) +#define IS_ALARM_PAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_ALARM_PAGE)) +#define IS_ALARM_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), TYPE_ALARM_PAGE)) typedef struct _AlarmPagePrivate AlarmPagePrivate; diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c index 03065452c7..5682d0e028 100644 --- a/calendar/gui/dialogs/cal-prefs-dialog.c +++ b/calendar/gui/dialogs/cal-prefs-dialog.c @@ -156,10 +156,10 @@ cal_prefs_dialog_new (void) config_control = evolution_config_control_new (dialog_data->page); gtk_widget_unref (dialog_data->page); - gtk_signal_connect (GTK_OBJECT (config_control), "apply", - GTK_SIGNAL_FUNC (config_control_apply_callback), dialog_data); - gtk_signal_connect (GTK_OBJECT (config_control), "destroy", - GTK_SIGNAL_FUNC (config_control_destroy_callback), dialog_data); + g_signal_connect((config_control), "apply", + G_CALLBACK (config_control_apply_callback), dialog_data); + g_signal_connect((config_control), "destroy", + G_CALLBACK (config_control_destroy_callback), dialog_data); setup_changes (dialog_data, config_control); @@ -198,8 +198,8 @@ connect_changed (GtkWidget *widget, const char *signal_name, EvolutionConfigControl *config_control) { - gtk_signal_connect (GTK_OBJECT (widget), signal_name, - GTK_SIGNAL_FUNC (widget_changed_callback), config_control); + g_signal_connect((widget), signal_name, + G_CALLBACK (widget_changed_callback), config_control); } static void @@ -236,10 +236,10 @@ setup_changes (DialogData *dialog_data, connect_changed (GTK_OPTION_MENU (dialog_data->default_reminder_units)->menu, "selection_done", config_control); /* These use GnomeColorPicker so we have to use a different signal. */ - gtk_signal_connect (GTK_OBJECT (dialog_data->tasks_due_today_color), "color_set", - GTK_SIGNAL_FUNC (color_set_callback), config_control); - gtk_signal_connect (GTK_OBJECT (dialog_data->tasks_overdue_color), "color_set", - GTK_SIGNAL_FUNC (color_set_callback), config_control); + g_signal_connect((dialog_data->tasks_due_today_color), "color_set", + G_CALLBACK (color_set_callback), config_control); + g_signal_connect((dialog_data->tasks_overdue_color), "color_set", + G_CALLBACK (color_set_callback), config_control); } /* Gets the widgets from the XML file and returns if they are all available. @@ -323,7 +323,7 @@ config_control_destroy_callback (GtkObject *object, dialog_data = (DialogData *) data; - gtk_object_unref (GTK_OBJECT (dialog_data->xml)); + g_object_unref((dialog_data->xml)); g_free (dialog_data); } @@ -361,21 +361,21 @@ cal_prefs_dialog_create_time_edit (void) static void init_widgets (DialogData *dialog_data) { - gtk_signal_connect (GTK_OBJECT (dialog_data->use_24_hour), "toggled", - GTK_SIGNAL_FUNC (cal_prefs_dialog_use_24_hour_toggled), + g_signal_connect((dialog_data->use_24_hour), "toggled", + G_CALLBACK (cal_prefs_dialog_use_24_hour_toggled), dialog_data); - gtk_signal_connect (GTK_OBJECT (dialog_data->start_of_day), "changed", - GTK_SIGNAL_FUNC (cal_prefs_dialog_start_of_day_changed), + g_signal_connect((dialog_data->start_of_day), "changed", + G_CALLBACK (cal_prefs_dialog_start_of_day_changed), dialog_data); - gtk_signal_connect (GTK_OBJECT (dialog_data->end_of_day), "changed", - GTK_SIGNAL_FUNC (cal_prefs_dialog_end_of_day_changed), + g_signal_connect((dialog_data->end_of_day), "changed", + G_CALLBACK (cal_prefs_dialog_end_of_day_changed), dialog_data); - gtk_signal_connect (GTK_OBJECT (dialog_data->tasks_hide_completed_checkbutton), + g_signal_connect((dialog_data->tasks_hide_completed_checkbutton), "toggled", - GTK_SIGNAL_FUNC (cal_prefs_dialog_hide_completed_tasks_toggled), + G_CALLBACK (cal_prefs_dialog_hide_completed_tasks_toggled), dialog_data); } diff --git a/calendar/gui/dialogs/comp-editor-page.c b/calendar/gui/dialogs/comp-editor-page.c index bd72e026f6..957b1533d5 100644 --- a/calendar/gui/dialogs/comp-editor-page.c +++ b/calendar/gui/dialogs/comp-editor-page.c @@ -93,7 +93,7 @@ comp_editor_page_class_init (CompEditorPageClass *class) object_class = (GtkObjectClass *) class; - parent_class = gtk_type_class (GTK_TYPE_OBJECT); + parent_class = g_type_class_ref(GTK_TYPE_OBJECT); comp_editor_page_signals[CHANGED] = g_signal_new ("changed", @@ -166,7 +166,7 @@ comp_editor_page_destroy (GtkObject *object) page = COMP_EDITOR_PAGE (object); if (page->client) { - gtk_object_ref (GTK_OBJECT (page->client)); + g_object_ref((page->client)); page->client = NULL; } @@ -273,11 +273,11 @@ comp_editor_page_set_cal_client (CompEditorPage *page, CalClient *client) g_return_if_fail (IS_COMP_EDITOR_PAGE (page)); if (page->client) - gtk_object_unref (GTK_OBJECT (client)); + g_object_unref((client)); page->client = client; if (page->client) - gtk_object_ref (GTK_OBJECT (client)); + g_object_ref((client)); } /** diff --git a/calendar/gui/dialogs/comp-editor-page.h b/calendar/gui/dialogs/comp-editor-page.h index 305a97b513..e3d4535391 100644 --- a/calendar/gui/dialogs/comp-editor-page.h +++ b/calendar/gui/dialogs/comp-editor-page.h @@ -31,10 +31,10 @@ G_BEGIN_DECLS #define TYPE_COMP_EDITOR_PAGE (comp_editor_page_get_type ()) -#define COMP_EDITOR_PAGE(obj) (GTK_CHECK_CAST ((obj), TYPE_COMP_EDITOR_PAGE, CompEditorPage)) -#define COMP_EDITOR_PAGE_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), TYPE_COMP_EDITOR_PAGE, CompEditorPageClass)) -#define IS_COMP_EDITOR_PAGE(obj) (GTK_CHECK_TYPE ((obj), TYPE_COMP_EDITOR_PAGE)) -#define IS_COMP_EDITOR_PAGE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), TYPE_COMP_EDITOR_PAGE)) +#define COMP_EDITOR_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_COMP_EDITOR_PAGE, CompEditorPage)) +#define COMP_EDITOR_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_COMP_EDITOR_PAGE, CompEditorPageClass)) +#define IS_COMP_EDITOR_PAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_COMP_EDITOR_PAGE)) +#define IS_COMP_EDITOR_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), TYPE_COMP_EDITOR_PAGE)) typedef struct { CalComponentDateTime *start; diff --git a/calendar/gui/dialogs/comp-editor-util.c b/calendar/gui/dialogs/comp-editor-util.c index 90d0bc3496..4e68d52022 100644 --- a/calendar/gui/dialogs/comp-editor-util.c +++ b/calendar/gui/dialogs/comp-editor-util.c @@ -453,7 +453,7 @@ comp_editor_contacts_to_widget (GtkWidget *contacts_entry, /* We free all dest_array except the last NULL we added. */ for (i = 0; i < dest_array->len - 1; i++) { dest = g_ptr_array_index (dest_array, i); - gtk_object_unref (GTK_OBJECT (dest)); + g_object_unref((dest)); } g_ptr_array_free (dest_array, TRUE); } @@ -501,7 +501,7 @@ comp_editor_contacts_to_component (GtkWidget *contacts_entry, contact_list = g_slist_prepend (contact_list, t); - gtk_object_unref (GTK_OBJECT (contact_destv[i])); + g_object_unref((contact_destv[i])); } } g_free (contact_destv); diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c index 123b08089b..b2197dc5bc 100644 --- a/calendar/gui/dialogs/comp-editor.c +++ b/calendar/gui/dialogs/comp-editor.c @@ -182,7 +182,7 @@ comp_editor_class_init (CompEditorClass *klass) object_class = GTK_OBJECT_CLASS (klass); widget_class = GTK_WIDGET_CLASS (klass); - parent_class = gtk_type_class (BONOBO_TYPE_WINDOW); + parent_class = g_type_class_ref(BONOBO_TYPE_WINDOW); klass->set_cal_client = real_set_cal_client; klass->edit_comp = real_edit_comp; @@ -206,8 +206,8 @@ setup_widgets (CompEditor *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); + g_signal_connect((editor), "delete_event", + G_CALLBACK (delete_event_cb), editor); priv->uic = bonobo_ui_component_new_default (); bonobo_ui_component_set_container (priv->uic, @@ -286,10 +286,10 @@ comp_editor_destroy (GtkObject *object) since they have lots of signal handlers connected to the widgets with the pages as the data. */ for (l = priv->pages; l != NULL; l = l->next) - gtk_object_unref (GTK_OBJECT (l->data)); + g_object_unref((l->data)); if (priv->comp) { - gtk_object_unref (GTK_OBJECT (priv->comp)); + g_object_unref((priv->comp)); priv->comp = NULL; } @@ -316,7 +316,7 @@ save_comp (CompEditor *editor) clone = cal_component_clone (priv->comp); for (l = priv->pages; l != NULL; l = l->next) { if (!comp_editor_page_fill_component (l->data, clone)) { - gtk_object_unref (GTK_OBJECT (clone)); + g_object_unref((clone)); comp_editor_show_page (editor, COMP_EDITOR_PAGE (l->data)); return FALSE; } @@ -328,7 +328,7 @@ save_comp (CompEditor *editor) else cal_component_abort_sequence (clone); - gtk_object_unref (GTK_OBJECT (priv->comp)); + g_object_unref((priv->comp)); priv->comp = clone; priv->updating = TRUE; @@ -638,7 +638,7 @@ comp_editor_append_page (CompEditor *editor, priv = editor->priv; - gtk_object_ref (GTK_OBJECT (page)); + g_object_ref((page)); /* If we are editing something, fill the widgets with current info */ if (priv->comp != NULL) { @@ -646,7 +646,7 @@ comp_editor_append_page (CompEditor *editor, comp = comp_editor_get_current_comp (editor); comp_editor_page_fill_widgets (page, comp); - gtk_object_unref (GTK_OBJECT (comp)); + g_object_unref((comp)); } page_widget = comp_editor_page_get_widget (page); @@ -660,19 +660,19 @@ comp_editor_append_page (CompEditor *editor, gtk_notebook_append_page (priv->notebook, page_widget, label_widget); /* Listen for things happening on the page */ - gtk_signal_connect (GTK_OBJECT (page), "changed", - GTK_SIGNAL_FUNC (page_changed_cb), editor); - gtk_signal_connect (GTK_OBJECT (page), "summary_changed", - GTK_SIGNAL_FUNC (page_summary_changed_cb), editor); - gtk_signal_connect (GTK_OBJECT (page), "dates_changed", - GTK_SIGNAL_FUNC (page_dates_changed_cb), editor); + g_signal_connect((page), "changed", + G_CALLBACK (page_changed_cb), editor); + g_signal_connect((page), "summary_changed", + G_CALLBACK (page_summary_changed_cb), editor); + g_signal_connect((page), "dates_changed", + G_CALLBACK (page_dates_changed_cb), editor); /* Listen for when the page is mapped/unmapped so we can install/uninstall the appropriate GtkAccelGroup. */ - gtk_signal_connect (GTK_OBJECT (page_widget), "map", - GTK_SIGNAL_FUNC (page_mapped_cb), page); - gtk_signal_connect (GTK_OBJECT (page_widget), "unmap", - GTK_SIGNAL_FUNC (page_unmapped_cb), page); + g_signal_connect((page_widget), "map", + G_CALLBACK (page_mapped_cb), page); + g_signal_connect((page_widget), "unmap", + G_CALLBACK (page_unmapped_cb), page); /* The first page is the main page of the editor, so we ask it to focus * its main widget. @@ -714,7 +714,7 @@ comp_editor_remove_page (CompEditor *editor, CompEditorPage *page) gtk_notebook_remove_page (priv->notebook, page_num); priv->pages = g_list_remove (priv->pages, page); - gtk_object_unref (GTK_OBJECT (page)); + g_object_unref((page)); } /** @@ -900,13 +900,13 @@ real_set_cal_client (CompEditor *editor, CalClient *client) g_return_if_fail (IS_CAL_CLIENT (client)); g_return_if_fail (cal_client_get_load_state (client) == CAL_CLIENT_LOAD_LOADED); - gtk_object_ref (GTK_OBJECT (client)); + g_object_ref((client)); } if (priv->client) { gtk_signal_disconnect_by_data (GTK_OBJECT (priv->client), editor); - gtk_object_unref (GTK_OBJECT (priv->client)); + g_object_unref((priv->client)); } priv->client = client; @@ -915,11 +915,11 @@ real_set_cal_client (CompEditor *editor, CalClient *client) for (elem = priv->pages; elem; elem = elem->next) comp_editor_page_set_cal_client (elem->data, client); - gtk_signal_connect (GTK_OBJECT (priv->client), "obj_updated", - GTK_SIGNAL_FUNC (obj_updated_cb), editor); + g_signal_connect((priv->client), "obj_updated", + G_CALLBACK (obj_updated_cb), editor); - gtk_signal_connect (GTK_OBJECT (priv->client), "obj_removed", - GTK_SIGNAL_FUNC (obj_removed_cb), editor); + g_signal_connect((priv->client), "obj_removed", + G_CALLBACK (obj_removed_cb), editor); } static void @@ -933,7 +933,7 @@ real_edit_comp (CompEditor *editor, CalComponent *comp) priv = editor->priv; if (priv->comp) { - gtk_object_unref (GTK_OBJECT (priv->comp)); + g_object_unref((priv->comp)); priv->comp = NULL; } @@ -963,9 +963,9 @@ real_send_comp (CompEditor *editor, CalComponentItipMethod method) if (itip_send_comp (method, priv->comp, priv->client, NULL)) { tmp_comp = priv->comp; - gtk_object_ref (GTK_OBJECT (tmp_comp)); + g_object_ref((tmp_comp)); comp_editor_edit_comp (editor, tmp_comp); - gtk_object_unref (GTK_OBJECT (tmp_comp)); + g_object_unref((tmp_comp)); comp_editor_set_changed (editor, TRUE); save_comp (editor); @@ -1269,7 +1269,7 @@ print_cmd (GtkWidget *widget, gpointer data) comp = comp_editor_get_current_comp (editor); print_comp (comp, editor->priv->client, FALSE); - gtk_object_unref (GTK_OBJECT (comp)); + g_object_unref((comp)); } static void @@ -1282,7 +1282,7 @@ print_preview_cmd (GtkWidget *widget, gpointer data) comp = comp_editor_get_current_comp (editor); print_comp (comp, editor->priv->client, TRUE); - gtk_object_unref (GTK_OBJECT (comp)); + g_object_unref((comp)); } static void @@ -1318,7 +1318,7 @@ page_changed_cb (GtkObject *obj, gpointer data) priv->changed = TRUE; if (!priv->warned && priv->existing_org && !priv->user_org) { - e_notice (NULL, GNOME_MESSAGE_BOX_INFO, + e_notice (NULL, GTK_MESSAGE_INFO, _("Changes made to this item may be discarded if an update arrives via email")); priv->warned = TRUE; } @@ -1342,7 +1342,7 @@ page_summary_changed_cb (GtkObject *obj, const char *summary, gpointer data) priv->changed = TRUE; if (!priv->warned && priv->existing_org && !priv->user_org) { - e_notice (NULL, GNOME_MESSAGE_BOX_INFO, + e_notice (NULL, GTK_MESSAGE_INFO, _("Changes made to this item may be discarded if an update arrives via email")); priv->warned = TRUE; } @@ -1366,7 +1366,7 @@ page_dates_changed_cb (GtkObject *obj, priv->changed = TRUE; if (!priv->warned && priv->existing_org && !priv->user_org) { - e_notice (NULL, GNOME_MESSAGE_BOX_INFO, + e_notice (NULL, GTK_MESSAGE_INFO, _("Changes made to this item may be discarded if an update arrives via email")); priv->warned = TRUE; } @@ -1390,7 +1390,7 @@ obj_updated_cb (CalClient *client, const char *uid, gpointer data) status = cal_client_get_object (priv->client, uid, &comp); if (status == CAL_CLIENT_GET_SUCCESS) { comp_editor_edit_comp (editor, comp); - gtk_object_unref (GTK_OBJECT (comp)); + g_object_unref((comp)); } else { GtkWidget *dlg; diff --git a/calendar/gui/dialogs/comp-editor.h b/calendar/gui/dialogs/comp-editor.h index 879d8f7252..8ef14c8edb 100644 --- a/calendar/gui/dialogs/comp-editor.h +++ b/calendar/gui/dialogs/comp-editor.h @@ -35,10 +35,10 @@ G_BEGIN_DECLS #define TYPE_COMP_EDITOR (comp_editor_get_type ()) -#define COMP_EDITOR(obj) (GTK_CHECK_CAST ((obj), TYPE_COMP_EDITOR, CompEditor)) -#define COMP_EDITOR_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), TYPE_COMP_EDITOR, CompEditorClass)) -#define IS_COMP_EDITOR(obj) (GTK_CHECK_TYPE ((obj), TYPE_COMP_EDITOR)) -#define IS_COMP_EDITOR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), TYPE_COMP_EDITOR)) +#define COMP_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_COMP_EDITOR, CompEditor)) +#define COMP_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_COMP_EDITOR, CompEditorClass)) +#define IS_COMP_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_COMP_EDITOR)) +#define IS_COMP_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_COMP_EDITOR)) typedef struct _CompEditorPrivate CompEditorPrivate; diff --git a/calendar/gui/dialogs/e-delegate-dialog.c b/calendar/gui/dialogs/e-delegate-dialog.c index 5e890221e5..43aea1c0ba 100644 --- a/calendar/gui/dialogs/e-delegate-dialog.c +++ b/calendar/gui/dialogs/e-delegate-dialog.c @@ -97,7 +97,7 @@ e_delegate_dialog_class_init (EDelegateDialogClass *class) object_class = (GtkObjectClass *) class; - parent_class = gtk_type_class (GTK_TYPE_OBJECT); + parent_class = g_type_class_ref(GTK_TYPE_OBJECT); object_class->destroy = e_delegate_dialog_destroy; } @@ -208,16 +208,16 @@ e_delegate_dialog_construct (EDelegateDialog *edd, const char *name, const char str = e_destination_exportv(destv); bonobo_widget_set_property (BONOBO_WIDGET (priv->entry), "destinations", TC_CORBA_string, str, NULL); g_free(str); - gtk_object_unref (GTK_OBJECT (dest)); + g_object_unref((dest)); - gtk_signal_connect (GTK_OBJECT (priv->addressbook), "clicked", - GTK_SIGNAL_FUNC (addressbook_clicked_cb), edd); + g_signal_connect((priv->addressbook), "clicked", + G_CALLBACK (addressbook_clicked_cb), edd); return edd; error: - gtk_object_unref (GTK_OBJECT (edd)); + g_object_unref((edd)); return NULL; } diff --git a/calendar/gui/dialogs/e-delegate-dialog.h b/calendar/gui/dialogs/e-delegate-dialog.h index dc26327241..2acc853e0a 100644 --- a/calendar/gui/dialogs/e-delegate-dialog.h +++ b/calendar/gui/dialogs/e-delegate-dialog.h @@ -26,11 +26,11 @@ #define E_TYPE_DELEGATE_DIALOG (e_delegate_dialog_get_type ()) -#define E_DELEGATE_DIALOG(obj) (GTK_CHECK_CAST ((obj), E_TYPE_DELEGATE_DIALOG, EDelegateDialog)) -#define E_DELEGATE_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_DELEGATE_DIALOG, \ +#define E_DELEGATE_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_DELEGATE_DIALOG, EDelegateDialog)) +#define E_DELEGATE_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_DELEGATE_DIALOG, \ EDelegateDialogClass)) -#define E_IS_DELEGATE_DIALOG(obj) (GTK_CHECK_TYPE ((obj), E_TYPE_DELEGATE_DIALOG)) -#define E_IS_DELEGATE_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_DELEGATE_DIALOG)) +#define E_IS_DELEGATE_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_DELEGATE_DIALOG)) +#define E_IS_DELEGATE_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), E_TYPE_DELEGATE_DIALOG)) typedef struct _EDelegateDialog EDelegateDialog; diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c index 829bebbe1e..59d639f9b9 100644 --- a/calendar/gui/dialogs/event-editor.c +++ b/calendar/gui/dialogs/event-editor.c @@ -128,7 +128,7 @@ event_editor_class_init (EventEditorClass *klass) object_class = (GtkObjectClass *) klass; editor_class = (CompEditorClass *) klass; - parent_class = gtk_type_class (TYPE_COMP_EDITOR); + parent_class = g_type_class_ref(TYPE_COMP_EDITOR); editor_class->set_cal_client = event_editor_set_cal_client; editor_class->edit_comp = event_editor_edit_comp; @@ -182,12 +182,12 @@ init_widgets (EventEditor *ee) priv = ee->priv; - gtk_signal_connect (GTK_OBJECT (priv->model), "model_row_changed", - GTK_SIGNAL_FUNC (model_row_changed_cb), ee); - gtk_signal_connect (GTK_OBJECT (priv->model), "model_rows_inserted", - GTK_SIGNAL_FUNC (row_count_changed_cb), ee); - gtk_signal_connect (GTK_OBJECT (priv->model), "model_rows_deleted", - GTK_SIGNAL_FUNC (row_count_changed_cb), ee); + g_signal_connect((priv->model), "model_row_changed", + G_CALLBACK (model_row_changed_cb), ee); + g_signal_connect((priv->model), "model_rows_inserted", + G_CALLBACK (row_count_changed_cb), ee); + g_signal_connect((priv->model), "model_rows_deleted", + G_CALLBACK (row_count_changed_cb), ee); } /* Object initialization function for the event editor */ @@ -309,7 +309,7 @@ event_editor_edit_comp (CompEditor *editor, CalComponent *comp) ia = E_MEETING_ATTENDEE (e_meeting_attendee_new_from_cal_component_attendee (ca)); e_meeting_model_add_attendee (priv->model, ia); - gtk_object_unref (GTK_OBJECT (ia)); + g_object_unref((ia)); } if (organizer.value != NULL) { @@ -363,7 +363,7 @@ event_editor_send_comp (CompEditor *editor, CalComponentItipMethod method) client = e_meeting_model_get_cal_client (priv->model); result = itip_send_comp (CAL_COMPONENT_METHOD_CANCEL, comp, client, NULL); - gtk_object_unref (GTK_OBJECT (comp)); + g_object_unref((comp)); if (!result) return FALSE; @@ -389,14 +389,14 @@ event_editor_destroy (GtkObject *object) ee = EVENT_EDITOR (object); priv = ee->priv; - gtk_object_unref (GTK_OBJECT (priv->event_page)); - gtk_object_unref (GTK_OBJECT (priv->alarm_page)); - gtk_object_unref (GTK_OBJECT (priv->recur_page)); - gtk_object_unref (GTK_OBJECT (priv->meet_page)); - gtk_object_unref (GTK_OBJECT (priv->sched_page)); + g_object_unref((priv->event_page)); + g_object_unref((priv->alarm_page)); + g_object_unref((priv->recur_page)); + g_object_unref((priv->meet_page)); + g_object_unref((priv->sched_page)); gtk_object_destroy (GTK_OBJECT (priv->model)); - gtk_object_unref (GTK_OBJECT (priv->model)); + g_object_unref((priv->model)); if (GTK_OBJECT_CLASS (parent_class)->destroy) (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); diff --git a/calendar/gui/dialogs/event-editor.h b/calendar/gui/dialogs/event-editor.h index 7bb335de96..e0ce5043d8 100644 --- a/calendar/gui/dialogs/event-editor.h +++ b/calendar/gui/dialogs/event-editor.h @@ -30,10 +30,10 @@ #define TYPE_EVENT_EDITOR (event_editor_get_type ()) -#define EVENT_EDITOR(obj) (GTK_CHECK_CAST ((obj), TYPE_EVENT_EDITOR, EventEditor)) -#define EVENT_EDITOR_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), TYPE_EVENT_EDITOR, EventEditorClass)) -#define IS_EVENT_EDITOR(obj) (GTK_CHECK_TYPE ((obj), TYPE_EVENT_EDITOR)) -#define IS_EVENT_EDITOR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), TYPE_EVENT_EDITOR)) +#define EVENT_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_EVENT_EDITOR, EventEditor)) +#define EVENT_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_EVENT_EDITOR, EventEditorClass)) +#define IS_EVENT_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_EVENT_EDITOR)) +#define IS_EVENT_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_EVENT_EDITOR)) typedef struct _EventEditor EventEditor; typedef struct _EventEditorClass EventEditorClass; diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c index 9ca2d03b2c..060912c235 100644 --- a/calendar/gui/dialogs/event-page.c +++ b/calendar/gui/dialogs/event-page.c @@ -148,7 +148,7 @@ event_page_class_init (EventPageClass *class) editor_page_class = (CompEditorPageClass *) class; object_class = (GtkObjectClass *) class; - parent_class = gtk_type_class (TYPE_COMP_EDITOR_PAGE); + parent_class = g_type_class_ref(TYPE_COMP_EDITOR_PAGE); editor_page_class->get_widget = event_page_get_widget; editor_page_class->focus_main_widget = event_page_focus_main_widget; @@ -219,7 +219,7 @@ event_page_destroy (GtkObject *object) } if (priv->xml) { - gtk_object_unref (GTK_OBJECT (priv->xml)); + g_object_unref((priv->xml)); priv->xml = NULL; } @@ -1290,8 +1290,8 @@ init_widgets (EventPage *epage) epage, NULL); /* Summary */ - gtk_signal_connect (GTK_OBJECT (priv->summary), "changed", - GTK_SIGNAL_FUNC (summary_changed_cb), epage); + g_signal_connect((priv->summary), "changed", + G_CALLBACK (summary_changed_cb), epage); /* Description - turn on word wrap. */ #if 0 @@ -1299,64 +1299,64 @@ init_widgets (EventPage *epage) #endif /* Start and end times */ - gtk_signal_connect (GTK_OBJECT (priv->start_time), "changed", - GTK_SIGNAL_FUNC (date_changed_cb), epage); - gtk_signal_connect (GTK_OBJECT (priv->end_time), "changed", - GTK_SIGNAL_FUNC (date_changed_cb), epage); + g_signal_connect((priv->start_time), "changed", + G_CALLBACK (date_changed_cb), epage); + g_signal_connect((priv->end_time), "changed", + G_CALLBACK (date_changed_cb), epage); - gtk_signal_connect (GTK_OBJECT (priv->start_timezone), "changed", - GTK_SIGNAL_FUNC (start_timezone_changed_cb), epage); - gtk_signal_connect (GTK_OBJECT (priv->end_timezone), "changed", - GTK_SIGNAL_FUNC (end_timezone_changed_cb), epage); + g_signal_connect((priv->start_timezone), "changed", + G_CALLBACK (start_timezone_changed_cb), epage); + g_signal_connect((priv->end_timezone), "changed", + G_CALLBACK (end_timezone_changed_cb), epage); - gtk_signal_connect (GTK_OBJECT (priv->all_day_event), "toggled", - GTK_SIGNAL_FUNC (all_day_event_toggled_cb), epage); + g_signal_connect((priv->all_day_event), "toggled", + G_CALLBACK (all_day_event_toggled_cb), epage); /* Contacts button */ - gtk_signal_connect (GTK_OBJECT (priv->contacts_btn), "clicked", - GTK_SIGNAL_FUNC (contacts_clicked_cb), epage); + g_signal_connect((priv->contacts_btn), "clicked", + G_CALLBACK (contacts_clicked_cb), epage); /* Categories button */ - gtk_signal_connect (GTK_OBJECT (priv->categories_btn), "clicked", - GTK_SIGNAL_FUNC (categories_clicked_cb), epage); + g_signal_connect((priv->categories_btn), "clicked", + G_CALLBACK (categories_clicked_cb), epage); /* Connect the default signal handler to use to make sure we notify * upstream of changes to the widget values. */ - gtk_signal_connect (GTK_OBJECT (priv->summary), "changed", - GTK_SIGNAL_FUNC (field_changed_cb), epage); - gtk_signal_connect (GTK_OBJECT (priv->location), "changed", - GTK_SIGNAL_FUNC (field_changed_cb), epage); - gtk_signal_connect (GTK_OBJECT (priv->start_time), "changed", - GTK_SIGNAL_FUNC (field_changed_cb), epage); - gtk_signal_connect (GTK_OBJECT (priv->end_time), "changed", - GTK_SIGNAL_FUNC (field_changed_cb), epage); - gtk_signal_connect (GTK_OBJECT (priv->start_timezone), "changed", - GTK_SIGNAL_FUNC (field_changed_cb), epage); - gtk_signal_connect (GTK_OBJECT (priv->end_timezone), "changed", - GTK_SIGNAL_FUNC (field_changed_cb), epage); - gtk_signal_connect (GTK_OBJECT (priv->all_day_event), "toggled", - GTK_SIGNAL_FUNC (field_changed_cb), epage); - gtk_signal_connect (GTK_OBJECT (priv->description), "changed", - GTK_SIGNAL_FUNC (field_changed_cb), epage); - gtk_signal_connect (GTK_OBJECT (priv->classification_public), - "toggled", GTK_SIGNAL_FUNC (field_changed_cb), + g_signal_connect((priv->summary), "changed", + G_CALLBACK (field_changed_cb), epage); + g_signal_connect((priv->location), "changed", + G_CALLBACK (field_changed_cb), epage); + g_signal_connect((priv->start_time), "changed", + G_CALLBACK (field_changed_cb), epage); + g_signal_connect((priv->end_time), "changed", + G_CALLBACK (field_changed_cb), epage); + g_signal_connect((priv->start_timezone), "changed", + G_CALLBACK (field_changed_cb), epage); + g_signal_connect((priv->end_timezone), "changed", + G_CALLBACK (field_changed_cb), epage); + g_signal_connect((priv->all_day_event), "toggled", + G_CALLBACK (field_changed_cb), epage); + g_signal_connect((priv->description), "changed", + G_CALLBACK (field_changed_cb), epage); + g_signal_connect((priv->classification_public), + "toggled", G_CALLBACK (field_changed_cb), epage); - gtk_signal_connect (GTK_OBJECT (priv->classification_private), - "toggled", GTK_SIGNAL_FUNC (field_changed_cb), + g_signal_connect((priv->classification_private), + "toggled", G_CALLBACK (field_changed_cb), epage); - gtk_signal_connect (GTK_OBJECT (priv->classification_confidential), - "toggled", GTK_SIGNAL_FUNC (field_changed_cb), + g_signal_connect((priv->classification_confidential), + "toggled", G_CALLBACK (field_changed_cb), epage); - gtk_signal_connect (GTK_OBJECT (priv->show_time_as_free), - "toggled", GTK_SIGNAL_FUNC (field_changed_cb), + g_signal_connect((priv->show_time_as_free), + "toggled", G_CALLBACK (field_changed_cb), epage); - gtk_signal_connect (GTK_OBJECT (priv->show_time_as_busy), - "toggled", GTK_SIGNAL_FUNC (field_changed_cb), + g_signal_connect((priv->show_time_as_busy), + "toggled", G_CALLBACK (field_changed_cb), epage); - gtk_signal_connect (GTK_OBJECT (priv->categories), "changed", - GTK_SIGNAL_FUNC (field_changed_cb), epage); + g_signal_connect((priv->categories), "changed", + G_CALLBACK (field_changed_cb), epage); /* Create the contacts entry, a corba control from the address book. */ priv->corba_select_names = comp_editor_create_contacts_component (); @@ -1435,7 +1435,7 @@ event_page_new (void) epage = gtk_type_new (TYPE_EVENT_PAGE); if (!event_page_construct (epage)) { - gtk_object_unref (GTK_OBJECT (epage)); + g_object_unref((epage)); return NULL; } diff --git a/calendar/gui/dialogs/event-page.h b/calendar/gui/dialogs/event-page.h index 885d98025b..a21f084e01 100644 --- a/calendar/gui/dialogs/event-page.h +++ b/calendar/gui/dialogs/event-page.h @@ -31,10 +31,10 @@ G_BEGIN_DECLS #define TYPE_EVENT_PAGE (event_page_get_type ()) -#define EVENT_PAGE(obj) (GTK_CHECK_CAST ((obj), TYPE_EVENT_PAGE, EventPage)) -#define EVENT_PAGE_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), TYPE_EVENT_PAGE, EventPageClass)) -#define IS_EVENT_PAGE(obj) (GTK_CHECK_TYPE ((obj), TYPE_EVENT_PAGE)) -#define IS_EVENT_PAGE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), TYPE_EVENT_PAGE)) +#define EVENT_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_EVENT_PAGE, EventPage)) +#define EVENT_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_EVENT_PAGE, EventPageClass)) +#define IS_EVENT_PAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_EVENT_PAGE)) +#define IS_EVENT_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), TYPE_EVENT_PAGE)) typedef struct _EventPagePrivate EventPagePrivate; diff --git a/calendar/gui/dialogs/meeting-page.c b/calendar/gui/dialogs/meeting-page.c index ec5823f0e5..e97386ae62 100644 --- a/calendar/gui/dialogs/meeting-page.c +++ b/calendar/gui/dialogs/meeting-page.c @@ -163,7 +163,7 @@ meeting_page_class_init (MeetingPageClass *class) editor_page_class = (CompEditorPageClass *) class; object_class = (GtkObjectClass *) class; - parent_class = gtk_type_class (TYPE_COMP_EDITOR_PAGE); + parent_class = g_type_class_ref(TYPE_COMP_EDITOR_PAGE); editor_page_class->get_widget = meeting_page_get_widget; editor_page_class->focus_main_widget = meeting_page_focus_main_widget; @@ -230,7 +230,7 @@ cleanup_attendees (GPtrArray *attendees) int i; for (i = 0; i < attendees->len; i++) - gtk_object_unref (GTK_OBJECT (g_ptr_array_index (attendees, i))); + g_object_unref((g_ptr_array_index (attendees, i))); } /* Destroy handler for the task page */ @@ -247,17 +247,17 @@ meeting_page_destroy (GtkObject *object) priv = mpage->priv; if (priv->comp != NULL) - gtk_object_unref (GTK_OBJECT (priv->comp)); + g_object_unref((priv->comp)); cleanup_attendees (priv->deleted_attendees); g_ptr_array_free (priv->deleted_attendees, FALSE); itip_addresses_free (priv->addresses); - gtk_object_unref (GTK_OBJECT (priv->model)); + g_object_unref((priv->model)); if (priv->xml) { - gtk_object_unref (GTK_OBJECT (priv->xml)); + g_object_unref((priv->xml)); priv->xml = NULL; } @@ -328,7 +328,7 @@ meeting_page_fill_widgets (CompEditorPage *page, CalComponent *comp) /* Clean out old data */ if (priv->comp != NULL) - gtk_object_unref (GTK_OBJECT (priv->comp)); + g_object_unref((priv->comp)); priv->comp = NULL; cleanup_attendees (priv->deleted_attendees); @@ -409,7 +409,7 @@ meeting_page_fill_component (CompEditorPage *page, CalComponent *comp) /* Sanity Check */ if (addr == NULL || strlen (addr) == 0) { - e_notice (NULL, GNOME_MESSAGE_BOX_ERROR, + e_notice (NULL, GTK_MESSAGE_ERROR, _("An organizer is required.")); g_free (addr); g_free (cn); @@ -433,7 +433,7 @@ meeting_page_fill_component (CompEditorPage *page, CalComponent *comp) } if (e_meeting_model_count_actual_attendees (priv->model) < 1) { - e_notice (NULL, GNOME_MESSAGE_BOX_ERROR, + e_notice (NULL, GTK_MESSAGE_ERROR, _("At least one attendee is required.")); return FALSE; } @@ -551,15 +551,15 @@ init_widgets (MeetingPage *mpage) priv = mpage->priv; /* Organizer */ - gtk_signal_connect (GTK_OBJECT (GTK_COMBO (priv->organizer)->entry), "changed", - GTK_SIGNAL_FUNC (field_changed_cb), mpage); + g_signal_connect((GTK_COMBO (priv->organizer)->entry), "changed", + G_CALLBACK (field_changed_cb), mpage); - gtk_signal_connect (GTK_OBJECT (priv->existing_organizer_btn), "clicked", - GTK_SIGNAL_FUNC (change_clicked_cb), mpage); + g_signal_connect((priv->existing_organizer_btn), "clicked", + G_CALLBACK (change_clicked_cb), mpage); /* Invite button */ - gtk_signal_connect (GTK_OBJECT (priv->invite), "clicked", - GTK_SIGNAL_FUNC (invite_cb), mpage); + g_signal_connect((priv->invite), "clicked", + G_CALLBACK (invite_cb), mpage); } #if 0 @@ -589,7 +589,7 @@ popup_delegate_cb (GtkWidget *widget, gpointer data) /* Make sure we can add the new delegatee person */ if (e_meeting_model_find_attendee (priv->model, address, NULL) != NULL) { - e_notice (NULL, GNOME_MESSAGE_BOX_ERROR, + e_notice (NULL, GTK_MESSAGE_ERROR, _("That person is already attending the meeting!")); goto cleanup; } @@ -600,7 +600,7 @@ popup_delegate_cb (GtkWidget *widget, gpointer data) ib = e_meeting_model_find_attendee (priv->model, itip_strip_mailto (e_meeting_attendee_get_delto (ia)), NULL); if (ib != NULL) { - gtk_object_ref (GTK_OBJECT (ib)); + g_object_ref((ib)); g_ptr_array_add (priv->deleted_attendees, ib); e_meeting_model_remove_attendee (priv->model, ib); @@ -619,7 +619,7 @@ popup_delegate_cb (GtkWidget *widget, gpointer data) cleanup: g_free (name); g_free (address); - gtk_object_unref (GTK_OBJECT (edd)); + g_object_unref((edd)); } #endif @@ -648,7 +648,7 @@ popup_delete_cb (GtkWidget *widget, gpointer data) while (ia != NULL) { EMeetingAttendee *ib = NULL; - gtk_object_ref (GTK_OBJECT (ia)); + g_object_ref((ia)); g_ptr_array_add (priv->deleted_attendees, ia); e_meeting_model_remove_attendee (priv->model, ia); @@ -665,12 +665,12 @@ enum { static EPopupMenu context_menu[] = { #if 0 - E_POPUP_ITEM (N_("_Delegate To..."), GTK_SIGNAL_FUNC (popup_delegate_cb), CAN_DELEGATE), + E_POPUP_ITEM (N_("_Delegate To..."), G_CALLBACK (popup_delegate_cb), CAN_DELEGATE), E_POPUP_SEPARATOR, #endif - E_POPUP_ITEM (N_("_Delete"), GTK_SIGNAL_FUNC (popup_delete_cb), CAN_DELETE), + E_POPUP_ITEM (N_("_Delete"), G_CALLBACK (popup_delete_cb), CAN_DELETE), E_POPUP_TERMINATOR }; @@ -780,7 +780,7 @@ meeting_page_construct (MeetingPage *mpage, EMeetingModel *emm, } /* The etable displaying attendees and their status */ - gtk_object_ref (GTK_OBJECT (emm)); + g_object_ref((emm)); priv->model = emm; filename = g_strdup_printf ("%s/config/et-header-meeting-page", evolution_dir); @@ -790,11 +790,11 @@ meeting_page_construct (MeetingPage *mpage, EMeetingModel *emm, g_free (filename); real_table = e_table_scrolled_get_table (priv->etable); - gtk_signal_connect (GTK_OBJECT (real_table), - "right_click", GTK_SIGNAL_FUNC (right_click_cb), mpage); + g_signal_connect((real_table), + "right_click", G_CALLBACK (right_click_cb), mpage); - gtk_signal_connect (GTK_OBJECT (real_table->table_canvas), "focus_out_event", - GTK_SIGNAL_FUNC (table_canvas_focus_out_cb), mpage); + g_signal_connect((real_table->table_canvas), "focus_out_event", + G_CALLBACK (table_canvas_focus_out_cb), mpage); gtk_widget_show (GTK_WIDGET (priv->etable)); gtk_box_pack_start (GTK_BOX (priv->main), GTK_WIDGET (priv->etable), TRUE, TRUE, 2); @@ -820,7 +820,7 @@ meeting_page_new (EMeetingModel *emm, CalClient *client) mpage = gtk_type_new (TYPE_MEETING_PAGE); if (!meeting_page_construct (mpage, emm, client)) { - gtk_object_unref (GTK_OBJECT (mpage)); + g_object_unref((mpage)); return NULL; } diff --git a/calendar/gui/dialogs/meeting-page.h b/calendar/gui/dialogs/meeting-page.h index ac4b1115b7..80abae58da 100644 --- a/calendar/gui/dialogs/meeting-page.h +++ b/calendar/gui/dialogs/meeting-page.h @@ -32,10 +32,10 @@ G_BEGIN_DECLS #define TYPE_MEETING_PAGE (meeting_page_get_type ()) -#define MEETING_PAGE(obj) (GTK_CHECK_CAST ((obj), TYPE_MEETING_PAGE, MeetingPage)) -#define MEETING_PAGE_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), TYPE_MEETING_PAGE, MeetingPageClass)) -#define IS_MEETING_PAGE(obj) (GTK_CHECK_TYPE ((obj), TYPE_MEETING_PAGE)) -#define IS_MEETING_PAGE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), TYPE_MEETING_PAGE)) +#define MEETING_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_MEETING_PAGE, MeetingPage)) +#define MEETING_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_MEETING_PAGE, MeetingPageClass)) +#define IS_MEETING_PAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_MEETING_PAGE)) +#define IS_MEETING_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), TYPE_MEETING_PAGE)) typedef struct _MeetingPagePrivate MeetingPagePrivate; diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c index 5c5c2fb072..ecf5c26cec 100644 --- a/calendar/gui/dialogs/recurrence-page.c +++ b/calendar/gui/dialogs/recurrence-page.c @@ -283,7 +283,7 @@ recurrence_page_class_init (RecurrencePageClass *class) editor_page_class = (CompEditorPageClass *) class; object_class = (GtkObjectClass *) class; - parent_class = gtk_type_class (TYPE_COMP_EDITOR_PAGE); + parent_class = g_type_class_ref(TYPE_COMP_EDITOR_PAGE); editor_page_class->get_widget = recurrence_page_get_widget; editor_page_class->focus_main_widget = recurrence_page_focus_main_widget; @@ -358,12 +358,12 @@ recurrence_page_destroy (GtkObject *object) priv = rpage->priv; if (priv->xml) { - gtk_object_unref (GTK_OBJECT (priv->xml)); + g_object_unref((priv->xml)); priv->xml = NULL; } if (priv->comp) { - gtk_object_unref (GTK_OBJECT (priv->comp)); + g_object_unref((priv->comp)); priv->comp = NULL; } @@ -971,7 +971,7 @@ preview_recur (RecurrencePage *rpage) tag_calendar_by_comp (E_CALENDAR (priv->preview_calendar), comp, COMP_EDITOR_PAGE (rpage)->client, TRUE, FALSE); - gtk_object_unref (GTK_OBJECT (comp)); + g_object_unref((comp)); } /* Callback used when the recurrence weekday picker changes */ @@ -1021,8 +1021,8 @@ make_weekly_special (RecurrencePage *rpage) weekday_picker_set_days (wp, priv->weekday_day_mask); weekday_picker_set_blocked_days (wp, priv->weekday_blocked_day_mask); - gtk_signal_connect (GTK_OBJECT (wp), "changed", - GTK_SIGNAL_FUNC (weekday_picker_changed_cb), + g_signal_connect((wp), "changed", + G_CALLBACK (weekday_picker_changed_cb), rpage); } @@ -1054,7 +1054,7 @@ make_recur_month_num_submenu (const char *title, int start, int end) date = g_strdup_printf ("%d%s", i + 1, _(date_suffix[i])); item = gtk_menu_item_new_with_label (date); g_free (date); - gtk_menu_append (GTK_MENU (submenu), item); + gtk_menu_shell_append(GTK_MENU_SHELL(submenu), item); gtk_object_set_user_data (GTK_OBJECT (item), GINT_TO_POINTER (i + 1)); gtk_widget_show (item); } @@ -1087,7 +1087,7 @@ make_recur_month_num_menu (int month_index) /* Relation */ for (i = 0; i < sizeof (options) / sizeof (options[0]); i++) { item = gtk_menu_item_new_with_label (_(options[i])); - gtk_menu_append (GTK_MENU (menu), item); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), item); gtk_widget_show (item); } @@ -1095,26 +1095,26 @@ make_recur_month_num_menu (int month_index) date = g_strdup_printf ("%d%s", month_index, _(date_suffix[month_index - 1])); item = gtk_menu_item_new_with_label (date); g_free (date); - gtk_menu_append (GTK_MENU (menu), item); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), item); gtk_widget_show (item); /* Other Submenu */ submenu = gtk_menu_new (); submenu_item = gtk_menu_item_new_with_label (_("Other Date")); - gtk_menu_append (GTK_MENU (menu), submenu_item); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), submenu_item); gtk_widget_show (submenu_item); item = make_recur_month_num_submenu ("1st to 10th", 0, 10); - gtk_menu_append (GTK_MENU (submenu), item); + gtk_menu_shell_append(GTK_MENU_SHELL(submenu), item); item = make_recur_month_num_submenu ("11th to 20th", 10, 20); - gtk_menu_append (GTK_MENU (submenu), item); + gtk_menu_shell_append(GTK_MENU_SHELL(submenu), item); item = make_recur_month_num_submenu ("21st to 31st", 20, 31); - gtk_menu_append (GTK_MENU (submenu), item); + gtk_menu_shell_append(GTK_MENU_SHELL(submenu), item); gtk_menu_item_set_submenu (GTK_MENU_ITEM (submenu_item), submenu); gtk_object_set_user_data (GTK_OBJECT (submenu_item), GINT_TO_POINTER (month_index)); - gtk_signal_connect (GTK_OBJECT (submenu), "selection_done", - GTK_SIGNAL_FUNC (month_num_submenu_selection_done_cb), + g_signal_connect((submenu), "selection_done", + G_CALLBACK (month_num_submenu_selection_done_cb), submenu_item); omenu = gtk_option_menu_new (); @@ -1148,7 +1148,7 @@ make_recur_month_menu (void) GtkWidget *item; item = gtk_menu_item_new_with_label (_(options[i])); - gtk_menu_append (GTK_MENU (menu), item); + gtk_menu_shell_append(GTK_MENU_SHELL(menu), item); gtk_widget_show (item); } @@ -1291,16 +1291,16 @@ make_monthly_special (RecurrencePage *rpage) priv->month_day, month_day_options_map); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", GTK_SIGNAL_FUNC (month_index_value_changed_cb), + g_signal_connect((adj), "value_changed", G_CALLBACK (month_index_value_changed_cb), rpage); menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (priv->month_num_menu)); - gtk_signal_connect (GTK_OBJECT (menu), "selection_done", - GTK_SIGNAL_FUNC (month_num_menu_selection_done_cb), + g_signal_connect((menu), "selection_done", + G_CALLBACK (month_num_menu_selection_done_cb), rpage); menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (priv->month_day_menu)); - gtk_signal_connect (GTK_OBJECT (menu), "selection_done", - GTK_SIGNAL_FUNC (month_day_menu_selection_done_cb), + g_signal_connect((menu), "selection_done", + G_CALLBACK (month_day_menu_selection_done_cb), rpage); } @@ -1408,8 +1408,8 @@ make_ending_until_special (RecurrencePage *rpage) priv->ending_date_tt.month, priv->ending_date_tt.day); - gtk_signal_connect (GTK_OBJECT (de), "changed", - GTK_SIGNAL_FUNC (ending_until_changed_cb), rpage); + g_signal_connect((de), "changed", + G_CALLBACK (ending_until_changed_cb), rpage); /* Make sure the EDateEdit widget uses our timezones to get the current time. */ @@ -1462,8 +1462,8 @@ make_ending_count_special (RecurrencePage *rpage) e_dialog_spin_set (priv->ending_count_spin, priv->ending_count); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (ending_count_value_changed_cb), + g_signal_connect((adj), "value_changed", + G_CALLBACK (ending_count_value_changed_cb), rpage); } @@ -1607,7 +1607,7 @@ recurrence_page_fill_widgets (CompEditorPage *page, CalComponent *comp) */ if (priv->comp) - gtk_object_unref (GTK_OBJECT (priv->comp)); + g_object_unref((priv->comp)); priv->comp = cal_component_clone (comp); @@ -2346,8 +2346,8 @@ init_widgets (RecurrencePage *rpage) priv->preview_calendar = e_calendar_new (); ecal = E_CALENDAR (priv->preview_calendar); - gtk_signal_connect (GTK_OBJECT (ecal->calitem), "date_range_changed", - GTK_SIGNAL_FUNC (preview_date_range_changed_cb), + g_signal_connect((ecal->calitem), "date_range_changed", + G_CALLBACK (preview_date_range_changed_cb), rpage); calendar_config_configure_e_calendar (ecal); e_calendar_item_set_max_days_sel (ecal->calitem, 0); @@ -2367,46 +2367,46 @@ init_widgets (RecurrencePage *rpage) /* Recurrence types */ - gtk_signal_connect (GTK_OBJECT (priv->none), "toggled", - GTK_SIGNAL_FUNC (type_toggled_cb), rpage); - gtk_signal_connect (GTK_OBJECT (priv->simple), "toggled", - GTK_SIGNAL_FUNC (type_toggled_cb), rpage); - gtk_signal_connect (GTK_OBJECT (priv->custom), "toggled", - GTK_SIGNAL_FUNC (type_toggled_cb), rpage); + g_signal_connect((priv->none), "toggled", + G_CALLBACK (type_toggled_cb), rpage); + g_signal_connect((priv->simple), "toggled", + G_CALLBACK (type_toggled_cb), rpage); + g_signal_connect((priv->custom), "toggled", + G_CALLBACK (type_toggled_cb), rpage); /* Recurrence interval */ adj = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (priv->interval_value)); - gtk_signal_connect (GTK_OBJECT (adj), "value_changed", - GTK_SIGNAL_FUNC (interval_value_changed_cb), + g_signal_connect((adj), "value_changed", + G_CALLBACK (interval_value_changed_cb), rpage); /* Recurrence units */ menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (priv->interval_unit)); - gtk_signal_connect (GTK_OBJECT (menu), "selection_done", - GTK_SIGNAL_FUNC (interval_selection_done_cb), + g_signal_connect((menu), "selection_done", + G_CALLBACK (interval_selection_done_cb), rpage); /* Recurrence ending */ menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (priv->ending_menu)); - gtk_signal_connect (GTK_OBJECT (menu), "selection_done", - GTK_SIGNAL_FUNC (ending_selection_done_cb), rpage); + g_signal_connect((menu), "selection_done", + G_CALLBACK (ending_selection_done_cb), rpage); /* Exception buttons */ - gtk_signal_connect (GTK_OBJECT (priv->exception_add), "clicked", - GTK_SIGNAL_FUNC (exception_add_cb), rpage); - gtk_signal_connect (GTK_OBJECT (priv->exception_modify), "clicked", - GTK_SIGNAL_FUNC (exception_modify_cb), rpage); - gtk_signal_connect (GTK_OBJECT (priv->exception_delete), "clicked", - GTK_SIGNAL_FUNC (exception_delete_cb), rpage); + g_signal_connect((priv->exception_add), "clicked", + G_CALLBACK (exception_add_cb), rpage); + g_signal_connect((priv->exception_modify), "clicked", + G_CALLBACK (exception_modify_cb), rpage); + g_signal_connect((priv->exception_delete), "clicked", + G_CALLBACK (exception_delete_cb), rpage); /* Selections in the exceptions list */ - gtk_signal_connect (GTK_OBJECT (priv->exception_list), "select_row", - GTK_SIGNAL_FUNC (exception_select_row_cb), rpage); + g_signal_connect((priv->exception_list), "select_row", + G_CALLBACK (exception_select_row_cb), rpage); } @@ -2461,7 +2461,7 @@ recurrence_page_new (void) rpage = gtk_type_new (TYPE_RECURRENCE_PAGE); if (!recurrence_page_construct (rpage)) { - gtk_object_unref (GTK_OBJECT (rpage)); + g_object_unref((rpage)); return NULL; } diff --git a/calendar/gui/dialogs/recurrence-page.h b/calendar/gui/dialogs/recurrence-page.h index f22fc42269..319d4b1b1a 100644 --- a/calendar/gui/dialogs/recurrence-page.h +++ b/calendar/gui/dialogs/recurrence-page.h @@ -31,10 +31,10 @@ G_BEGIN_DECLS #define TYPE_RECURRENCE_PAGE (recurrence_page_get_type ()) -#define RECURRENCE_PAGE(obj) (GTK_CHECK_CAST ((obj), TYPE_RECURRENCE_PAGE, RecurrencePage)) -#define RECURRENCE_PAGE_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), TYPE_RECURRENCE_PAGE, RecurrencePageClass)) -#define IS_RECURRENCE_PAGE(obj) (GTK_CHECK_TYPE ((obj), TYPE_RECURRENCE_PAGE)) -#define IS_RECURRENCE_PAGE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), TYPE_RECURRENCE_PAGE)) +#define RECURRENCE_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_RECURRENCE_PAGE, RecurrencePage)) +#define RECURRENCE_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_RECURRENCE_PAGE, RecurrencePageClass)) +#define IS_RECURRENCE_PAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_RECURRENCE_PAGE)) +#define IS_RECURRENCE_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), TYPE_RECURRENCE_PAGE)) typedef struct _RecurrencePagePrivate RecurrencePagePrivate; diff --git a/calendar/gui/dialogs/schedule-page.c b/calendar/gui/dialogs/schedule-page.c index a6d1911018..e0bc4c848f 100644 --- a/calendar/gui/dialogs/schedule-page.c +++ b/calendar/gui/dialogs/schedule-page.c @@ -134,7 +134,7 @@ schedule_page_class_init (SchedulePageClass *class) editor_page_class = (CompEditorPageClass *) class; object_class = (GtkObjectClass *) class; - parent_class = gtk_type_class (TYPE_COMP_EDITOR_PAGE); + parent_class = g_type_class_ref(TYPE_COMP_EDITOR_PAGE); editor_page_class->get_widget = schedule_page_get_widget; editor_page_class->focus_main_widget = schedule_page_focus_main_widget; @@ -178,11 +178,11 @@ schedule_page_destroy (GtkObject *object) priv = spage->priv; if (priv->xml) { - gtk_object_unref (GTK_OBJECT (priv->xml)); + g_object_unref((priv->xml)); priv->xml = NULL; } - gtk_object_unref (GTK_OBJECT (priv->model)); + g_object_unref((priv->model)); g_free (priv); spage->priv = NULL; @@ -399,7 +399,7 @@ init_widgets (SchedulePage *spage) priv = spage->priv; - gtk_signal_connect (GTK_OBJECT (priv->sel), + g_signal_connect((priv->sel), "changed", times_changed_cb, spage); return TRUE; @@ -439,7 +439,7 @@ schedule_page_construct (SchedulePage *spage, EMeetingModel *emm) } /* Model */ - gtk_object_ref (GTK_OBJECT (emm)); + g_object_ref((emm)); priv->model = emm; /* Selector */ @@ -476,7 +476,7 @@ schedule_page_new (EMeetingModel *emm) spage = gtk_type_new (TYPE_SCHEDULE_PAGE); if (!schedule_page_construct (spage, emm)) { - gtk_object_unref (GTK_OBJECT (spage)); + g_object_unref((spage)); return NULL; } diff --git a/calendar/gui/dialogs/schedule-page.h b/calendar/gui/dialogs/schedule-page.h index b0a2d1c4d6..42745962cd 100644 --- a/calendar/gui/dialogs/schedule-page.h +++ b/calendar/gui/dialogs/schedule-page.h @@ -29,10 +29,10 @@ G_BEGIN_DECLS #define TYPE_SCHEDULE_PAGE (schedule_page_get_type ()) -#define SCHEDULE_PAGE(obj) (GTK_CHECK_CAST ((obj), TYPE_SCHEDULE_PAGE, SchedulePage)) -#define SCHEDULE_PAGE_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), TYPE_SCHEDULE_PAGE, SchedulePageClass)) -#define IS_SCHEDULE_PAGE(obj) (GTK_CHECK_TYPE ((obj), TYPE_SCHEDULE_PAGE)) -#define IS_SCHEDULE_PAGE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), TYPE_SCHEDULE_PAGE)) +#define SCHEDULE_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SCHEDULE_PAGE, SchedulePage)) +#define SCHEDULE_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SCHEDULE_PAGE, SchedulePageClass)) +#define IS_SCHEDULE_PAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SCHEDULE_PAGE)) +#define IS_SCHEDULE_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), TYPE_SCHEDULE_PAGE)) typedef struct _SchedulePagePrivate SchedulePagePrivate; diff --git a/calendar/gui/dialogs/task-details-page.c b/calendar/gui/dialogs/task-details-page.c index 3a8149afde..9c03d31bdd 100644 --- a/calendar/gui/dialogs/task-details-page.c +++ b/calendar/gui/dialogs/task-details-page.c @@ -143,7 +143,7 @@ task_details_page_class_init (TaskDetailsPageClass *class) editor_page_class = (CompEditorPageClass *) class; object_class = (GtkObjectClass *) class; - parent_class = gtk_type_class (TYPE_COMP_EDITOR_PAGE); + parent_class = g_type_class_ref(TYPE_COMP_EDITOR_PAGE); editor_page_class->get_widget = task_details_page_get_widget; editor_page_class->focus_main_widget = task_details_page_focus_main_widget; @@ -192,7 +192,7 @@ task_details_page_destroy (GtkObject *object) priv = tdpage->priv; if (priv->xml) { - gtk_object_unref (GTK_OBJECT (priv->xml)); + g_object_unref((priv->xml)); priv->xml = NULL; } @@ -688,26 +688,26 @@ init_widgets (TaskDetailsPage *tdpage) /* Connect signals. The Status, Percent Complete & Date Completed properties are closely related so whenever one changes we may need to update the other 2. */ - gtk_signal_connect (GTK_OBJECT (GTK_OPTION_MENU (priv->status)->menu), + g_signal_connect((GTK_OPTION_MENU (priv->status)->menu), "deactivate", - GTK_SIGNAL_FUNC (status_changed), tdpage); + G_CALLBACK (status_changed), tdpage); - gtk_signal_connect (GTK_OBJECT (GTK_SPIN_BUTTON (priv->percent_complete)->adjustment), + g_signal_connect((GTK_SPIN_BUTTON (priv->percent_complete)->adjustment), "value_changed", - GTK_SIGNAL_FUNC (percent_complete_changed), tdpage); + G_CALLBACK (percent_complete_changed), tdpage); /* Priority */ - gtk_signal_connect (GTK_OBJECT (GTK_OPTION_MENU (priv->priority)->menu), + g_signal_connect((GTK_OPTION_MENU (priv->priority)->menu), "deactivate", - GTK_SIGNAL_FUNC (field_changed_cb), tdpage); + G_CALLBACK (field_changed_cb), tdpage); /* Completed Date */ - gtk_signal_connect (GTK_OBJECT (priv->completed_date), "changed", - GTK_SIGNAL_FUNC (date_changed_cb), tdpage); + g_signal_connect((priv->completed_date), "changed", + G_CALLBACK (date_changed_cb), tdpage); /* URL */ - gtk_signal_connect (GTK_OBJECT (priv->url), "changed", - GTK_SIGNAL_FUNC (field_changed_cb), tdpage); + g_signal_connect((priv->url), "changed", + G_CALLBACK (field_changed_cb), tdpage); } @@ -762,7 +762,7 @@ task_details_page_new (void) tdpage = gtk_type_new (TYPE_TASK_DETAILS_PAGE); if (!task_details_page_construct (tdpage)) { - gtk_object_unref (GTK_OBJECT (tdpage)); + g_object_unref((tdpage)); return NULL; } diff --git a/calendar/gui/dialogs/task-details-page.h b/calendar/gui/dialogs/task-details-page.h index f9db58557f..98b6832bbf 100644 --- a/calendar/gui/dialogs/task-details-page.h +++ b/calendar/gui/dialogs/task-details-page.h @@ -31,10 +31,10 @@ G_BEGIN_DECLS #define TYPE_TASK_DETAILS_PAGE (task_details_page_get_type ()) -#define TASK_DETAILS_PAGE(obj) (GTK_CHECK_CAST ((obj), TYPE_TASK_DETAILS_PAGE, TaskDetailsPage)) -#define TASK_DETAILS_PAGE_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), TYPE_TASK_DETAILS_PAGE, TaskDetailsPageClass)) -#define IS_TASK_DETAILS_PAGE(obj) (GTK_CHECK_TYPE ((obj), TYPE_TASK_DETAILS_PAGE)) -#define IS_TASK_DETAILS_PAGE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), TYPE_TASK_DETAILS_PAGE)) +#define TASK_DETAILS_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_TASK_DETAILS_PAGE, TaskDetailsPage)) +#define TASK_DETAILS_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_TASK_DETAILS_PAGE, TaskDetailsPageClass)) +#define IS_TASK_DETAILS_PAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_TASK_DETAILS_PAGE)) +#define IS_TASK_DETAILS_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), TYPE_TASK_DETAILS_PAGE)) typedef struct _TaskDetailsPagePrivate TaskDetailsPagePrivate; diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c index 6a95013370..62c7a07e4a 100644 --- a/calendar/gui/dialogs/task-editor.c +++ b/calendar/gui/dialogs/task-editor.c @@ -117,7 +117,7 @@ task_editor_class_init (TaskEditorClass *klass) object_class = (GtkObjectClass *) klass; editor_class = (CompEditorClass *) klass; - parent_class = gtk_type_class (TYPE_COMP_EDITOR); + parent_class = g_type_class_ref(TYPE_COMP_EDITOR); editor_class->edit_comp = task_editor_edit_comp; editor_class->send_comp = task_editor_send_comp; @@ -170,12 +170,12 @@ init_widgets (TaskEditor *te) priv = te->priv; - gtk_signal_connect (GTK_OBJECT (priv->model), "model_row_changed", - GTK_SIGNAL_FUNC (model_row_changed_cb), te); - gtk_signal_connect (GTK_OBJECT (priv->model), "model_rows_inserted", - GTK_SIGNAL_FUNC (row_count_changed_cb), te); - gtk_signal_connect (GTK_OBJECT (priv->model), "model_rows_deleted", - GTK_SIGNAL_FUNC (row_count_changed_cb), te); + g_signal_connect((priv->model), "model_row_changed", + G_CALLBACK (model_row_changed_cb), te); + g_signal_connect((priv->model), "model_rows_inserted", + G_CALLBACK (row_count_changed_cb), te); + g_signal_connect((priv->model), "model_rows_deleted", + G_CALLBACK (row_count_changed_cb), te); } /* Object initialization function for the task editor */ @@ -265,7 +265,7 @@ task_editor_edit_comp (CompEditor *editor, CalComponent *comp) EMeetingAttendee *ia = E_MEETING_ATTENDEE (e_meeting_attendee_new_from_cal_component_attendee (ca)); e_meeting_model_add_attendee (priv->model, ia); - gtk_object_unref (GTK_OBJECT (ia)); + g_object_unref((ia)); } if (organizer.value != NULL) { @@ -319,7 +319,7 @@ task_editor_send_comp (CompEditor *editor, CalComponentItipMethod method) client = e_meeting_model_get_cal_client (priv->model); result = itip_send_comp (CAL_COMPONENT_METHOD_CANCEL, comp, client, NULL); - gtk_object_unref (GTK_OBJECT (comp)); + g_object_unref((comp)); if (!result) return FALSE; @@ -345,11 +345,11 @@ task_editor_destroy (GtkObject *object) te = TASK_EDITOR (object); priv = te->priv; - gtk_object_unref (GTK_OBJECT (priv->task_page)); - gtk_object_unref (GTK_OBJECT (priv->task_details_page)); - gtk_object_unref (GTK_OBJECT (priv->meet_page)); + g_object_unref((priv->task_page)); + g_object_unref((priv->task_details_page)); + g_object_unref((priv->meet_page)); - gtk_object_unref (GTK_OBJECT (priv->model)); + g_object_unref((priv->model)); if (GTK_OBJECT_CLASS (parent_class)->destroy) (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); diff --git a/calendar/gui/dialogs/task-editor.h b/calendar/gui/dialogs/task-editor.h index f1af1f237a..aec98b073e 100644 --- a/calendar/gui/dialogs/task-editor.h +++ b/calendar/gui/dialogs/task-editor.h @@ -30,11 +30,11 @@ #define TYPE_TASK_EDITOR (task_editor_get_type ()) -#define TASK_EDITOR(obj) (GTK_CHECK_CAST ((obj), TYPE_TASK_EDITOR, TaskEditor)) -#define TASK_EDITOR_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), TYPE_TASK_EDITOR, \ +#define TASK_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_TASK_EDITOR, TaskEditor)) +#define TASK_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_TASK_EDITOR, \ TaskEditorClass)) -#define IS_TASK_EDITOR(obj) (GTK_CHECK_TYPE ((obj), TYPE_TASK_EDITOR)) -#define IS_TASK_EDITOR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), TYPE_TASK_EDITOR)) +#define IS_TASK_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_TASK_EDITOR)) +#define IS_TASK_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_TASK_EDITOR)) typedef struct _TaskEditor TaskEditor; typedef struct _TaskEditorClass TaskEditorClass; diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c index a30a5064c2..2ed31b3be2 100644 --- a/calendar/gui/dialogs/task-page.c +++ b/calendar/gui/dialogs/task-page.c @@ -146,7 +146,7 @@ task_page_class_init (TaskPageClass *class) editor_page_class = (CompEditorPageClass *) class; object_class = (GtkObjectClass *) class; - parent_class = gtk_type_class (TYPE_COMP_EDITOR_PAGE); + parent_class = g_type_class_ref(TYPE_COMP_EDITOR_PAGE); editor_page_class->get_widget = task_page_get_widget; editor_page_class->focus_main_widget = task_page_focus_main_widget; @@ -212,7 +212,7 @@ task_page_destroy (GtkObject *object) } if (priv->xml) { - gtk_object_unref (GTK_OBJECT (priv->xml)); + g_object_unref((priv->xml)); priv->xml = NULL; } @@ -863,8 +863,8 @@ init_widgets (TaskPage *tpage) tpage, NULL); /* Summary */ - gtk_signal_connect (GTK_OBJECT (priv->summary), "changed", - GTK_SIGNAL_FUNC (summary_changed_cb), tpage); + g_signal_connect((priv->summary), "changed", + G_CALLBACK (summary_changed_cb), tpage); /* Description - turn on word wrap. */ #if 0 @@ -872,41 +872,41 @@ init_widgets (TaskPage *tpage) #endif /* Dates */ - gtk_signal_connect (GTK_OBJECT (priv->start_date), "changed", - GTK_SIGNAL_FUNC (date_changed_cb), tpage); - gtk_signal_connect (GTK_OBJECT (priv->due_date), "changed", - GTK_SIGNAL_FUNC (date_changed_cb), tpage); + g_signal_connect((priv->start_date), "changed", + G_CALLBACK (date_changed_cb), tpage); + g_signal_connect((priv->due_date), "changed", + G_CALLBACK (date_changed_cb), tpage); - gtk_signal_connect (GTK_OBJECT (priv->due_timezone), "changed", - GTK_SIGNAL_FUNC (field_changed_cb), tpage); - gtk_signal_connect (GTK_OBJECT (priv->start_timezone), "changed", - GTK_SIGNAL_FUNC (field_changed_cb), tpage); + g_signal_connect((priv->due_timezone), "changed", + G_CALLBACK (field_changed_cb), tpage); + g_signal_connect((priv->start_timezone), "changed", + G_CALLBACK (field_changed_cb), tpage); /* Classification */ - gtk_signal_connect (GTK_OBJECT (priv->classification_public), + g_signal_connect((priv->classification_public), "toggled", - GTK_SIGNAL_FUNC (field_changed_cb), tpage); - gtk_signal_connect (GTK_OBJECT (priv->classification_private), + G_CALLBACK (field_changed_cb), tpage); + g_signal_connect((priv->classification_private), "toggled", - GTK_SIGNAL_FUNC (field_changed_cb), tpage); - gtk_signal_connect (GTK_OBJECT (priv->classification_confidential), + G_CALLBACK (field_changed_cb), tpage); + g_signal_connect((priv->classification_confidential), "toggled", - GTK_SIGNAL_FUNC (field_changed_cb), tpage); + G_CALLBACK (field_changed_cb), tpage); /* Connect the default signal handler to use to make sure the "changed" field gets set whenever a field is changed. */ - gtk_signal_connect (GTK_OBJECT (priv->description), "changed", - GTK_SIGNAL_FUNC (field_changed_cb), tpage); - gtk_signal_connect (GTK_OBJECT (priv->categories), "changed", - GTK_SIGNAL_FUNC (field_changed_cb), tpage); + g_signal_connect((priv->description), "changed", + G_CALLBACK (field_changed_cb), tpage); + g_signal_connect((priv->categories), "changed", + G_CALLBACK (field_changed_cb), tpage); /* Contacts button */ - gtk_signal_connect (GTK_OBJECT (priv->contacts_btn), "clicked", - GTK_SIGNAL_FUNC (contacts_clicked_cb), tpage); + g_signal_connect((priv->contacts_btn), "clicked", + G_CALLBACK (contacts_clicked_cb), tpage); /* Categories button */ - gtk_signal_connect (GTK_OBJECT (priv->categories_btn), "clicked", - GTK_SIGNAL_FUNC (categories_clicked_cb), tpage); + g_signal_connect((priv->categories_btn), "clicked", + G_CALLBACK (categories_clicked_cb), tpage); /* Create the contacts entry, a corba control from the address book. */ @@ -986,7 +986,7 @@ task_page_new (void) tpage = gtk_type_new (TYPE_TASK_PAGE); if (!task_page_construct (tpage)) { - gtk_object_unref (GTK_OBJECT (tpage)); + g_object_unref((tpage)); return NULL; } diff --git a/calendar/gui/dialogs/task-page.h b/calendar/gui/dialogs/task-page.h index ba94400b3f..16ced619d7 100644 --- a/calendar/gui/dialogs/task-page.h +++ b/calendar/gui/dialogs/task-page.h @@ -31,10 +31,10 @@ G_BEGIN_DECLS #define TYPE_TASK_PAGE (task_page_get_type ()) -#define TASK_PAGE(obj) (GTK_CHECK_CAST ((obj), TYPE_TASK_PAGE, TaskPage)) -#define TASK_PAGE_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), TYPE_TASK_PAGE, TaskPageClass)) -#define IS_TASK_PAGE(obj) (GTK_CHECK_TYPE ((obj), TYPE_TASK_PAGE)) -#define IS_TASK_PAGE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), TYPE_TASK_PAGE)) +#define TASK_PAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_TASK_PAGE, TaskPage)) +#define TASK_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_TASK_PAGE, TaskPageClass)) +#define IS_TASK_PAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_TASK_PAGE)) +#define IS_TASK_PAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), TYPE_TASK_PAGE)) typedef struct _TaskPagePrivate TaskPagePrivate; diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c index ea45c813e3..6bf95c9732 100644 --- a/calendar/gui/itip-utils.c +++ b/calendar/gui/itip-utils.c @@ -340,7 +340,7 @@ comp_from (CalComponentItipMethod method, CalComponent *comp) case CAL_COMPONENT_METHOD_ADD: cal_component_get_organizer (comp, &organizer); if (organizer.value == NULL) { - e_notice (NULL, GNOME_MESSAGE_BOX_ERROR, + e_notice (NULL, GTK_MESSAGE_ERROR, _("An organizer must be set.")); return NULL; } @@ -375,7 +375,7 @@ comp_to_list (CalComponentItipMethod method, CalComponent *comp, GList *users) cal_component_get_attendee_list (comp, &attendees); len = g_slist_length (attendees); if (len <= 0) { - e_notice (NULL, GNOME_MESSAGE_BOX_ERROR, + e_notice (NULL, GTK_MESSAGE_ERROR, _("At least one attendee is necessary")); cal_component_free_attendee_list (attendees); return NULL; @@ -411,7 +411,7 @@ comp_to_list (CalComponentItipMethod method, CalComponent *comp, GList *users) case CAL_COMPONENT_METHOD_DECLINECOUNTER: cal_component_get_organizer (comp, &organizer); if (organizer.value == NULL) { - e_notice (NULL, GNOME_MESSAGE_BOX_ERROR, + e_notice (NULL, GTK_MESSAGE_ERROR, _("An organizer must be set.")); return NULL; } @@ -617,7 +617,7 @@ comp_server_send (CalComponentItipMethod method, CalComponent *comp, CalClient * retval = TRUE; } else if (result == CAL_CLIENT_SEND_BUSY) { - e_notice (NULL, GNOME_MESSAGE_BOX_ERROR, error_msg); + e_notice (NULL, GTK_MESSAGE_ERROR, error_msg); retval = FALSE; } @@ -748,7 +748,7 @@ comp_minimal (CalComponent *comp, gboolean attendee) cal_component_set_attendee_list (clone, attendees); if (!comp_limit_attendees (clone)) { - e_notice (NULL, GNOME_MESSAGE_BOX_ERROR, + e_notice (NULL, GTK_MESSAGE_ERROR, _("You must be an attendee of the event.")); goto error; } |