Merge lp:~ken-vandine/ubuntu-system-settings/rtm-1387834 into lp:ubuntu-system-settings/rtm-14.09

[Ken VanDine]

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

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

[Sebastien Bacher (seb128)]

Thanks

review: Approve

[Sebastien Bacher (seb128)]

seems like we are not doing more rtm landing, so cleaning the list a bit, that one is rather going to be including with the vivid rebase

Unmerged revisions

940. By Ken VanDine on 2014-11-18

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

=== modified file 'plugins/about/click.cpp'
--- plugins/about/click.cpp	2014-09-25 13:11:09 +0000
+++ plugins/about/click.cpp	2014-11-18 19:46:48 +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-11-18 19:46:48 +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();