summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xsrc/linux/integration-test2
-rw-r--r--src/linux/up-device-supply.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/linux/integration-test b/src/linux/integration-test
index a7b62c1..b5f5f16 100755
--- a/src/linux/integration-test
+++ b/src/linux/integration-test
@@ -562,7 +562,7 @@ class Tests(unittest.TestCase):
bat0_up = devs[0]
self.assertEqual(self.get_dbus_dev_property(bat0_up, 'Serial'), '123ABC')
- self.assertEqual(self.get_dbus_dev_property(bat0_up, 'Vendor'), ' Batt Inc. ')
+ self.assertEqual(self.get_dbus_dev_property(bat0_up, 'Vendor'), '⍾ Batt Inc. ☢')
self.assertEqual(self.get_dbus_dev_property(bat0_up, 'Model'), 'ABC123')
self.assertEqual(self.get_dbus_dev_property(bat0_up, 'Energy'), 1.5)
self.stop_daemon()
diff --git a/src/linux/up-device-supply.c b/src/linux/up-device-supply.c
index 98536f4..1c82379 100644
--- a/src/linux/up-device-supply.c
+++ b/src/linux/up-device-supply.c
@@ -441,6 +441,9 @@ up_device_supply_make_safe_string (gchar *text)
if (text == NULL)
return;
+ if (g_utf8_validate (text, -1, NULL))
+ return;
+
/* shunt up only safe chars */
for (i=0; text[i] != '\0'; i++) {
if (g_ascii_isprint (text[i])) {