[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepim/libkdepim
From:       Tobias Koenig <tokoe () kde ! org>
Date:       2010-12-07 12:41:26
Message-ID: 20101207124126.284CDAC8A5 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1204469 by tokoe:

Do not start LDAP queries when no network is available


 M  +1 -1      CMakeLists.txt  
 M  +6 -0      addresseelineedit.cpp  


--- trunk/KDE/kdepim/libkdepim/CMakeLists.txt #1204468:1204469
@@ -74,6 +74,7 @@
   ${KDEPIMLIBS_KLDAP_LIBS}
   ${KDEPIMLIBS_KPIMIDENTITIES_LIBS}
   ${KDE4_KCMUTILS_LIBS}
+  ${KDE4_SOLID_LIBS}
   ${KDEPIMLIBS_KMIME_LIBS}
   ${KDEPIMLIBS_KPIMTEXTEDIT_LIBS}
   ${KDEPIMLIBS_KMIME_LIBS}
@@ -96,7 +97,6 @@
    target_link_libraries(kdepim oleaut32)
 endif(MINGW)
 
-
 set_target_properties(kdepim PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION \
${GENERIC_LIB_SOVERSION})  install(TARGETS kdepim ${INSTALL_TARGETS_DEFAULT_ARGS})
 
--- trunk/KDE/kdepim/libkdepim/addresseelineedit.cpp #1204468:1204469
@@ -50,6 +50,8 @@
 #include <KStandardShortcut>
 #include <KUrl>
 
+#include <solid/networking.h>
+
 #include <QApplication>
 #include <QCursor>
 #include <QObject>
@@ -660,6 +662,10 @@
 
 void AddresseeLineEdit::Private::slotStartLDAPLookup()
 {
+  if ( Solid::Networking::status() == Solid::Networking::Unconnected ) {
+    return;
+  }
+
   const KGlobalSettings::Completion mode = q->completionMode();
 
   if ( mode == KGlobalSettings::CompletionNone ) {


[prev in list] [next in list] [prev in thread] [next in thread]