aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--widgets/misc/ChangeLog7
-rw-r--r--widgets/misc/e-activity-handler.c6
2 files changed, 11 insertions, 2 deletions
diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog
index 85f63b4742..64aaad5152 100644
--- a/widgets/misc/ChangeLog
+++ b/widgets/misc/ChangeLog
@@ -1,3 +1,10 @@
+2008-06-30 Srinivasa Ragavan <sragavan@novell.com>
+
+ ** Fix for bug #519536
+
+ * e-activity-handler.c: (cancel_wrapper): Handle freeing of data
+ safely.
+
2008-06-18 Milan Crha <mcrha@redhat.com>
** Fix for bug #532597
diff --git a/widgets/misc/e-activity-handler.c b/widgets/misc/e-activity-handler.c
index 6539a11f36..8500f72f61 100644
--- a/widgets/misc/e-activity-handler.c
+++ b/widgets/misc/e-activity-handler.c
@@ -381,6 +381,7 @@ cancel_wrapper (gpointer pdata)
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 @@ cancel_wrapper (gpointer pdata)
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)