From cea054cd54d84479352a43bbabc19c9ce9af5efb Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 8 Aug 2008 04:26:12 +0000 Subject: Merge revisions 35747:35930 from trunk. svn path=/branches/kill-bonobo/; revision=35931 --- widgets/misc/ChangeLog | 18 ++++++++++++++++++ widgets/misc/e-activity-handler.c | 1 + widgets/misc/e-task-bar.c | 20 ++++++++++++++++++++ 3 files changed, 39 insertions(+) (limited to 'widgets/misc') diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog index 3649c5b274..6833cf44d6 100644 --- a/widgets/misc/ChangeLog +++ b/widgets/misc/ChangeLog @@ -1,3 +1,21 @@ +2008-07-23 Milan Crha + + ** Part of fix for bug #543943 + + * e-activity-handler.c: (e_activity_handler_operation_set_error): + * e-task-bar.c: (e_task_bar_class_init), (impl_finalize): + Leak fix. + +2008-07-20 Matthew Barnes + + ** Fixes part of bug #542587 + + * e-online-button.c: + * e-online-button.h: + New widget implements the online/offline button used in the main + window. The button just maintains an "online" flag and displays + the appropriate button image for the flag. + 2008-17-14 Paolo Borelli ** Fix for bug #542889 diff --git a/widgets/misc/e-activity-handler.c b/widgets/misc/e-activity-handler.c index 8500f72f61..04861b1b8f 100644 --- a/widgets/misc/e-activity-handler.c +++ b/widgets/misc/e-activity-handler.c @@ -612,6 +612,7 @@ e_activity_handler_operation_set_error(EActivityHandler *activity_handler, activity_info->error = error; activity_info->error_time = time (NULL); activity_info->error_type = E_LOG_ERROR; + g_free (activity_info->information); activity_info->information = g_strdup (g_object_get_data ((GObject *) error, "primary")); for (sp = priv->task_bars; sp != NULL; sp = sp->next) { ETaskBar *task_bar; diff --git a/widgets/misc/e-task-bar.c b/widgets/misc/e-task-bar.c index c05c7d8999..9093f89d58 100644 --- a/widgets/misc/e-task-bar.c +++ b/widgets/misc/e-task-bar.c @@ -82,9 +82,15 @@ reduce_displayed_activities_per_component (ETaskBar *task_bar) } #endif + +static void impl_finalize (GObject *object); + static void e_task_bar_class_init (ETaskBarClass *klass) { + GObjectClass *object_class = G_OBJECT_CLASS (klass); + + object_class->finalize = impl_finalize; } static void @@ -114,6 +120,20 @@ e_task_bar_init (ETaskBar *task_bar) gtk_widget_set_size_request (GTK_WIDGET (task_bar), -1, height * 2); } +static void +impl_finalize (GObject *object) +{ + ETaskBar *task_bar; + ETaskBarPrivate *priv; + + task_bar = E_TASK_BAR (object); + priv = task_bar->priv; + + g_free (priv); + + (* G_OBJECT_CLASS (e_task_bar_parent_class)->finalize) (object); +} + void e_task_bar_construct (ETaskBar *task_bar) -- cgit v1.2.3