Update to Trinity 3.5.11

Will need to watch for commit warnings and rebuild test

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1061808 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

2 files changed, 6 insertions, 1 deletions

diff --git a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.desktop b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.desktop
index f180d216..385a8636 100644
--- a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.desktop
+++ b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.desktop
@@ -11,7 +11,7 @@ X-KDE-SubstituteUID=false
 X-KDE-HasReadOnlyMode=true
 X-KDE-RootOnly=true
 X-KDE-ParentApp=kcontrol
-Categories=Qt;KDE;X-KDE-settings-network;Settings;
+Categories=Qt;KDE;X-KDE-settings-network;
 OnlyShowIn=KDE;
 
 Comment=A module to configure shares for Microsoft Windows
diff --git a/filesharing/advanced/kcm_sambaconf/sambashare.cpp b/filesharing/advanced/kcm_sambaconf/sambashare.cpp
index b30d7db7..6627d761 100644
--- a/filesharing/advanced/kcm_sambaconf/sambashare.cpp
+++ b/filesharing/advanced/kcm_sambaconf/sambashare.cpp
@@ -128,6 +128,11 @@ QString SambaShare::getGlobalValue(const QString & name, bool defaultValue)
 **/
 QString SambaShare::getSynonym(const QString & name) const
 {
+
+  // idmap config is an exception and shouldn't be set to lower
+  QString sname = name.left(12).stripWhiteSpace();
+  if ( sname == "idmap config" ) return name;
+
   QString lname = name.lower().stripWhiteSpace();
 
   if (lname == "browsable") return "browseable";