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
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
|
--- kactivities-4.7.80/service/ActivityManager.cpp~ 2011-11-24 16:05:52.777981854 +0000
+++ kactivities-4.7.80/service/ActivityManager.cpp 2011-11-24 16:06:32.721637122 +0000
@@ -75,14 +75,14 @@
QHash < WId, SharedInfo::WindowData > & _windows,
QHash < KUrl, SharedInfo::ResourceData > & _resources
)
- : haveSessions(false),
- config("activitymanagerrc"),
- windows(_windows),
- resources(_resources),
+ : config("activitymanagerrc"),
+ windows(_windows),
+ resources(_resources),
#ifdef HAVE_NEPOMUK
- m_nepomukInitCalled(false),
+ m_nepomukInitCalled(false),
#endif
- q(parent)
+ q(parent),
+ ksmserverInterface(0)
{
// Initializing config
connect(&configSyncTimer, SIGNAL(timeout()),
@@ -116,20 +116,26 @@
this, SLOT(activeWindowChanged(WId)));
//listen to ksmserver for starting/stopping
+ QDBusServiceWatcher *watcher = new QDBusServiceWatcher("org.kde.ksmserver",
+ QDBusConnection::sessionBus(),
+ QDBusServiceWatcher::WatchForRegistration);
+ connect(watcher, SIGNAL(serviceRegistered(QString)), this, SLOT(sessionServiceRegistered()));
+ sessionServiceRegistered();
+}
+
+void ActivityManagerPrivate::sessionServiceRegistered()
+{
+ delete ksmserverInterface;
ksmserverInterface = new QDBusInterface("org.kde.ksmserver", "/KSMServer", "org.kde.KSMServerInterface");
if (ksmserverInterface->isValid()) {
ksmserverInterface->setParent(this);
connect(ksmserverInterface, SIGNAL(subSessionOpened()), this, SLOT(startCompleted()));
connect(ksmserverInterface, SIGNAL(subSessionClosed()), this, SLOT(stopCompleted()));
connect(ksmserverInterface, SIGNAL(subSessionCloseCanceled()), this, SLOT(stopCancelled())); //spelling fail :)
- haveSessions = true;
} else {
- kDebug() << "couldn't connect to ksmserver! session stuff won't work";
- //note: in theory it's nice to try again later
- //but in practice, ksmserver is either there or it isn't (killing it logs you out)
- //so in this case there's no point. :)
- ksmserverInterface->deleteLater();
+ delete ksmserverInterface;
ksmserverInterface = 0;
+ kDebug() << "couldn't connect to ksmserver! session stuff won't work";
}
}
@@ -519,26 +525,24 @@
{
bool called = false;
// start the starting :)
- if (haveSessions) {
- QDBusInterface kwin("org.kde.kwin", "/KWin", "org.kde.KWin");
- if (kwin.isValid()) {
- QDBusMessage reply = kwin.call("startActivity", id);
- if (reply.type() == QDBusMessage::ErrorMessage) {
- kDebug() << "dbus error:" << reply.errorMessage();
+ QDBusInterface kwin("org.kde.kwin", "/KWin", "org.kde.KWin");
+ if (kwin.isValid()) {
+ QDBusMessage reply = kwin.call("startActivity", id);
+ if (reply.type() == QDBusMessage::ErrorMessage) {
+ kDebug() << "dbus error:" << reply.errorMessage();
+ } else {
+ QList<QVariant> ret = reply.arguments();
+ if (ret.length() == 1 && ret.first().toBool()) {
+ called = true;
} else {
- QList<QVariant> ret = reply.arguments();
- if (ret.length() == 1 && ret.first().toBool()) {
- called = true;
- } else {
- kDebug() << "call returned false; probably ksmserver is busy";
- setActivityState(transitioningActivity, ActivityManager::Stopped);
- transitioningActivity.clear();
- return; //assume we're mid-logout and just don't touch anything
- }
+ kDebug() << "call returned false; probably ksmserver is busy";
+ setActivityState(transitioningActivity, ActivityManager::Stopped);
+ transitioningActivity.clear();
+ return; //assume we're mid-logout and just don't touch anything
}
- } else {
- kDebug() << "couldn't get kwin interface";
}
+ } else {
+ kDebug() << "couldn't get kwin interface";
}
if (!called) {
@@ -585,25 +589,23 @@
{
bool called = false;
// start the stopping :)
- if (haveSessions) {
- QDBusInterface kwin("org.kde.kwin", "/KWin", "org.kde.KWin");
- if (kwin.isValid()) {
- QDBusMessage reply = kwin.call("stopActivity", id);
- if (reply.type() == QDBusMessage::ErrorMessage) {
- kDebug() << "dbus error:" << reply.errorMessage();
+ QDBusInterface kwin("org.kde.kwin", "/KWin", "org.kde.KWin");
+ if (kwin.isValid()) {
+ QDBusMessage reply = kwin.call("stopActivity", id);
+ if (reply.type() == QDBusMessage::ErrorMessage) {
+ kDebug() << "dbus error:" << reply.errorMessage();
+ } else {
+ QList<QVariant> ret = reply.arguments();
+ if (ret.length() == 1 && ret.first().toBool()) {
+ called = true;
} else {
- QList<QVariant> ret = reply.arguments();
- if (ret.length() == 1 && ret.first().toBool()) {
- called = true;
- } else {
- kDebug() << "call returned false; probably ksmserver is busy";
- stopCancelled();
- return; //assume we're mid-logout and just don't touch anything
- }
+ kDebug() << "call returned false; probably ksmserver is busy";
+ stopCancelled();
+ return; //assume we're mid-logout and just don't touch anything
}
- } else {
- kDebug() << "couldn't get kwin interface";
}
+ } else {
+ kDebug() << "couldn't get kwin interface";
}
if (!called) {
--- kactivities-4.7.80/service/ActivityManager_p.h~ 2011-11-24 16:06:01.618054620 +0000
+++ kactivities-4.7.80/service/ActivityManager_p.h 2011-11-24 16:06:32.721637122 +0000
@@ -68,7 +68,6 @@
//opening/closing activity (ksmserver can only handle one at a time)
QString transitioningActivity;
- bool haveSessions; //whether ksmserver's available
// Configuration
QTimer configSyncTimer;
@@ -106,6 +105,7 @@
void backstoreAvailable();
void syncActivitiesWithNepomuk();
+ void sessionServiceRegistered();
private:
ActivityManager * const q;
|
