[Xfce4-commits] [xfce/xfce4-power-manager] 13/64: Fix memory leaks, add sane defaults for panel icon

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository xfce/xfce4-power-manager.

commit 88d0e279fb199fee222bb6f43b8b2262222bbae3
Author: Eric Koegel <eric.koegel at gmail.com>
Date:   Fri May 2 09:10:52 2014 +0300

    Fix memory leaks, add sane defaults for panel icon
---
 panel-plugins/battery/battery-button.c |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/panel-plugins/battery/battery-button.c b/panel-plugins/battery/battery-button.c
index 28b9ea7..eedd2dd 100644
--- a/panel-plugins/battery/battery-button.c
+++ b/panel-plugins/battery/battery-button.c
@@ -543,6 +543,7 @@ device_changed_cb (UpDevice *device, BatteryButton *button)
     if ( type == UP_DEVICE_KIND_LINE_POWER )
     {
 	/* Update the panel icon */
+	g_free(button->priv->panel_icon_name);
 	button->priv->panel_icon_name = icon_name;
 	battery_button_set_icon (button);
     }
@@ -599,6 +600,7 @@ battery_button_add_device (UpDevice *device, BatteryButton *button)
 	gtk_list_store_prepend (list_store, &iter);
 
 	/* Update the panel icon */
+	g_free(button->priv->panel_icon_name);
 	button->priv->panel_icon_name = icon_name;
 	battery_button_set_icon (button);
     }
@@ -613,9 +615,6 @@ battery_button_add_device (UpDevice *device, BatteryButton *button)
 			COL_OBJ_SIGNAL_ID, signal_id,
 			COL_OBJ_DEVICE_POINTER, device,
 			-1);
-
-    if ( pix )
-	g_object_unref (pix);
 }
 
 static void
@@ -786,6 +785,8 @@ battery_button_init (BatteryButton *button)
     gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
 
     button->priv->upower  = up_client_new ();
+    button->priv->panel_icon_name = g_strdup(XFPM_AC_ADAPTER_ICON);
+    button->priv->panel_icon_width = 24;
 
     g_signal_connect (button->priv->upower, "device-added", G_CALLBACK (device_added_cb), button);
     g_signal_connect (button->priv->upower, "device-removed", G_CALLBACK (device_removed_cb), button);
@@ -798,6 +799,8 @@ battery_button_finalize (GObject *object)
 
     button = BATTERY_BUTTON (object);
 
+    g_free(button->priv->panel_icon_name);
+
     g_signal_handlers_disconnect_by_data (button->priv->upower, button);
 
     g_object_unref (button->priv->plugin);
@@ -818,6 +821,8 @@ battery_button_set_icon (BatteryButton *button)
 {
     GdkPixbuf *pixbuf;
 
+    DBG("icon_width %d", button->priv->panel_icon_width);
+
     pixbuf = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
                                        button->priv->panel_icon_name,
                                        button->priv->panel_icon_width,

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.