diff --git a/data/update_default_rules.cpp b/data/update_default_rules.cpp
index 38200a71ca..15353100d8 100644
--- a/data/update_default_rules.cpp
+++ b/data/update_default_rules.cpp
@@ -62,7 +62,7 @@ int main( int argc, char* argv[] )
dcg.sync();
// Send signal to all kwin instances
QDBusMessage message =
- QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reconfigure");
+ QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reloadConfig");
QDBusConnection::sessionBus().send(message);
}
diff --git a/data/update_window_settings.cpp b/data/update_window_settings.cpp
index ff4cbadf1a..da09d9e033 100644
--- a/data/update_window_settings.cpp
+++ b/data/update_window_settings.cpp
@@ -178,6 +178,6 @@ int main()
dest_cfg.sync();
// Send signal to all kwin instances
QDBusMessage message =
- QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reconfigure");
+ QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reloadConfig");
QDBusConnection::sessionBus().send(message);
}
diff --git a/kcmkwin/kwincompositing/main.cpp b/kcmkwin/kwincompositing/main.cpp
index f807a9362f..da70c67b71 100644
--- a/kcmkwin/kwincompositing/main.cpp
+++ b/kcmkwin/kwincompositing/main.cpp
@@ -323,7 +323,7 @@ void KWinCompositingConfig::configChanged()
// Send signal to kwin
mKWinConfig->sync();
// Send signal to all kwin instances
- QDBusMessage message = QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reconfigure");
+ QDBusMessage message = QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reloadConfig");
QDBusConnection::sessionBus().send(message);
}
diff --git a/kcmkwin/kwindecoration/kwindecoration.cpp b/kcmkwin/kwindecoration/kwindecoration.cpp
index c0209a5359..3794157837 100644
--- a/kcmkwin/kwindecoration/kwindecoration.cpp
+++ b/kcmkwin/kwindecoration/kwindecoration.cpp
@@ -538,7 +538,7 @@ void KWinDecorationModule::save()
kwinConfig.sync();
// Send signal to all kwin instances
QDBusMessage message =
- QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reconfigure");
+ QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reloadConfig");
QDBusConnection::sessionBus().send(message);
}
diff --git a/kcmkwin/kwinoptions/main.cpp b/kcmkwin/kwinoptions/main.cpp
index bde8bfc97e..d7edce1666 100644
--- a/kcmkwin/kwinoptions/main.cpp
+++ b/kcmkwin/kwinoptions/main.cpp
@@ -152,7 +152,7 @@ void KWinOptions::save()
mConfig->sync();
// Send signal to all kwin instances
QDBusMessage message =
- QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reconfigure");
+ QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reloadConfig");
QDBusConnection::sessionBus().send(message);
@@ -229,7 +229,7 @@ void KActionsOptions::save()
mConfig->sync();
// Send signal to all kwin instances
QDBusMessage message =
- QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reconfigure");
+ QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reloadConfig");
QDBusConnection::sessionBus().send(message);
}
diff --git a/kcmkwin/kwinoptions/mouse.cpp b/kcmkwin/kwinoptions/mouse.cpp
index f1adc9f891..6518d765a1 100644
--- a/kcmkwin/kwinoptions/mouse.cpp
+++ b/kcmkwin/kwinoptions/mouse.cpp
@@ -585,7 +585,7 @@ void KTitleBarActionsConfig::save()
config->sync();
// Send signal to all kwin instances
QDBusMessage message =
- QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reconfigure");
+ QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reloadConfig");
QDBusConnection::sessionBus().send(message);
}
@@ -882,7 +882,7 @@ void KWindowActionsConfig::save()
config->sync();
// Send signal to all kwin instances
QDBusMessage message =
- QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reconfigure");
+ QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reloadConfig");
QDBusConnection::sessionBus().send(message);
}
}
diff --git a/kcmkwin/kwinoptions/windows.cpp b/kcmkwin/kwinoptions/windows.cpp
index 5e21d59845..4e8417e032 100644
--- a/kcmkwin/kwinoptions/windows.cpp
+++ b/kcmkwin/kwinoptions/windows.cpp
@@ -526,7 +526,7 @@ void KFocusConfig::save( void )
config->sync();
// Send signal to all kwin instances
QDBusMessage message =
- QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reconfigure");
+ QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reloadConfig");
QDBusConnection::sessionBus().send(message);
}
emit KCModule::changed(false);
@@ -745,7 +745,7 @@ void KAdvancedConfig::save( void )
config->sync();
// Send signal to all kwin instances
QDBusMessage message =
- QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reconfigure");
+ QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reloadConfig");
QDBusConnection::sessionBus().send(message);
}
@@ -1143,7 +1143,7 @@ void KMovingConfig::save( void )
config->sync();
// Send signal to all kwin instances
QDBusMessage message =
- QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reconfigure");
+ QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reloadConfig");
QDBusConnection::sessionBus().send(message);
}
emit KCModule::changed(false);
diff --git a/kcmkwin/kwinrules/kcm.cpp b/kcmkwin/kwinrules/kcm.cpp
index 7f57488f4e..832f1cb5a1 100644
--- a/kcmkwin/kwinrules/kcm.cpp
+++ b/kcmkwin/kwinrules/kcm.cpp
@@ -71,7 +71,7 @@ void KCMRules::save()
config.sync();
// Send signal to all kwin instances
QDBusMessage message =
- QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reconfigure");
+ QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reloadConfig");
QDBusConnection::sessionBus().send(message);
}
diff --git a/kcmkwin/kwinrules/main.cpp b/kcmkwin/kwinrules/main.cpp
index 58b0fa9d56..24c3833ad2 100644
--- a/kcmkwin/kwinrules/main.cpp
+++ b/kcmkwin/kwinrules/main.cpp
@@ -257,7 +257,7 @@ static int edit( Window wid, bool whole_app )
saveRules( rules );
// Send signal to all kwin instances
QDBusMessage message =
- QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reconfigure");
+ QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reloadConfig");
QDBusConnection::sessionBus().send(message);
return 0;
}
diff --git a/org.kde.KWin.xml b/org.kde.KWin.xml
index 20d9def8f0..8b5c968d8c 100644
--- a/org.kde.KWin.xml
+++ b/org.kde.KWin.xml
@@ -8,6 +8,9 @@
+
+
+
@@ -30,7 +33,7 @@
-
+
diff --git a/workspace.cpp b/workspace.cpp
index 52e937b081..e4b5a5734f 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -144,7 +144,7 @@ Workspace::Workspace( bool restore )
(void) new KWinAdaptor( this );
QDBusConnection dbus = QDBusConnection::sessionBus();
dbus.registerObject("/KWin", this);
- dbus.connect(QString(), "/KWin", "org.kde.KWin", "reconfigure", this, SLOT(reconfigure()));
+ dbus.connect(QString(), "/KWin", "org.kde.KWin", "reloadConfig", this, SLOT(slotReloadConfig()));
dbus.connect(QString(), "/KWin", "org.kde.KWin", "reinitCompositing", this, SLOT(slotReinitCompositing()));
_self = this;
mgr = new PluginMgr;
@@ -952,6 +952,11 @@ void Workspace::updateColormap()
}
}
+void Workspace::slotReloadConfig()
+{
+ reconfigure();
+}
+
void Workspace::reconfigure()
{
reconfigureTimer.start( 200 );
diff --git a/workspace.h b/workspace.h
index 3f14f36a75..25ee03296f 100644
--- a/workspace.h
+++ b/workspace.h
@@ -138,6 +138,7 @@ class Workspace : public QObject, public KDecorationDefines
void raiseOrLowerClient( Client * );
void restoreSessionStackingOrder( Client* c );
void restackUnmanaged( Unmanaged* c, Window above );
+ void reconfigure();
void forceRestacking();
void clientHidden( Client* );
@@ -472,7 +473,7 @@ class Workspace : public QObject, public KDecorationDefines
void cleanupTemporaryRules();
void writeWindowRules();
void slotBlockShortcuts(int data);
- void reconfigure();
+ void slotReloadConfig();
void setPopupClientOpacity( QAction* action );
void setupCompositing();
void performCompositing();