diff options
| author | Didier Roche <didier.roche@canonical.com> | 2012-09-20 11:04:39 +0200 |
|---|---|---|
| committer | Didier Roche <didier.roche@canonical.com> | 2012-09-20 11:04:39 +0200 |
| commit | 002ce2099a561f1800db82db39633e018228995b (patch) | |
| tree | 875a383f8dbed47ebf9f1c0bb23c0cd8be4312ca | |
| parent | d90c644ebb0bccdc2ce7ea89aa3f8dd01fee575e (diff) | |
| parent | a94288f2040965815eb2345b940a736632a06aaa (diff) | |
| download | ayatana-indicator-power-002ce2099a561f1800db82db39633e018228995b.tar.gz ayatana-indicator-power-002ce2099a561f1800db82db39633e018228995b.tar.bz2 ayatana-indicator-power-002ce2099a561f1800db82db39633e018228995b.zip | |
* Cherry-pick:
- Ensure the power indicator string translations are loaded. Thanks lars
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | src/device.c | 2 | ||||
| -rw-r--r-- | tests/test-device.cc | 9 |
3 files changed, 14 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index b08c8c8..7ed7637 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-power (12.10.1-0ubuntu2) UNRELEASED; urgency=low + + * Cherry-pick: + - Ensure the power indicator string translations are loaded. Thanks lars + + -- Didier Roche <didrocks@ubuntu.com> Thu, 20 Sep 2012 11:03:45 +0200 + indicator-power (12.10.1-0ubuntu1) quantal; urgency=low * New upstream release. diff --git a/src/device.c b/src/device.c index c22aae8..078c7a4 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" diff --git a/tests/test-device.cc b/tests/test-device.cc index 2c88ea1..728010d 100644 --- a/tests/test-device.cc +++ b/tests/test-device.cc @@ -252,9 +252,12 @@ TEST_F(DeviceTest, IconNames) g_object_set (o, INDICATOR_POWER_DEVICE_KIND, UP_DEVICE_KIND_BATTERY, INDICATOR_POWER_DEVICE_STATE, UP_DEVICE_STATE_FULLY_CHARGED, NULL); - check_icon_names (device, "battery-full-charged-symbolic;battery-full-charging-symbolic;" - "gpm-battery-full;gpm-battery-100;" - "battery-full-charged;battery-full-charging"); + check_icon_names (device, "battery-full-charged-symbolic;" + "battery-full-charging-symbolic;" + "gpm-battery-full;" + "gpm-battery-100;" + "battery-full-charged;" + "battery-full-charging"); // charging battery, 95% g_object_set (o, INDICATOR_POWER_DEVICE_KIND, UP_DEVICE_KIND_BATTERY, |