diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2012-10-03 21:26:45 +0200 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2012-10-03 21:26:45 +0200 |
| commit | c30284384fe3a08bfa1eb8afdddf4ce03784d330 (patch) | |
| tree | b0bd0d1ac1b6302332f6057042a3d78c21d3978b /src | |
| parent | 938cb5db1032167f0ffdf777afd617adba0e5e9e (diff) | |
| parent | 0fa9b264b7d79f9bb303b9383379635bb293cf3d (diff) | |
| download | ayatana-indicator-power-c30284384fe3a08bfa1eb8afdddf4ce03784d330.tar.gz ayatana-indicator-power-c30284384fe3a08bfa1eb8afdddf4ce03784d330.tar.bz2 ayatana-indicator-power-c30284384fe3a08bfa1eb8afdddf4ce03784d330.zip | |
* New upstream release.
- Show a more accurate view of discharging batteries (LP: #1054146)
- Fix a GIcon memory leak
- In device.c, include gi18n-lib.h instead of gi18n.h
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.in | 2 | ||||
| -rw-r--r-- | src/device.c | 3 | ||||
| -rw-r--r-- | src/indicator-power.c | 1 |
3 files changed, 4 insertions, 2 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 078c7a4..898e18f 100644 --- a/src/device.c +++ b/src/device.c @@ -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; |