[evolution-patches] patch for #65932
- From: Rodrigo Moya <rodrigo novell com>
- To: Evolution Patches <evolution-patches lists ximian com>
- Subject: [evolution-patches] patch for #65932
- Date: Fri, 24 Sep 2004 17:04:48 +0200
This should fix the crash specified in the bug.
--
Rodrigo Moya <rodrigo novell com>
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.2500.2.14
diff -u -p -r1.2500.2.14 ChangeLog
--- ChangeLog 24 Sep 2004 13:52:41 -0000 1.2500.2.14
+++ ChangeLog 24 Sep 2004 15:02:36 -0000
@@ -1,3 +1,10 @@
+2004-09-24 Rodrigo Moya <rodrigo novell com>
+
+ Fixes #65932
+
+ * gui/comp-editor-factory.c (cal_opened_cb): don't assert on error
+ cases, just display an error dialog.
+
2004-09-24 JP Rosevear <jpr novell com>
Fixes #66344
@@ -64,7 +71,7 @@
* conduits/calendar/calendar-conduit.c (local_record_from_comp):
handle -1 (last) for monthly recurrences and check both by_set_pos
and by_day since either can indicate this type of recurrence
-
+
2004-09-20 Tony Tsui <ttsui9 gmail com>
Fixes #66174
Index: gui/comp-editor-factory.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/comp-editor-factory.c,v
retrieving revision 1.37
diff -u -p -r1.37 comp-editor-factory.c
--- gui/comp-editor-factory.c 18 May 2004 14:14:14 -0000 1.37
+++ gui/comp-editor-factory.c 24 Sep 2004 15:02:36 -0000
@@ -410,8 +410,9 @@ cal_opened_cb (ECal *client, ECalendarSt
break;
case E_CALENDAR_STATUS_NO_SUCH_CALENDAR:
- /* oops - we specified only_if_exists = FALSE */
- g_assert_not_reached ();
+ dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
+ GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
+ _("Calendar not found"));
return;
case E_CALENDAR_STATUS_PROTOCOL_NOT_SUPPORTED:
@@ -427,7 +428,9 @@ cal_opened_cb (ECal *client, ECalendarSt
break;
default:
- g_assert_not_reached ();
+ dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
+ GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
+ _("Unknown error"));
return;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]