Merge lp:~seb128/ubuntu-system-settings/storage-correct-ini-info into lp:ubuntu-system-settings

[Sebastien Bacher]

[storage] build the correct ini name rather than guessing it

[storage] build the correct ini name rather than guessing it

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1164
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/1715/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6346
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4243
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/907
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5953
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7598
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7598/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15258
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3599
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4635
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4635/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Ken VanDine (ken-vandine)]

Looks good!

review: Approve

=== modified file 'plugins/about/click.cpp'
--- plugins/about/click.cpp	2014-09-25 13:11:09 +0000
+++ plugins/about/click.cpp	2014-10-31 08:44:23 +0000
@@ -45,7 +45,8 @@
  */
 void ClickModel::populateFromDesktopOrIniFile (Click *newClick,
                                                QVariantMap hooks,
-                                               QDir directory)
+                                               QDir directory,
+                                               QString name)
 {
     QVariantMap appHooks;
     GKeyFile *appinfo = g_key_file_new();
@@ -69,17 +70,13 @@
             {
                 keyGroup = "ScopeConfig";
                 keyName = "DisplayName";
-
-                QDir scopeDirectory(
-                            directory.absoluteFilePath(appHooks.value("scope", "").toString()));
-                scopeDirectory.setNameFilters(QStringList()<<"*.ini");
-
-                QStringList iniEntry(scopeDirectory.entryList());
-
-                if (iniEntry.isEmpty())
-                    goto out;
-
-                QFile desktopOrIniFile(scopeDirectory.absoluteFilePath(iniEntry[0]));
+                QString scope(appHooks.value("scope", "").toString());
+
+                QDir scopeDirectory(directory.absoluteFilePath(scope));
+
+                /* the config is 'name_scope.ini' */
+                QFile desktopOrIniFile(scopeDirectory.absoluteFilePath(
+                                           name + "_" + scope + ".ini"));
                 desktopOrIniFileName =
                         g_strdup(desktopOrIniFile.fileName().toLocal8Bit().constData());
                 if (!desktopOrIniFile.exists())
@@ -193,7 +190,8 @@
     if (hooks.isValid()) {
         QVariantMap allHooks(hooks.toMap());
         // The desktop or ini file contains an icon and the display name
-        populateFromDesktopOrIniFile(&newClick, allHooks, directory);
+        populateFromDesktopOrIniFile(&newClick, allHooks, directory,
+                                     manifest.value("name", "").toString());
    }
 
     newClick.installSize = manifest.value("installed-size",
 
=== modified file 'plugins/about/click.h'
--- plugins/about/click.h	2014-09-25 11:17:42 +0000
+++ plugins/about/click.h	2014-10-31 08:44:23 +0000
@@ -58,7 +58,8 @@
 private:
     void populateFromDesktopOrIniFile(Click *newClick,
                                       QVariantMap hooks,
-                                      QDir directory);
+                                      QDir directory,
+                                      QString name);
     Click buildClick(QVariantMap manifest);
     QList<Click> buildClickList();