blob: 8ac385483d46d0debf8a6700b0ce3ee606c848c6 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
|
From: Vishesh Handa <me@vhanda.in>
Date: Wed, 13 Jun 2012 21:26:31 +0000
Subject: Revert "Always rec-connect if forced (ie. when Nepomuk server restarts)"
X-Git-Url: http://quickgit.kde.org/?p=kdelibs.git&a=commitdiff&h=bde5aad1e9f7bfb6f8d5c60197797de4a315158d
---
Revert "Always rec-connect if forced (ie. when Nepomuk server restarts)"
This reverts commit a43824a200ed76cef48a90bd3aee8547698b7c91.
This is done so that 4.8.x works with Soprano 2.7.6
---
--- a/nepomuk/core/nepomukmainmodel.cpp
+++ b/nepomuk/core/nepomukmainmodel.cpp
@@ -94,7 +94,7 @@ public:
// we may get disconnected from the server but we don't want to try
// to connect every time the model is requested
- if ( forced || (!m_socketConnectFailed && !localSocketClient.isConnected()) ) {
+ if ( !m_socketConnectFailed && !localSocketClient.isConnected() ) {
delete localSocketModel;
localSocketModel = 0;
QString socketName = KGlobal::dirs()->locateLocal( "socket", "nepomuk-socket" );
From: Vishesh Handa <me@vhanda.in>
Date: Wed, 13 Jun 2012 21:25:32 +0000
Subject: Revert "Disconnect before re-connecting. Soprano does not do that for us."
X-Git-Url: http://quickgit.kde.org/?p=kdelibs.git&a=commitdiff&h=76e0376d7582cfe5b898c56bf3779ca2279dace8
---
Revert "Disconnect before re-connecting. Soprano does not do that for us."
This reverts commit 3708be2d09700b21f934c2129218e1c7ea44efdf.
This is being done so that KDE 4.8.x works with Soprano 2.7.6
---
--- a/nepomuk/core/nepomukmainmodel.cpp
+++ b/nepomuk/core/nepomukmainmodel.cpp
@@ -97,7 +97,6 @@ public:
if ( forced || (!m_socketConnectFailed && !localSocketClient.isConnected()) ) {
delete localSocketModel;
localSocketModel = 0;
- localSocketClient.disconnect();
QString socketName = KGlobal::dirs()->locateLocal( "socket", "nepomuk-socket" );
kDebug() << "Connecting to local socket" << socketName;
if ( localSocketClient.connect( socketName ) ) {
|
