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

List:       kde-commits
Subject:    branches/KDE/4.3/kdelibs/nepomuk/core
From:       Sebastian Trueg <sebastian () trueg ! de>
Date:       2009-09-24 8:34:16
Message-ID: 1253781256.094777.26748.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1027445 by trueg:

backport: do check for the existence of the nepomuk storage service before connecting \
to it

 M  +24 -20    nepomukmainmodel.cpp  


--- branches/KDE/4.3/kdelibs/nepomuk/core/nepomukmainmodel.cpp #1027444:1027445
@@ -43,6 +43,8 @@
 #include <QtCore/QTimer>
 #include <QtCore/QMutex>
 #include <QtCore/QMutexLocker>
+#include <QtDBus/QDBusConnection>
+#include <QtDBus/QDBusConnectionInterface>
 
 
 // FIXME: connect to some NepomukServer signal which emit enabled/disabled \
information @@ -84,29 +86,31 @@
     void init() {
         QMutexLocker lock( &m_initMutex );
 
-        if ( !dbusModel ) {
-            dbusModel = dbusClient.createModel( "main" );
-        }
+        if ( QDBusConnection::sessionBus().interface()->isServiceRegistered("org.kde.NepomukStorage") \
) { +            if ( !dbusModel ) {
+                dbusModel = dbusClient.createModel( "main" );
+            }
 
-        if ( !mutexModel ) {
-            mutexModel = new Soprano::Util::MutexModel( \
                Soprano::Util::MutexModel::ReadWriteMultiThreading );
-        }
+            if ( !mutexModel ) {
+                mutexModel = new Soprano::Util::MutexModel( \
Soprano::Util::MutexModel::ReadWriteMultiThreading ); +            }
 
-        // we may get disconnected from the server but we don't want to try
-        // to connect every time the model is requested
-        if ( !m_socketConnectFailed && !localSocketClient.isConnected() ) {
-            if ( mutexModel->parentModel() == localSocketModel )
-                mutexModel->setParentModel( 0 );
-            delete localSocketModel;
-            localSocketModel = 0;
-            QString socketName = KGlobal::dirs()->locateLocal( "data", \
                "nepomuk/socket" );
-            if ( localSocketClient.connect( socketName ) ) {
-                localSocketModel = localSocketClient.createModel( "main" );
+            // we may get disconnected from the server but we don't want to try
+            // to connect every time the model is requested
+            if ( !m_socketConnectFailed && !localSocketClient.isConnected() ) {
+                if ( mutexModel->parentModel() == localSocketModel )
+                    mutexModel->setParentModel( 0 );
+                delete localSocketModel;
+                localSocketModel = 0;
+                QString socketName = KGlobal::dirs()->locateLocal( "data", \
"nepomuk/socket" ); +                if ( localSocketClient.connect( socketName ) ) {
+                    localSocketModel = localSocketClient.createModel( "main" );
+                }
+                else {
+                    m_socketConnectFailed = true;
+                    kDebug() << "Failed to connect to Nepomuk server via local \
socket" << socketName; +                }
             }
-            else {
-                m_socketConnectFailed = true;
-                kDebug() << "Failed to connect to Nepomuk server via local socket" \
                << socketName;
-            }
         }
     }
 


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