fix for the bug #312851 [calendar]
chen <[email protected]>
| Newsgroups | gmane.comp.gnome.evolution.patches |
|---|---|
| Message-ID | <[email protected]> |
Hi,
Have attached the fix for the bug. Removed the unnecessary assert.
thanks, Chenthill.
_______________________________________________
Evolution-patches mailing list
[email protected]
http://mail.gnome.org/mailman/listinfo/evolution-patches
312851.diff
(text/x-patch, 1.4 KB)
Index: ChangeLog =================================================================== RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v retrieving revision 1.2984 diff -u -p -u -p -r1.2984 ChangeLog --- ChangeLog 9 Feb 2006 11:42:40 -0000 1.2984 +++ ChangeLog 9 Feb 2006 12:46:22 -0000 @@ -1,3 +1,10 @@ +2006-02-09 Chenthill Palanisamy <[email protected]> + + Fixes #312851 + * gui/alarm-notify/alarm.c: (alarm_remove): Removed + the assert, as its not needed. There can be other alarms. + + 2006-02-09 Harish Krishnaswamy <[email protected]> * gui/e-cal-model.c: (e_cal_view_objects_added_cb): Index: gui/alarm-notify/alarm.c =================================================================== RCS file: /cvs/gnome/evolution/calendar/gui/alarm-notify/alarm.c,v retrieving revision 1.35 diff -u -p -u -p -r1.35 alarm.c --- gui/alarm-notify/alarm.c 8 Feb 2006 13:06:23 -0000 1.35 +++ gui/alarm-notify/alarm.c 9 Feb 2006 12:46:22 -0000 @@ -248,17 +248,14 @@ alarm_remove (gpointer alarm) alarms = g_list_delete_link (alarms, l); } - /* Reset the timeout */ - - g_assert (timeout_id != 0); - + /* Reset the timeout if there are no alarms. There can be an alarm scheduled + for trigger */ if (!alarms) { g_source_remove (timeout_id); timeout_id = 0; } /* Notify about destructiono of the alarm */ - if (ar->destroy_notify_fn) (* ar->destroy_notify_fn) (notify_id, ar->data);