Merge lp:~seb128/ubuntu-system-settings/security-trust-localized-names into lp:ubuntu-system-settings

[Sebastien Bacher]

[security] get localized application names from the trust-store

[security] get localized application names from the trust-store

use glib api for that since qt/qsettings don't seem to support that feature, and it's better to use a tested and supported glib function than doing a custom implementation around qt

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1080
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1568/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5233/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3811/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/760/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6485/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4122/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1568/rebuild

review: Needs Fixing (continuous-integration)

[Alberto Mardegan (mardy)]

Just a few comments, but otherwise it looks good!

By the way, do we have a dependency on libglib2.0-dev in debian/control? (we might not need it, if we already depend on some library which depend on it)

review: Needs Fixing

[Alberto Mardegan (mardy)]

Oh, and please remove the QSettings #include.

[lp:~seb128/ubuntu-system-settings/security-trust-localized-names]

1081. By Sebastien Bacher on 2014-09-29

indentation and spacing

1082. By Sebastien Bacher on 2014-09-29

Use QString::fromUtf8 as recommended in the review

[Sebastien Bacher (seb128)]

> Just a few comments, but otherwise it looks good!

thanks, addressed those

> By the way, do we have a dependency on libglib2.0-dev in debian/control?

yes we do, quite some of the backends use glib or glib based libraries

> Oh, and please remove the QSettings #include.

done as well

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1082
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1573/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5264/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3822/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/765/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6516/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4133/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1573/rebuild

review: Needs Fixing (continuous-integration)

[lp:~seb128/ubuntu-system-settings/security-trust-localized-names]

1083. By Sebastien Bacher on 2014-09-29

some extra spacing tweak

1084. By Sebastien Bacher on 2014-09-29

update the cmakelist to fix build issue

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1084
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1574/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5271
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3823
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/766
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4993
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6523
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6523/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13866
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3206
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4134
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4134/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/1574/rebuild

review: Needs Fixing (continuous-integration)

[Sebastien Bacher (seb128)]

the CI errors seem to have nothing to do with those changes (they are in the phone/sim section)

[Ken VanDine (ken-vandine)]

Looks good

review: Approve

[Alberto Mardegan (mardy)]

review: Approve

=== modified file 'plugins/security-privacy/CMakeLists.txt'
--- plugins/security-privacy/CMakeLists.txt	2014-08-27 05:19:24 +0000
+++ plugins/security-privacy/CMakeLists.txt	2014-09-29 11:03:33 +0000
@@ -47,6 +47,7 @@
 include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
     ${TRUST_STORE_INCLUDE_DIRS}
+    ${GLIB_INCLUDE_DIRS}
 )
 
 set(PLUG_DIR ${PLUGIN_PRIVATE_MODULE_DIR}/Ubuntu/SystemSettings/SecurityPrivacy)
@@ -54,6 +55,7 @@
     uss-accountsservice
     ${ACCOUNTSSERVICE_LDFLAGS}
     ${TRUST_STORE_LDFLAGS}
+    ${GLIB_LDFLAGS}
 )
 install(TARGETS UbuntuSecurityPrivacyPanel UbuntuSecurityPrivacyHelper DESTINATION ${PLUG_DIR})
 install(FILES qmldir DESTINATION ${PLUG_DIR})

=== modified file 'plugins/security-privacy/trust-store-model.cpp'
--- plugins/security-privacy/trust-store-model.cpp	2014-09-04 14:04:22 +0000
+++ plugins/security-privacy/trust-store-model.cpp	2014-09-29 11:03:33 +0000
@@ -25,12 +25,13 @@
 #include <QList>
 #include <QMap>
 #include <QSet>
-#include <QSettings>
 #include <QStandardPaths>
 
 #include <core/trust/resolve.h>
 #include <core/trust/store.h>
 
+#include <glib.h>
+
 class Application
 {
 public:
@@ -39,12 +40,41 @@
     void setId(const QString &id) {
         this->id = id;
 
+        GKeyFile *desktopInfo = g_key_file_new();
         QString desktopFilename = resolveDesktopFilename(id);
-        QSettings desktopFile(desktopFilename, QSettings::IniFormat);
-        desktopFile.beginGroup("Desktop Entry");
-        displayName = desktopFile.value("Name").toString();
-        iconName = resolveIcon(desktopFile.value("Icon").toString(),
-                               desktopFile.value("Path").toString());
+
+        gboolean loaded = g_key_file_load_from_file(desktopInfo,
+                                                    desktopFilename.toUtf8().data(),
+                                                    G_KEY_FILE_NONE,
+                                                    nullptr);
+
+        if (!loaded) {
+            g_warning("Couldn't parse the desktop: %s", desktopFilename.toUtf8().data());
+            g_key_file_free(desktopInfo);
+            return;
+        }
+
+        gchar *name = g_key_file_get_locale_string(desktopInfo,
+                                                   G_KEY_FILE_DESKTOP_GROUP,
+                                                   G_KEY_FILE_DESKTOP_KEY_NAME,
+                                                   nullptr,
+                                                   nullptr);
+        displayName = QString::fromUtf8(name);
+
+        gchar *icon = g_key_file_get_string(desktopInfo,
+                                            G_KEY_FILE_DESKTOP_GROUP,
+                                            G_KEY_FILE_DESKTOP_KEY_ICON,
+                                            nullptr);
+        gchar *path = g_key_file_get_string(desktopInfo,
+                                            G_KEY_FILE_DESKTOP_GROUP,
+                                            G_KEY_FILE_DESKTOP_KEY_PATH,
+                                            nullptr);
+        iconName = resolveIcon(QString::fromUtf8(icon),
+                               QString::fromUtf8(path));
+        g_free(name);
+        g_free(icon);
+        g_free(path);
+        g_key_file_free(desktopInfo);
     }
 
     QString resolveDesktopFilename(const QString &id) {

=== modified file 'tests/plugins/security-privacy/CMakeLists.txt'
--- tests/plugins/security-privacy/CMakeLists.txt	2014-08-18 07:50:41 +0000
+++ tests/plugins/security-privacy/CMakeLists.txt	2014-09-29 11:03:33 +0000
@@ -1,11 +1,11 @@
 set(XVFB_CMD xvfb-run -a -s "-screen 0 640x480x24")
-include_directories(${CMAKE_CURRENT_BINARY_DIR} ../../../plugins/security-privacy)
+include_directories(${CMAKE_CURRENT_BINARY_DIR} ../../../plugins/security-privacy ${GLIB_INCLUDE_DIRS})
 add_definitions(-DTESTS)
 
 add_executable(tst-trust-store-model
     tst_trust_store_model.cpp
     ../../../plugins/security-privacy/trust-store-model.cpp
 )
-
+target_link_libraries (tst-trust-store-model ${GLIB_LDFLAGS})
 qt5_use_modules(tst-trust-store-model Core Gui DBus Qml Test)
 add_test(NAME tst-trust-store-model COMMAND ${XVFB_CMD} ${CMAKE_CURRENT_BINARY_DIR}/tst-trust-store-model)