There's really no need to have two dbus functions for reconfiguring.

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

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", "reloadConfig");
+        QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reconfigure");
     QDBusConnection::sessionBus().send(message);
  
     }

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", "reloadConfig");
+        QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reconfigure");
     QDBusConnection::sessionBus().send(message);
     }

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", "reloadConfig");
+    QDBusMessage message = QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reconfigure");
     QDBusConnection::sessionBus().send(message);
 }
 

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", "reloadConfig");
+        QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reconfigure");
     QDBusConnection::sessionBus().send(message);
 
 }

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", "reloadConfig");
+        QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reconfigure");
   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", "reloadConfig");
+       QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reconfigure");
   QDBusConnection::sessionBus().send(message);
 
 }

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", "reloadConfig");
+        QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reconfigure");
     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", "reloadConfig");
+        QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reconfigure");
     QDBusConnection::sessionBus().send(message);
   }
 }

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", "reloadConfig");
+        QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reconfigure");
        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", "reloadConfig");
+       QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reconfigure");
        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", "reloadConfig");
+           QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reconfigure");
         QDBusConnection::sessionBus().send(message);
     }
     emit KCModule::changed(false);

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", "reloadConfig");
+        QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reconfigure");
     QDBusConnection::sessionBus().send(message);
 
     }

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", "reloadConfig");
+        QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reconfigure");
     QDBusConnection::sessionBus().send(message);
     return 0;
     }

org.kde.KWin.xml

@@ -8,9 +8,6 @@
     <method name="unclutterDesktop">
       <annotation name="org.freedesktop.DBus.Method.NoReply" value="true"/>
     </method>
-    <method name="reconfigure">
-      <annotation name="org.freedesktop.DBus.Method.NoReply" value="true"/>
-    </method>
     <method name="killWindow">
       <annotation name="org.freedesktop.DBus.Method.NoReply" value="true"/>
     </method>
@@ -33,7 +30,7 @@
     <method name="nextDesktop"/>
     <method name="previousDesktop"/>
     <method name="circulateDesktopApplications"/>
-    <signal name="reloadConfig"/>
+    <signal name="reconfigure"/>
     <signal name="reinitCompositing"/>
     <method name="loadEffect">
       <arg name="name" type="s" direction="in"/>

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", "reloadConfig", this, SLOT(slotReloadConfig()));
+    dbus.connect(QString(), "/KWin", "org.kde.KWin", "reconfigure", this, SLOT(reconfigure()));
     dbus.connect(QString(), "/KWin", "org.kde.KWin", "reinitCompositing", this, SLOT(slotReinitCompositing()));
     _self = this;
     mgr = new PluginMgr;
@@ -952,11 +952,6 @@ void Workspace::updateColormap()
         }
     }
 
-void Workspace::slotReloadConfig()
-{
-  reconfigure();
-}
-
 void Workspace::reconfigure()
     {
     reconfigureTimer.start( 200 );

workspace.h

@@ -138,7 +138,6 @@ 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*  );
@@ -473,7 +472,7 @@ class Workspace : public QObject, public KDecorationDefines
         void cleanupTemporaryRules();
         void writeWindowRules();
         void slotBlockShortcuts(int data);
-        void slotReloadConfig();
+        void reconfigure();
         void setPopupClientOpacity( QAction* action );
         void setupCompositing();
         void performCompositing();