aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSebastien Bacher <seb128@ubuntu.com>2012-10-03 21:25:19 +0200
committerSebastien Bacher <seb128@ubuntu.com>2012-10-03 21:25:19 +0200
commit0fa9b264b7d79f9bb303b9383379635bb293cf3d (patch)
tree7d96d9ebf8662e55078d0d323a92ddae65b95ce8 /src
parentc752cbea418bf5f85a0498fe3771439e1b70c394 (diff)
parent3a0758a29fdae434142e1a67329ff2b65fee3c6b (diff)
downloadayatana-indicator-power-0fa9b264b7d79f9bb303b9383379635bb293cf3d.tar.gz
ayatana-indicator-power-0fa9b264b7d79f9bb303b9383379635bb293cf3d.tar.bz2
ayatana-indicator-power-0fa9b264b7d79f9bb303b9383379635bb293cf3d.zip
Import upstream version 12.10.2
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.in2
-rw-r--r--src/device.c5
-rw-r--r--src/indicator-power.c1
3 files changed, 5 insertions, 3 deletions
diff --git a/src/Makefile.in b/src/Makefile.in
index a454e5b..baaf794 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.5 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/src/device.c b/src/device.c
index c22aae8..898e18f 100644
--- a/src/device.c
+++ b/src/device.c
@@ -25,7 +25,7 @@ License along with this library. If not, see
#include "config.h"
#endif
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
#include "device.h"
@@ -390,8 +390,9 @@ indicator_power_device_get_icon_names (const IndicatorPowerDevice * device)
suffix_str = get_device_icon_suffix (percentage);
index_str = get_device_icon_index (percentage);
- g_ptr_array_add (names, g_strdup_printf ("battery-%s-symbolic", suffix_str));
+ g_ptr_array_add (names, g_strdup_printf ("%s-%s", kind_str, index_str));
g_ptr_array_add (names, g_strdup_printf ("gpm-%s-%s", kind_str, index_str));
+ g_ptr_array_add (names, g_strdup_printf ("battery-%s-symbolic", suffix_str));
g_ptr_array_add (names, g_strdup_printf ("battery-%s", suffix_str));
break;
diff --git a/src/indicator-power.c b/src/indicator-power.c
index f3a7235..9829839 100644
--- a/src/indicator-power.c
+++ b/src/indicator-power.c
@@ -508,6 +508,7 @@ get_image (IndicatorObject *io)
gicon = g_themed_icon_new (DEFAULT_ICON);
priv->status_image = GTK_IMAGE (gtk_image_new_from_gicon (gicon,
GTK_ICON_SIZE_LARGE_TOOLBAR));
+ g_object_unref (gicon);
}
return priv->status_image;