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

List:       kde-commits
Subject:    branches/KDE/4.3/kdelibs/nepomuk/core
From:       Frank Reininghaus <frank78ac () googlemail ! com>
Date:       2010-01-15 16:19:29
Message-ID: 1263572369.095318.30000.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1075174 by freininghaus:

Backport commit 1062832 to the 4.3 branch:

Do not check the storage service via DBus anymore since the latter is not
thread-safe.

Fix will be in KDE 4.3.5.

CCBUG: 208921


 M  +3 -2      nepomukmainmodel.cpp  


--- branches/KDE/4.3/kdelibs/nepomuk/core/nepomukmainmodel.cpp #1075173:1075174
@@ -86,7 +86,8 @@
     void init() {
         QMutexLocker lock( &m_initMutex );
 
-        if ( QDBusConnection::sessionBus().interface()->isServiceRegistered("org.kde.NepomukStorage") \
) { +        // Comment out the check for the storage service via DBus - fixes bug \
209821 +        //if ( \
QDBusConnection::sessionBus().interface()->isServiceRegistered("org.kde.NepomukStorage") \
) {  if ( !dbusModel ) {
                 dbusModel = dbusClient.createModel( "main" );
             }
@@ -111,7 +112,7 @@
                     kDebug() << "Failed to connect to Nepomuk server via local \
socket" << socketName;  }
             }
-        }
+        //}
     }
 
     Soprano::Model* model() {


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