Add signal to reload config on all kwin instance
(fix all dbus call) CCMAIL: l.lunak@kde.org (could you merge it please) svn path=/trunk/KDE/kdebase/workspace/; revision=614887
This commit is contained in:
parent
c5efec7d9c
commit
f1588814af
3 changed files with 11 additions and 3 deletions
|
@ -1,7 +1,7 @@
|
|||
<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
|
||||
"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
|
||||
<node>
|
||||
<interface name="org.kde.KWin">
|
||||
<interface name="org.kde.KWin">
|
||||
<method name="cascadeDesktop">
|
||||
<annotation name="org.freedesktop.DBus.Method.NoReply" value="true"/>
|
||||
</method>
|
||||
|
@ -38,6 +38,6 @@
|
|||
<method name="nextDesktop"/>
|
||||
<method name="previousDesktop"/>
|
||||
<method name="circulateDesktopApplications"/>
|
||||
</method>
|
||||
<signal name="reloadConfig"/>
|
||||
</interface>
|
||||
</node>
|
||||
|
|
|
@ -125,7 +125,9 @@ Workspace::Workspace( bool restore )
|
|||
forced_global_mouse_grab( false )
|
||||
{
|
||||
(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;
|
||||
|
@ -872,6 +874,11 @@ void Workspace::updateColormap()
|
|||
}
|
||||
}
|
||||
|
||||
void Workspace::slotReloadConfig()
|
||||
{
|
||||
reconfigure();
|
||||
}
|
||||
|
||||
void Workspace::reconfigure()
|
||||
{
|
||||
reconfigureTimer.start( 200 );
|
||||
|
|
|
@ -406,6 +406,7 @@ class Workspace : public QObject, public KDecorationDefines
|
|||
void cleanupTemporaryRules();
|
||||
void writeWindowRules();
|
||||
void slotBlockShortcuts(int data);
|
||||
void slotReloadConfig();
|
||||
// kompmgr
|
||||
void setPopupClientOpacity(int v);
|
||||
void resetClientOpacity();
|
||||
|
|
Loading…
Reference in a new issue