aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRodrigo Moya <rodrigo@ximian.com>2004-01-16 05:53:38 +0800
committerRodrigo Moya <rodrigo@src.gnome.org>2004-01-16 05:53:38 +0800
commit6a22658a6886f3339417307d8f11a0a8e724a0d3 (patch)
tree5e3f435afb01719ff90728308419030b91015db9
parenta9b50aee47517fdcfedfc773b01d38d62f4147ac (diff)
downloadgsoc2013-evolution-6a22658a6886f3339417307d8f11a0a8e724a0d3.tar.gz
gsoc2013-evolution-6a22658a6886f3339417307d8f11a0a8e724a0d3.tar.zst
gsoc2013-evolution-6a22658a6886f3339417307d8f11a0a8e724a0d3.zip
reverted my changes made on Jan 8th.
2004-01-15 Rodrigo Moya <rodrigo@ximian.com> * gui/dialogs/comp-editor.c: reverted my changes made on Jan 8th. svn path=/trunk/; revision=24256
-rw-r--r--calendar/ChangeLog4
-rw-r--r--calendar/gui/dialogs/comp-editor.c21
2 files changed, 6 insertions, 19 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 547442bb77..61de6ee97e 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,5 +1,9 @@
2004-01-15 Rodrigo Moya <rodrigo@ximian.com>
+ * gui/dialogs/comp-editor.c: reverted my changes made on Jan 8th.
+
+2004-01-15 Rodrigo Moya <rodrigo@ximian.com>
+
* gui/alarm-notify/save.[ch]: removed.
* gui/alarm-notify/Makefile.am: removed save.[ch].
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index e29c6c1ce6..805cf550a4 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -395,8 +395,6 @@ save_comp (CompEditor *editor)
result = e_cal_modify_object (priv->client, e_cal_component_get_icalcomponent (priv->comp), priv->mod, &error);
}
- priv->updating = FALSE;
-
if (!result) {
GtkWidget *dlg;
char *msg;
@@ -430,6 +428,8 @@ save_comp (CompEditor *editor)
priv->changed = FALSE;
}
+ priv->updating = FALSE;
+
return TRUE;
}
@@ -1525,27 +1525,10 @@ obj_modified_cb (ECal *client, GList *objects, gpointer data)
{
CompEditor *editor = COMP_EDITOR (data);
CompEditorPrivate *priv;
- GList *l;
- gboolean found = FALSE;
ECalComponent *comp = NULL;
priv = editor->priv;
- /* see if the component being edited is one that has changed */
- for (l = objects; l != NULL; l = l->next) {
- const char *our_uid, *uid;
-
- e_cal_component_get_uid (priv->comp, &our_uid);
- uid = icalcomponent_get_uid (l->data);
- if (uid && our_uid && strcmp (uid, our_uid) == 0) {
- found = TRUE;
- break;
- }
- }
-
- if (!found)
- return;
-
/* We queried based on a specific UID so we definitely changed */
if (priv->updating)
return;