From e8648e48175c1b6d26bff5316c2c7d738245a63c Mon Sep 17 00:00:00 2001 From: Damon Chaplin Date: Wed, 6 Sep 2000 00:13:05 +0000 Subject: uses the new TaskEditor dialog. 2000-09-06 Damon Chaplin * gui/e-calendar-table.c (e_calendar_table_open_task): uses the new TaskEditor dialog. * gui/dialogs/task-editor.[hc]: * gui/dialogs/task-editor-dialog.glade: updated. Still need to fix the 'Status' property (CalComponent doesn't support it yet), and use a replacement for GnomeDateEdit, since we need to support setting 'None' as the date. 2000-09-04 Damon Chaplin * gui/event-editor.c (obj_updated_cb): (obj_removed_cb): compare the updated object's uid with the one we are editing, and just return if it doesn't match. 2000-09-01 Damon Chaplin * gui/gnome-cal.c (gnome_calendar_tag_calendar): added check to see if the client has loaded successfully. Gets rid of a few warnings. svn path=/trunk/; revision=5217 --- calendar/gui/event-editor.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'calendar/gui/event-editor.c') diff --git a/calendar/gui/event-editor.c b/calendar/gui/event-editor.c index 34c659b163..9a398d13cb 100644 --- a/calendar/gui/event-editor.c +++ b/calendar/gui/event-editor.c @@ -1549,6 +1549,7 @@ obj_updated_cb (CalClient *client, const char *uid, gpointer data) EventEditorPrivate *priv; CalComponent *comp; CalClientGetStatus status; + const gchar *editing_uid; ee = EVENT_EDITOR (data); @@ -1556,6 +1557,14 @@ obj_updated_cb (CalClient *client, const char *uid, gpointer data) priv = ee->priv; + /* If we aren't showing the object which has been updated, return. */ + if (!priv->comp) + return; + cal_component_get_uid (priv->comp, &editing_uid); + if (strcmp (uid, editing_uid)) + return; + + /* Get the event from the server. */ status = cal_client_get_object (priv->client, uid, &comp); @@ -1586,6 +1595,7 @@ obj_removed_cb (CalClient *client, const char *uid, gpointer data) { EventEditor *ee; EventEditorPrivate *priv; + const gchar *editing_uid; ee = EVENT_EDITOR (data); @@ -1594,6 +1604,14 @@ obj_removed_cb (CalClient *client, const char *uid, gpointer data) priv = ee->priv; + /* If we aren't showing the object which has been updated, return. */ + if (!priv->comp) + return; + cal_component_get_uid (priv->comp, &editing_uid); + if (strcmp (uid, editing_uid)) + return; + + raise_and_focus (priv->app); } -- cgit v1.2.3