From 3041d1943a01406abf5672d8759213472e61298d Mon Sep 17 00:00:00 2001 From: Not Zed Date: Mon, 2 Dec 2002 03:06:02 +0000 Subject: run fix.sh over this. 2002-11-27 Not Zed * gui/itip-utils.[ch]: run fix.sh over this. * gui/dialogs/*.[ch]: run fix.sh over all of this. 2002-11-26 Richard Li * cal-client/cal-client.c (cal_client_construct): removed extra call to CORBA_exception_init. 2002-11-22 Not Zed * gui/dialogs/delete-comp.c (delete_component_dialog): Changed e_messagebox -> gtk_messagedialog. svn path=/trunk/; revision=18972 --- calendar/gui/dialogs/meeting-page.c | 52 ++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 26 deletions(-) (limited to 'calendar/gui/dialogs/meeting-page.c') 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; } -- cgit v1.2.3