[nemo-commits] [CE BOSS] SR#7763 waiting for review

[boss_no_reply]

I have made the following changes intended for :
  CE:MW:Shared / ssu

Please review and accept or decline.
BOSS has already run some checks on this request.
See the "Messages from BOSS" section below.

https://build.pub.meego.com//request/show/7763

Thank You,
aard

[This message was auto-generated]

---

Request # 7763:

Messages from BOSS:

State: review at 2013-01-29T13:12:21 by bossbot

Reviews:
       accepted by bossbot : Prechecks succeeded.
       new for CE-maintainers : Please replace this text with a review and 
approve/reject the review (not the SR). BOSS will take care of the rest

Changes:
  submit: home:aard:branches:CE:MW:Shared / ssu -> CE:MW:Shared / ssu
  
changes files:
--------------
--- ssu.changes
+++ ssu.changes
@@ -0,0 +1,3 @@
+* Tue Jan 29 2013 Bernd Wachter <bernd.wach...@jollamobile.com> - 0.19
+- Use default domain values if no domain-specific values exist
+

old:
----
  ssu-0.18.tar.gz

new:
----
  ssu-0.19.tar.gz

spec files:
-----------
--- ssu.spec
+++ ssu.spec
@@ -1,5 +1,5 @@
 Name: ssu
-Version: 0.18
+Version: 0.19
 Release: 1
 Summary: SSU enabler for RND
 Group: System/Base

other changes:
--------------

++++++ ssu-0.18.tar.gz -> ssu-0.19.tar.gz
--- libssu/ssu.cpp
+++ libssu/ssu.cpp
@@ -370,17 +370,24 @@
   repoParameters.insert("deviceModel", deviceModel());
 
   // Domain variables
+  // first read all variables from default-domain
+  repoSettings->beginGroup("default-domain");
+  QStringList defKeys = repoSettings->allKeys();
+  foreach (const QString &key, defKeys){
+      repoParameters.insert(key, repoSettings->value(key).toString());
+  }
+  repoSettings->endGroup();
+  // then overwrite with domain specific things if that block is available
   QString domainSection = domain() + "-domain";
   QStringList sections = repoSettings->childGroups();
-  if (sections.contains(domainSection))
+  if (sections.contains(domainSection)){
     repoSettings->beginGroup(domainSection);
-  else
-    repoSettings->beginGroup("default-domain");
-  QStringList domainKeys = repoSettings->allKeys();
-  foreach (const QString &key, domainKeys){
+    QStringList domainKeys = repoSettings->allKeys();
+    foreach (const QString &key, domainKeys){
       repoParameters.insert(key, repoSettings->value(key).toString());
+    }
+    repoSettings->endGroup();
   }
-  repoSettings->endGroup();
 
   if (settings->contains("repository-urls/" + repoName))
     r = settings->value("repository-urls/" + repoName).toString();