aboutsummaryrefslogtreecommitdiffstats
path: root/calendar
diff options
context:
space:
mode:
authorJP Rosevear <jpr@novell.com>2004-07-15 11:57:52 +0800
committerJP Rosevear <jpr@src.gnome.org>2004-07-15 11:57:52 +0800
commit5f8818913ba4cca5bf2b035625b1f17acf6679f6 (patch)
tree17f872b460e172ce940d93e723ebfedfc51d1bd6 /calendar
parenta8b3b7f76c96c41e9aa04a09ee5a893462e20d05 (diff)
downloadgsoc2013-evolution-5f8818913ba4cca5bf2b035625b1f17acf6679f6.tar
gsoc2013-evolution-5f8818913ba4cca5bf2b035625b1f17acf6679f6.tar.gz
gsoc2013-evolution-5f8818913ba4cca5bf2b035625b1f17acf6679f6.tar.bz2
gsoc2013-evolution-5f8818913ba4cca5bf2b035625b1f17acf6679f6.tar.lz
gsoc2013-evolution-5f8818913ba4cca5bf2b035625b1f17acf6679f6.tar.xz
gsoc2013-evolution-5f8818913ba4cca5bf2b035625b1f17acf6679f6.tar.zst
gsoc2013-evolution-5f8818913ba4cca5bf2b035625b1f17acf6679f6.zip
Fixes #60678
2004-07-14 JP Rosevear <jpr@novell.com> Fixes #60678 * gui/dialogs/cancel-comp.c (cancel_component_dialog): flip the messages around, the "deleting" flag means something else is doing the deleting svn path=/trunk/; revision=26658
Diffstat (limited to 'calendar')
-rw-r--r--calendar/ChangeLog8
-rw-r--r--calendar/gui/dialogs/cancel-comp.c15
2 files changed, 15 insertions, 8 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 1fc42d2410..8c466e782b 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,11 @@
+2004-07-14 JP Rosevear <jpr@novell.com>
+
+ Fixes #60678
+
+ * gui/dialogs/cancel-comp.c (cancel_component_dialog): flip the
+ messages around, the "deleting" flag means something else is doing
+ the deleting
+
2004-07-12 JP Rosevear <jpr@novell.com>
Fixes #57287, 58748
diff --git a/calendar/gui/dialogs/cancel-comp.c b/calendar/gui/dialogs/cancel-comp.c
index 008f70e39e..eedd7ce49c 100644
--- a/calendar/gui/dialogs/cancel-comp.c
+++ b/calendar/gui/dialogs/cancel-comp.c
@@ -54,28 +54,27 @@ cancel_component_dialog (GtkWindow *parent, ECal *client, ECalComponent *comp, g
switch (vtype) {
case E_CAL_COMPONENT_EVENT:
if (deleting)
- id = "calendar:prompt-delete-meeting";
- else
id = "calendar:prompt-cancel-meeting";
+ else
+ id = "calendar:prompt-delete-meeting";
break;
case E_CAL_COMPONENT_TODO:
if (deleting)
- id = "calendar:prompt-delete-task";
- else
id = "calendar:prompt-cancel-task";
+ else
+ id = "calendar:prompt-delete-task";
break;
case E_CAL_COMPONENT_JOURNAL:
if (deleting)
- id = "calendar:prompt-delete-journal";
- else
id = "calendar:prompt-cancel-journal";
+ else
+ id = "calendar:prompt-delete-journal";
break;
default:
- g_message ("cancel_component_dialog(): "
- "Cannot handle object of type %d", vtype);
+ g_message (G_STRLOC ": Cannot handle object of type %d", vtype);
return FALSE;
}