evolution r36893 - in trunk/calendar: . gui/alarm-notify gui/dialogs

[mcrha svn gnome org]

Author: mcrha
Date: Mon Dec 15 11:52:50 2008
New Revision: 36893
URL: http://svn.gnome.org/viewvc/evolution?rev=36893&view=rev

Log:
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.



Modified:
   trunk/calendar/ChangeLog
   trunk/calendar/gui/alarm-notify/alarm-queue.c
   trunk/calendar/gui/dialogs/alarm-dialog.c

Modified: trunk/calendar/gui/alarm-notify/alarm-queue.c
==============================================================================
--- trunk/calendar/gui/alarm-notify/alarm-queue.c	(original)
+++ trunk/calendar/gui/alarm-notify/alarm-queue.c	Mon Dec 15 11:52:50 2008
@@ -989,7 +989,7 @@
 	}
 
 	if (tray_data->location){
-		g_free (tray_data->description);
+		g_free (tray_data->location);
 		tray_data->location = NULL;
 	}
 

Modified: trunk/calendar/gui/dialogs/alarm-dialog.c
==============================================================================
--- trunk/calendar/gui/dialogs/alarm-dialog.c	(original)
+++ trunk/calendar/gui/dialogs/alarm-dialog.c	Mon Dec 15 11:52:50 2008
@@ -642,7 +642,7 @@
 
 	/* 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: