aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJavier Jardón <javier.jardon@codethink.co.uk>2011-06-30 11:01:24 +0100
committerJavier Jardón <javier.jardon@codethink.co.uk>2011-06-30 11:01:24 +0100
commit59ac588036c48a8232366deb56e9f80a830d61df (patch)
treeee92bf93a4bd02a6e70f53c16dd1ecacc58aa881 /src
parent363df287e4f74e65a7be71c0c4e689d348cdaa11 (diff)
downloadayatana-indicator-power-59ac588036c48a8232366deb56e9f80a830d61df.tar.gz
ayatana-indicator-power-59ac588036c48a8232366deb56e9f80a830d61df.tar.bz2
ayatana-indicator-power-59ac588036c48a8232366deb56e9f80a830d61df.zip
Use device_icon name consistently
Diffstat (limited to 'src')
-rw-r--r--src/indicator-power.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/indicator-power.c b/src/indicator-power.c
index 573c321..3bbf88c 100644
--- a/src/indicator-power.c
+++ b/src/indicator-power.c
@@ -169,8 +169,7 @@ get_primary_device_cb (GObject *source_object,
GError *error = NULL;
const gchar *title = NULL;
gchar *details = NULL;
- gchar *display_string = NULL;
- gchar *icon_name = NULL;
+ gchar *device_icon = NULL;
gchar *object_path = NULL;
gdouble percentage;
guint64 time;
@@ -190,7 +189,7 @@ get_primary_device_cb (GObject *source_object,
"((susdut))",
&object_path,
&kind,
- &display_string,
+ &device_icon,
&percentage,
&state,
&time);
@@ -198,7 +197,7 @@ get_primary_device_cb (GObject *source_object,
g_debug ("got data from object %s", object_path);
/* set icon */
- priv->status_image = indicator_image_helper (icon_name);
+ priv->status_image = indicator_image_helper (device_icon);
gtk_widget_show (GTK_WIDGET (priv->status_image));
/* get the title
@@ -260,10 +259,9 @@ get_primary_device_cb (GObject *source_object,
}
g_free (details);
- g_free (display_string);
+ g_free (device_icon);
g_free (time_string);
g_free (object_path);
- g_free (icon_name);
g_variant_unref (result);
}