aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog5
-rw-r--r--calendar/gui/alarm-notify/alarm-queue.c6
2 files changed, 9 insertions, 2 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 3128badaba..a4d971d48a 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-05 Milan Crha <mcrha@redhat.com>
+
+ * gui/alarm-notify/alarm-queue.c: (alarm_queue_remove_client):
+ Fixed leak caused by my changes in fix for bug #325685.
+
2007-10-04 Matthew Barnes <mbarnes@redhat.com>
** Fixes part of bug #477045
diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
index 28550d55f7..b650f2e36b 100644
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ b/calendar/gui/alarm-notify/alarm-queue.c
@@ -2167,9 +2167,11 @@ alarm_queue_remove_client (ECal *client, gboolean immediately)
msg->data = list;
d(printf("%s:%d (alarm_queue_remove_client) - Posting a task\n",__FILE__, __LINE__));
- if (immediately)
+ if (immediately) {
alarm_queue_remove_async (NULL, msg, NULL);
- else
+ g_free (list);
+ g_free (msg);
+ } else
e_thread_put(alarm_operation_thread, (EMsg *)msg);
}