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

3 files changed, 3 insertions, 2 deletions

diff --git a/filesharing/simple/controlcenter.ui b/filesharing/simple/controlcenter.ui
index eea9166e..5c635392 100644
--- a/filesharing/simple/controlcenter.ui
+++ b/filesharing/simple/controlcenter.ui
@@ -24,7 +24,7 @@
                 <cstring>infoLbl</cstring>
             </property>
             <property name="margin">
-                <number>11</number>
+                <number>5</number>
             </property>
             <property name="text">
                 <string>SMB and NFS servers are not installed on this machine, to enable this module the servers must be installed.</string>
diff --git a/filesharing/simple/fileshare.cpp b/filesharing/simple/fileshare.cpp
index a0c5bb06..a92f1f67 100644
--- a/filesharing/simple/fileshare.cpp
+++ b/filesharing/simple/fileshare.cpp
@@ -87,6 +87,7 @@ KFileShareConfig::KFileShareConfig(QWidget *parent, const char *name, const QStr
 
   if ( nfsExec.isEmpty() && sambaExec.isEmpty())
   {
+      QMessageBox::critical( 0, "File Sharing", QString("SMB and NFS servers are not installed on this machine, to enable this module the servers must be installed."));
       m_ccgui->shareGrp->setDisabled(true);
       m_ccgui->sharedFoldersGroupBox->setDisabled(true);
   }
diff --git a/filesharing/simple/fileshare.desktop b/filesharing/simple/fileshare.desktop
index 6ed8dd8b..95913427 100644
--- a/filesharing/simple/fileshare.desktop
+++ b/filesharing/simple/fileshare.desktop
@@ -166,4 +166,4 @@ Keywords[tr]=Paylaş
 Keywords[uk]=Спільний ресурс
 Keywords[zh_CN]=Share,共享
 
-Categories=Qt;KDE;X-KDE-settings-network;Settings;
+Categories=Qt;KDE;X-KDE-settings-network;