evolution r35702 - trunk/widgets/misc

[sragavan svn gnome org]

Author: sragavan
Date: Mon Jun 30 06:57:45 2008
New Revision: 35702
URL: http://svn.gnome.org/viewvc/evolution?rev=35702&view=rev

Log:
2008-06-30  Srinivasa Ragavan  <sragavan novell com>

	** Fix for bug #519536

	* e-activity-handler.c: (cancel_wrapper): Handle freeing of data
	safely.




Modified:
   trunk/widgets/misc/ChangeLog
   trunk/widgets/misc/e-activity-handler.c

Modified: trunk/widgets/misc/e-activity-handler.c
==============================================================================
--- trunk/widgets/misc/e-activity-handler.c	(original)
+++ trunk/widgets/misc/e-activity-handler.c	Mon Jun 30 06:57:45 2008
@@ -381,6 +381,7 @@
 	if (data->info->error) {
 		/* Hide the error */
 		EActivityHandler *handler = data->handler;
+		ActivityInfo *info;
 		int order, len;
 		GSList *sp;
 		GList *p = lookup_activity (handler->priv->activity_infos, data->id, &order);
@@ -388,13 +389,14 @@
 						    g_object_get_data (data->info->error, "secondary"));
 		gtk_widget_destroy (data->info->error);
 		data->info->error = NULL;
+		info = data->info;
 		for (sp = handler->priv->task_bars; sp != NULL; sp = sp->next) {
 			ETaskBar *task_bar;
 
 			task_bar = E_TASK_BAR (sp->data);
-			e_task_bar_remove_task_from_id (task_bar, data->info->id);	
+			e_task_bar_remove_task_from_id (task_bar, info->id);	
 		}
-		activity_info_free (data->info);
+		activity_info_free (info);
 		len = g_list_length (handler->priv->activity_infos);
 		handler->priv->activity_infos = g_list_remove_link (handler->priv->activity_infos, p);
 		if (len == 1)