From 152d68ee68e875f9290742380dc1433ca18e8d91 Mon Sep 17 00:00:00 2001 From: JP Rosevear Date: Thu, 24 Aug 2000 17:37:29 +0000 Subject: Make signal names saner (released_event_object_cb): ditto 2000-08-24 JP Rosevear * gui/gnome-cal.c (save_event_object_cb): Make signal names saner (released_event_object_cb): ditto (gnome_calendar_edit_object): ditto * gui/event-editor.h: Make signal names saner * gui/event-editor.c (event_editor_class_init): Make signal names saner now that we don't use ical object (save_event_object): ditto with callback names (file_save_cb): ditto (tb_save_and_close_cb): ditto (event_editor_set_ical_object): ditto * gui/e-day-view.c (e_day_view_update_event): Umm, != CAL_COMPONENT_EVENT (I hope that wasn't me!) svn path=/trunk/; revision=5006 --- calendar/gui/gnome-cal.c | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) (limited to 'calendar/gui/gnome-cal.c') diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c index 2ef5ef7248..bb2a3ded10 100644 --- a/calendar/gui/gnome-cal.c +++ b/calendar/gui/gnome-cal.c @@ -1308,9 +1308,20 @@ gnome_calendar_set_selected_time_range (GnomeCalendar *gcal, gnome_calendar_update_gtk_calendar (gcal); } +/* Callback used when an event editor requests that an object be saved */ +static void +save_event_object_cb (EventEditor *ee, CalComponent *comp, gpointer data) +{ + GnomeCalendar *gcal; + + gcal = GNOME_CALENDAR (data); + if (!cal_client_update_object (gcal->client, comp)) + g_message ("save_event_object_cb(): Could not update the object!"); +} + /* Callback used when an event editor finishes editing an object */ static void -ical_object_released_cb (EventEditor *ee, const char *uid, gpointer data) +released_event_object_cb (EventEditor *ee, const char *uid, gpointer data) { GnomeCalendar *gcal; gboolean result; @@ -1335,17 +1346,6 @@ editor_closed_cb (EventEditor *ee, gpointer data) gtk_object_unref (GTK_OBJECT (ee)); } -/* Callback used when an event editor requests that an object be saved */ -static void -save_ical_object_cb (EventEditor *ee, CalComponent *comp, gpointer data) -{ - GnomeCalendar *gcal; - - gcal = GNOME_CALENDAR (data); - if (!cal_client_update_object (gcal->client, comp)) - g_message ("save_ical_object_cb(): Could not update the object!"); -} - void gnome_calendar_edit_object (GnomeCalendar *gcal, CalComponent *comp) { @@ -1371,15 +1371,19 @@ gnome_calendar_edit_object (GnomeCalendar *gcal, CalComponent *comp) */ g_hash_table_insert (gcal->object_editor_hash, g_strdup (uid), ee); - gtk_signal_connect (GTK_OBJECT (ee), "ical_object_released", - GTK_SIGNAL_FUNC (ical_object_released_cb), gcal); + + + gtk_signal_connect (GTK_OBJECT (ee), "save_event_object", + GTK_SIGNAL_FUNC (save_event_object_cb), + gcal); + + gtk_signal_connect (GTK_OBJECT (ee), "released_event_object", + GTK_SIGNAL_FUNC (released_event_object_cb), + gcal); gtk_signal_connect (GTK_OBJECT (ee), "editor_closed", GTK_SIGNAL_FUNC (editor_closed_cb), gcal); - gtk_signal_connect (GTK_OBJECT (ee), "save_ical_object", - GTK_SIGNAL_FUNC (save_ical_object_cb), gcal); - event_editor_set_ical_object (EVENT_EDITOR (ee), comp); } -- cgit