From 165dad49ccada35cdff74ae9692e9b5f6ec43a38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Mon, 7 Nov 2011 04:07:52 +0100 Subject: Indicator-sound: Added the "indicator-sound" name hint. --- src/indicator-sound.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/indicator-sound.c b/src/indicator-sound.c index 7c72900..ee90647 100644 --- a/src/indicator-sound.c +++ b/src/indicator-sound.c @@ -74,6 +74,7 @@ static GtkLabel * get_label (IndicatorObject * io); static GtkImage * get_icon (IndicatorObject * io); static GtkMenu * get_menu (IndicatorObject * io); static const gchar * get_accessible_desc (IndicatorObject * io); +static const gchar * get_name_hint (IndicatorObject * io); static void indicator_sound_scroll (IndicatorObject * io, IndicatorObjectEntry * entry, gint delta, IndicatorScrollDirection direction); @@ -133,6 +134,7 @@ indicator_sound_class_init (IndicatorSoundClass *klass) io_class->get_image = get_icon; io_class->get_menu = get_menu; io_class->get_accessible_desc = get_accessible_desc; + io_class->get_name_hint = get_name_hint; io_class->entry_scrolled = indicator_sound_scroll; io_class->secondary_activate = indicator_sound_middle_click; } @@ -241,6 +243,10 @@ get_accessible_desc (IndicatorObject * io) return NULL; } +static const gchar * get_name_hint (IndicatorObject * io) +{ + return "indicator-sound"; +} static void connection_changed (IndicatorServiceManager * sm, -- cgit v1.2.3 From 108af6c38c4723a2d911cdb0c980d0b71140164b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Tue, 8 Nov 2011 22:59:16 +0100 Subject: Fix memory leak caused by updating the accessible description value The accessible description string was duplicated every time that was updated, and never free'd. This commit fixes this. --- src/indicator-sound.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/src/indicator-sound.c b/src/indicator-sound.c index ee90647..8e2cb1a 100644 --- a/src/indicator-sound.c +++ b/src/indicator-sound.c @@ -54,6 +54,7 @@ struct _IndicatorSoundPrivate GList* transport_widgets_list; GDBusProxy *dbus_proxy; SoundStateManager* state_manager; + gchar *cached_accessible_desc; }; #define INDICATOR_SOUND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), INDICATOR_SOUND_TYPE, IndicatorSoundPrivate)) @@ -154,6 +155,7 @@ indicator_sound_init (IndicatorSound *self) GList* t_list = NULL; priv->transport_widgets_list = t_list; priv->state_manager = g_object_new (SOUND_TYPE_STATE_MANAGER, NULL); + priv->cached_accessible_desc = NULL; g_signal_connect ( G_OBJECT(self->service), INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE, @@ -170,17 +172,23 @@ indicator_sound_dispose (GObject *object) g_object_unref(G_OBJECT(self->service)); self->service = NULL; } - g_list_free ( priv->transport_widgets_list ); + g_list_free (priv->transport_widgets_list); G_OBJECT_CLASS (indicator_sound_parent_class)->dispose (object); - return; } static void indicator_sound_finalize (GObject *object) { + IndicatorSound * self = INDICATOR_SOUND(object); + IndicatorSoundPrivate* priv = INDICATOR_SOUND_GET_PRIVATE(self); + + if (priv->cached_accessible_desc) { + g_free (priv->cached_accessible_desc); + priv->cached_accessible_desc = NULL; + } + G_OBJECT_CLASS (indicator_sound_parent_class)->finalize (object); - return; } static GtkLabel * @@ -236,16 +244,19 @@ get_accessible_desc (IndicatorObject * io) { IndicatorSoundPrivate* priv = INDICATOR_SOUND_GET_PRIVATE(io); - if (priv->volume_widget != NULL){ - return g_strdup_printf(_("Volume (%'.0f%%)"), volume_widget_get_current_volume(priv->volume_widget)); + if (priv->volume_widget != NULL) { + gchar *old_desc = priv->cached_accessible_desc; + priv->cached_accessible_desc = g_strdup_printf(_("Volume (%'.0f%%)"), volume_widget_get_current_volume (priv->volume_widget)); + g_free (old_desc); + return priv->cached_accessible_desc; } return NULL; } -static const gchar * get_name_hint (IndicatorObject * io) +static const gchar *get_name_hint (IndicatorObject * io) { - return "indicator-sound"; + return PACKAGE_NAME; } static void -- cgit v1.2.3 From f497b26cef11458a013d8ad2189534963a62cf19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Tue, 8 Nov 2011 23:16:35 +0100 Subject: Better code to fix the memory leak caused by the accessible string Now everythig is done on update_accessible_desc --- src/indicator-sound.c | 38 ++++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/src/indicator-sound.c b/src/indicator-sound.c index 8e2cb1a..80d9ce0 100644 --- a/src/indicator-sound.c +++ b/src/indicator-sound.c @@ -54,7 +54,7 @@ struct _IndicatorSoundPrivate GList* transport_widgets_list; GDBusProxy *dbus_proxy; SoundStateManager* state_manager; - gchar *cached_accessible_desc; + gchar *accessible_desc; }; #define INDICATOR_SOUND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), INDICATOR_SOUND_TYPE, IndicatorSoundPrivate)) @@ -155,7 +155,7 @@ indicator_sound_init (IndicatorSound *self) GList* t_list = NULL; priv->transport_widgets_list = t_list; priv->state_manager = g_object_new (SOUND_TYPE_STATE_MANAGER, NULL); - priv->cached_accessible_desc = NULL; + priv->accessible_desc = NULL; g_signal_connect ( G_OBJECT(self->service), INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE, @@ -183,9 +183,9 @@ indicator_sound_finalize (GObject *object) IndicatorSound * self = INDICATOR_SOUND(object); IndicatorSoundPrivate* priv = INDICATOR_SOUND_GET_PRIVATE(self); - if (priv->cached_accessible_desc) { - g_free (priv->cached_accessible_desc); - priv->cached_accessible_desc = NULL; + if (priv->accessible_desc) { + g_free (priv->accessible_desc); + priv->accessible_desc = NULL; } G_OBJECT_CLASS (indicator_sound_parent_class)->finalize (object); @@ -243,15 +243,7 @@ static const gchar * get_accessible_desc (IndicatorObject * io) { IndicatorSoundPrivate* priv = INDICATOR_SOUND_GET_PRIVATE(io); - - if (priv->volume_widget != NULL) { - gchar *old_desc = priv->cached_accessible_desc; - priv->cached_accessible_desc = g_strdup_printf(_("Volume (%'.0f%%)"), volume_widget_get_current_volume (priv->volume_widget)); - g_free (old_desc); - return priv->cached_accessible_desc; - } - - return NULL; + return priv->accessible_desc; } static const gchar *get_name_hint (IndicatorObject * io) @@ -742,7 +734,7 @@ static void indicator_sound_middle_click (IndicatorObject * io, IndicatorObjectEntry * entry, guint time, gpointer data) { - IndicatorSoundPrivate* priv = INDICATOR_SOUND_GET_PRIVATE(INDICATOR_SOUND (io)); + IndicatorSoundPrivate* priv = INDICATOR_SOUND_GET_PRIVATE(io); g_return_if_fail (priv); mute_widget_toggle(priv->mute_widget); @@ -751,9 +743,23 @@ indicator_sound_middle_click (IndicatorObject * io, IndicatorObjectEntry * entry void update_accessible_desc (IndicatorObject * io) { + IndicatorSoundPrivate* priv = INDICATOR_SOUND_GET_PRIVATE(io); GList *entries = indicator_object_get_entries(io); IndicatorObjectEntry * entry = (IndicatorObjectEntry *)entries->data; - entry->accessible_desc = get_accessible_desc(io); + + gchar *old_desc = priv->accessible_desc; + + if (priv->volume_widget) { + priv->accessible_desc = g_strdup_printf(_("Volume (%'.0f%%)"), + volume_widget_get_current_volume (priv->volume_widget)); + } + else { + priv->accessible_desc = NULL; + } + + entry->accessible_desc = priv->accessible_desc; + g_free (old_desc); + g_signal_emit(G_OBJECT(io), INDICATOR_OBJECT_SIGNAL_ACCESSIBLE_DESC_UPDATE_ID, 0, -- cgit v1.2.3