aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--calendar/ChangeLog9
-rw-r--r--calendar/gui/alarm-notify/alarm-queue.c2
-rw-r--r--calendar/gui/dialogs/alarm-dialog.c2
3 files changed, 11 insertions, 2 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 04ce223ce1..4f6c6abea1 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,5 +1,14 @@
2008-12-15 Milan Crha <mcrha@redhat.com>
+ ** Part of fix for bug #564229
+
+ * gui/dialogs/alarm-dialog.c: (populate_widgets_from_alarm):
+ Cast to proper object.
+ * gui/alarm-notify/alarm-queue.c: (free_tray_icon_data):
+ Do not leak.
+
+2008-12-15 Milan Crha <mcrha@redhat.com>
+
** Part of fix for bug #563669
* gui/dialogs/recurrence-page.c: (make_ending_count_special):
diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
index 22b7766b4d..5fba590646 100644
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ b/calendar/gui/alarm-notify/alarm-queue.c
@@ -989,7 +989,7 @@ free_tray_icon_data (TrayIconData *tray_data)
}
if (tray_data->location){
- g_free (tray_data->description);
+ g_free (tray_data->location);
tray_data->location = NULL;
}
diff --git a/calendar/gui/dialogs/alarm-dialog.c b/calendar/gui/dialogs/alarm-dialog.c
index 7e429a28b2..bf78f70011 100644
--- a/calendar/gui/dialogs/alarm-dialog.c
+++ b/calendar/gui/dialogs/alarm-dialog.c
@@ -642,7 +642,7 @@ populate_widgets_from_alarm (Dialog *dialog)
/* Alarm options */
e_dialog_option_menu_set (dialog->action, *action, action_map);
- action_selection_done_cb (GTK_MENU_SHELL (dialog->action), dialog);
+ action_selection_done_cb (GTK_MENU_SHELL (gtk_option_menu_get_menu (GTK_OPTION_MENU (dialog->action))), dialog);
switch (*action) {
case E_CAL_COMPONENT_ALARM_AUDIO: