aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDidier Roche <didier.roche@canonical.com>2012-11-16 13:21:47 +0100
committerDidier Roche <didier.roche@canonical.com>2012-11-16 13:21:47 +0100
commitc9912e105e53e26e3995d8ecdc62f6f2e69e8b8c (patch)
tree865f3a4ade72a3886d8926c4f52d2c6c989175d4
parent378d1e111c552c984c38be1a3e74c124c5401c3e (diff)
downloadayatana-indicator-power-c9912e105e53e26e3995d8ecdc62f6f2e69e8b8c.tar.gz
ayatana-indicator-power-c9912e105e53e26e3995d8ecdc62f6f2e69e8b8c.tar.bz2
ayatana-indicator-power-c9912e105e53e26e3995d8ecdc62f6f2e69e8b8c.zip
report accidently revert fixes when inline packaging was merged in
-rw-r--r--NEWS11
-rw-r--r--configure.ac2
-rw-r--r--src/device.c4
3 files changed, 16 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index ff89f0e..255db6f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,14 @@
+12.10.5
+ - Fix a device display bug introduced in 12.10.3 (LP: #1075192)
+
+12.10.4
+ - Fix primary device selection bug introduced in 12.10.3 (LP: #1071757)
+
+12.10.3
+ - Show the proper icon for mice and ups devices. (LP: #1066208)
+ - Follow the spec when choosing the primary device (LP: #1071645)
+ - Fix minor memory leaks
+
12.10.2
- Show a more accurate view of discharging batteries (LP: #1054146)
- Fix a GIcon memory leak
diff --git a/configure.ac b/configure.ac
index 384e007..f4ada8a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_INIT([indicator-power],
- [12.10.2],
+ [12.10.6],
[http://bugs.launchpad.net/indicator-power],
[indicator-power],
[http://launchpad.net/indicator-power])
diff --git a/src/device.c b/src/device.c
index d028ab7..6f2a809 100644
--- a/src/device.c
+++ b/src/device.c
@@ -532,6 +532,10 @@ device_kind_to_localised_string (UpDeviceKind kind)
/* TRANSLATORS: unknown device */
text = _("Unknown");
break;
+ case UP_DEVICE_KIND_UNKNOWN:
+ /* TRANSLATORS: unknown device */
+ text = _("Unknown");
+ break;
default:
g_warning ("enum unrecognised: %i", kind);
text = up_device_kind_to_string (kind);