From 8e0baaf0e28ba90a464f487a2278174765164396 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Mon, 9 Apr 2012 14:10:51 -0500 Subject: if possible, set the device menuitems' accessible names. --- src/indicator-power.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src') diff --git a/src/indicator-power.c b/src/indicator-power.c index 6140c54..46adde7 100644 --- a/src/indicator-power.c +++ b/src/indicator-power.c @@ -561,6 +561,7 @@ menu_add_device (GtkMenu *menu, gchar *short_details = NULL; gchar *details = NULL; gchar *accessible_name = NULL; + AtkObject *atk_object; if (device == NULL) return; @@ -590,6 +591,9 @@ menu_add_device (GtkMenu *menu, /* Create menu item */ item = gtk_image_menu_item_new (); + atk_object = gtk_widget_get_accessible(item); + if (atk_object != NULL) + g_object_set (G_OBJECT(atk_object), "accessible-name", accessible_name, NULL); grid = gtk_grid_new (); gtk_grid_set_column_spacing (GTK_GRID (grid), 6); -- cgit v1.2.3 From 6305fe39d22fed20516756f53168c73b9383a4f3 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Mon, 9 Apr 2012 14:13:25 -0500 Subject: leak fix 1 of 3: don't leak object_path and device_icon if kind == UP_DEVICE_KIND_LINE_POWER --- src/indicator-power.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/indicator-power.c b/src/indicator-power.c index 46adde7..4b3f85c 100644 --- a/src/indicator-power.c +++ b/src/indicator-power.c @@ -510,7 +510,7 @@ static GIcon* get_device_icon (UpDeviceKind kind, UpDeviceState state, guint64 time_sec, - gchar *device_icon) + const gchar *device_icon) { GIcon *gicon; @@ -553,8 +553,8 @@ menu_add_device (GtkMenu *menu, GtkWidget *details_label; GtkWidget *grid; GIcon *device_gicons; - gchar *device_icon = NULL; - gchar *object_path = NULL; + const gchar *device_icon = NULL; + const gchar *object_path = NULL; gdouble percentage; guint64 time; const gchar *device_name; @@ -567,7 +567,7 @@ menu_add_device (GtkMenu *menu, return; g_variant_get (device, - "(susdut)", + "(&su&sdut)", &object_path, &kind, &device_icon, @@ -611,8 +611,6 @@ menu_add_device (GtkMenu *menu, g_free (short_details); g_free (details); g_free (accessible_name); - g_free (device_icon); - g_free (object_path); } static gsize -- cgit v1.2.3 From 7a5b5a693c25cac5ca547d4e0f834c017cacf837 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Mon, 9 Apr 2012 14:14:20 -0500 Subject: leak fix 2 of 3: fix leaky fallback GIcon in get_device_icon() --- src/indicator-power.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/indicator-power.c b/src/indicator-power.c index 4b3f85c..9a474bd 100644 --- a/src/indicator-power.c +++ b/src/indicator-power.c @@ -512,9 +512,7 @@ get_device_icon (UpDeviceKind kind, guint64 time_sec, const gchar *device_icon) { - GIcon *gicon; - - gicon = g_icon_new_for_string (device_icon, NULL); + GIcon *gicon = NULL; if (kind == UP_DEVICE_KIND_BATTERY && (state == UP_DEVICE_STATE_FULLY_CHARGED || @@ -538,6 +536,9 @@ get_device_icon (UpDeviceKind kind, } } + if (gicon == NULL) + gicon = g_icon_new_for_string (device_icon, NULL); + return gicon; } -- cgit v1.2.3 From 45bc12d01cb4b692f55f6bb4cf4fd663e17d34fc Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Mon, 9 Apr 2012 14:16:07 -0500 Subject: leak fix 3 of 3: don't leak the GIcons returned by get_device_icon() --- src/indicator-power.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src') diff --git a/src/indicator-power.c b/src/indicator-power.c index 9a474bd..19eff87 100644 --- a/src/indicator-power.c +++ b/src/indicator-power.c @@ -585,6 +585,7 @@ menu_add_device (GtkMenu *menu, device_gicons = get_device_icon (kind, state, time, device_icon); icon = gtk_image_new_from_gicon (device_gicons, GTK_ICON_SIZE_SMALL_TOOLBAR); + g_clear_object (&device_gicons); device_name = device_kind_to_localised_string (kind); @@ -811,6 +812,7 @@ put_primary_device (IndicatorPower *self, gtk_image_set_from_gicon (self->status_image, device_gicons, GTK_ICON_SIZE_LARGE_TOOLBAR); + g_clear_object (&device_gicons); gtk_widget_show (GTK_WIDGET (self->status_image)); -- cgit v1.2.3 From a24e06c3bc23d2b929f1738f2cfe9b660b9bde04 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Mon, 9 Apr 2012 14:32:39 -0500 Subject: use atk_object_set_name(foo,bar)" instead of g_object_set(foo,"accessible-name",bar,NULL)" --- src/indicator-power.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/indicator-power.c b/src/indicator-power.c index 19eff87..5d37da3 100644 --- a/src/indicator-power.c +++ b/src/indicator-power.c @@ -595,7 +595,7 @@ menu_add_device (GtkMenu *menu, item = gtk_image_menu_item_new (); atk_object = gtk_widget_get_accessible(item); if (atk_object != NULL) - g_object_set (G_OBJECT(atk_object), "accessible-name", accessible_name, NULL); + atk_object_set_name (atk_object, accessible_name); grid = gtk_grid_new (); gtk_grid_set_column_spacing (GTK_GRID (grid), 6); -- cgit v1.2.3