From 865f314dd5ed55508f45a32973b709b79a541e36 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Fri, 11 Dec 2009 03:46:01 +0000
Subject: kdelibs update to Trinity v3.5.11

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1061230 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kutils/Makefile.am        |  2 +-
 kutils/kcmoduleinfo.cpp   |  4 +++-
 kutils/kcmoduleloader.cpp | 20 +++++++++++++++++---
 3 files changed, 21 insertions(+), 5 deletions(-)

(limited to 'kutils')

diff --git a/kutils/Makefile.am b/kutils/Makefile.am
index 2206d798f..4ddda0d83 100644
--- a/kutils/Makefile.am
+++ b/kutils/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES = -I$(top_srcdir)/interfaces/kregexpeditor $(all_includes)
 lib_LTLIBRARIES   = libkutils.la
 libkutils_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2
 # Needs KTrader
-libkutils_la_LIBADD  = ../kio/libkio.la ksettings/libksettings.la
+libkutils_la_LIBADD  = ../kio/libkio.la ksettings/libksettings.la $(LIB_QT) $(top_builddir)/dcop/libDCOP.la $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_X11)
 
 libkutils_la_SOURCES = kfind.cpp kfinddialog.cpp kreplace.cpp \
                        kreplacedialog.cpp kcmoduleinfo.cpp kcmoduleloader.cpp \
diff --git a/kutils/kcmoduleinfo.cpp b/kutils/kcmoduleinfo.cpp
index ababaadba..2de4142d4 100644
--- a/kutils/kcmoduleinfo.cpp
+++ b/kutils/kcmoduleinfo.cpp
@@ -53,7 +53,9 @@ KCModuleInfo::KCModuleInfo()
 
 KCModuleInfo::KCModuleInfo(const QString& desktopFile)
 {
-  init( KService::serviceByStorageId(desktopFile) );
+  KService::Ptr service = KService::serviceByStorageId(desktopFile);
+  if(!service) setName(desktopFile);
+  init(service);
 }
 
 KCModuleInfo::KCModuleInfo( KService::Ptr moduleInfo )
diff --git a/kutils/kcmoduleloader.cpp b/kutils/kcmoduleloader.cpp
index 24a5fa8b3..0cc06d25f 100644
--- a/kutils/kcmoduleloader.cpp
+++ b/kutils/kcmoduleloader.cpp
@@ -128,9 +128,23 @@ KCModule* KCModuleLoader::loadModule(const KCModuleInfo &mod, ErrorReporting rep
 
   if ( !mod.service() )
   {
-    return reportError( report,
-        i18n("The module %1 could not be found.")
-        .arg( mod.moduleName() ), i18n("<qt><p>The diagnostics is:<br>The desktop file %1 could not be found.</qt>").arg(mod.fileName()), parent );
+    if ( mod.moduleName() == "kcmlisa" || mod.moduleName() == "kcmkiolan" )
+    {
+      return reportError( report,
+          i18n("The module %1 could not be found.")
+          .arg( mod.moduleName() ),
+          i18n("<qt><p>The Lisa and lan:/ ioslave modules "
+            "are not installed by default in Kubuntu, because they are obsolete "
+            "and replaced by zeroconf.<br> If you still wish to use them, you "
+            "should install the lisa package from the Universe repository.</p></qt>"),
+          parent );
+    } else { 
+      return reportError( report,
+          i18n("The module %1 could not be found.")
+          .arg( mod.moduleName() ),
+          i18n("<qt><p>The diagnostics is:<br>The desktop file %1 could not be found.</p></qt>").arg(mod.fileName()),
+          parent );
+    }
   }
 
   if (!mod.library().isEmpty())
-- 
cgit v1.2.1