Merging from old trunk:

r614887 | mlaurent | 2006-12-19 12:13:01 +0100 (Tue, 19 Dec 2006) | 5 lines

Add signal to reload config on all kwin instance
(fix all dbus call)


svn path=/trunk/KDE/kdebase/workspace/; revision=659491

org.kde.KWin.xml

@@ -38,6 +38,7 @@
     <method name="nextDesktop"/>
     <method name="previousDesktop"/>
     <method name="circulateDesktopApplications"/>
+    <signal name="reloadConfig"/>
     <method name="loadEffect">
     <arg name="name" type="s" direction="in"/>
     </method>

workspace.cpp

@@ -131,7 +131,9 @@ Workspace::Workspace( bool restore )
     transButton( NULL )
     {
     (void) new KWinAdaptor( this );
-    QDBusConnection::sessionBus().registerObject("/KWin", this);
+    QDBusConnection dbus = QDBusConnection::sessionBus();
+    dbus.registerObject("/KWin", this);
+    dbus.connect(QString(), "/KWin", "org.kde.KWin", "reloadConfig", this, SLOT(slotReloadConfig()));
 
     _self = this;
     mgr = new PluginMgr;
@@ -951,6 +953,11 @@ void Workspace::updateColormap()
         }
     }
 
+void Workspace::slotReloadConfig()
+{
+  reconfigure();
+}
+
 void Workspace::reconfigure()
     {
     reconfigureTimer.start( 200 );

workspace.h

@@ -447,6 +447,7 @@ class Workspace : public QObject, public KDecorationDefines
         void cleanupTemporaryRules();
         void writeWindowRules();
         void slotBlockShortcuts(int data);
+        void slotReloadConfig();
         void setPopupClientOpacity( QAction* action );
         void setupCompositing();
         void performCompositing();