[Evolution-hackers] 60678

[JP Rosevear <jpr novell com>]

-JP
-- 
JP Rosevear <jpr novell com>
Novell, Inc.

? 60678.patch
? primary-uncheck.patch
? gui/primary-uncheck.patch
? gui/scroll.patch
? gui/select-auto.patch
? gui/select.patch
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.2445
diff -u -r1.2445 ChangeLog
--- ChangeLog	14 Jul 2004 02:20:55 -0000	1.2445
+++ ChangeLog	14 Jul 2004 19:14:15 -0000
@@ -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
Index: gui/dialogs/cancel-comp.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/cancel-comp.c,v
retrieving revision 1.13
diff -u -r1.13 cancel-comp.c
--- gui/dialogs/cancel-comp.c	25 May 2004 20:41:32 -0000	1.13
+++ gui/dialogs/cancel-comp.c	14 Jul 2004 19:14:15 -0000
@@ -54,28 +54,27 @@
 	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;
 	}