vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Do not register dbus service org.kde.kwin.Effects 

Let's use org.kde.KWin, we have Object and interface to differentiate.
icc-effect-5.14.5
Martin Gräßlin 2014-05-15 08:39:42 +02:00
parent 1f30efb333
commit 6e1df6ba62
25 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
effects.cpp
View File

@ -210,7 +210,6 @@ EffectsHandlerImpl::EffectsHandlerImpl(Compositor *compositor, Scene *scene)
new EffectsAdaptor(this);
QDBusConnection dbus = QDBusConnection::sessionBus();
dbus.registerObject(QStringLiteral("/Effects"), this);
dbus.registerService(QStringLiteral("org.kde.kwin.Effects"));
// init is important, otherwise causes crashes when quads are build before the first painting pass start
m_currentBuildQuadsIterator = m_activeEffects.constEnd();

2
effects/blur/blur_config.cpp
View File

@ -49,7 +49,7 @@ void BlurEffectConfig::save()
{
KCModule::save();
OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"),
OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.KWin"),
QStringLiteral("/Effects"),
QDBusConnection::sessionBus());
interface.reconfigureEffect(QStringLiteral("blur"));

2
effects/coverswitch/coverswitch_config.cpp
View File

@ -54,7 +54,7 @@ CoverSwitchEffectConfig::CoverSwitchEffectConfig(QWidget* parent, const QVariant
void CoverSwitchEffectConfig::save()
{
KCModule::save();
OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"),
OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.KWin"),
QStringLiteral("/Effects"),
QDBusConnection::sessionBus());
interface.reconfigureEffect(QStringLiteral("coverswitch"));

2
effects/cube/cube_config.cpp
View File

@ -91,7 +91,7 @@ void CubeEffectConfig::save()
{
KCModule::save();
m_ui->editor->save();
OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"),
OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.KWin"),
QStringLiteral("/Effects"),
QDBusConnection::sessionBus());
interface.reconfigureEffect(QStringLiteral("cube"));

2
effects/cube/cubeslide_config.cpp
View File

@ -56,7 +56,7 @@ CubeSlideEffectConfig::CubeSlideEffectConfig(QWidget* parent, const QVariantList
void CubeSlideEffectConfig::save()
{
KCModule::save();
OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"),
OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.KWin"),
QStringLiteral("/Effects"),
QDBusConnection::sessionBus());
interface.reconfigureEffect(QStringLiteral("cubeslide"));

2
effects/dashboard/dashboard_config.cpp
View File

@ -50,7 +50,7 @@ void DashboardEffectConfig::save()
{
KCModule::save();
OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"),
OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.KWin"),
QStringLiteral("/Effects"),
QDBusConnection::sessionBus());
interface.reconfigureEffect(QStringLiteral("dashboard"));

2
effects/desktopgrid/desktopgrid_config.cpp
View File

@ -107,7 +107,7 @@ void DesktopGridEffectConfig::save()
conf.writeEntry("DesktopNameAlignment", DesktopGridConfig::desktopNameAlignment());
conf.sync();
OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"),
OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.KWin"),
QStringLiteral("/Effects"),
QDBusConnection::sessionBus());
interface.reconfigureEffect(QStringLiteral("desktopgrid"));

2
effects/diminactive/diminactive_config.cpp
View File

@ -61,7 +61,7 @@ DimInactiveEffectConfig::DimInactiveEffectConfig(QWidget* parent, const QVariant
void DimInactiveEffectConfig::save()
{
KCModule::save();
OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"),
OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.KWin"),
QStringLiteral("/Effects"),
QDBusConnection::sessionBus());
interface.reconfigureEffect(QStringLiteral("diminactive"));

2
effects/flipswitch/flipswitch_config.cpp
View File

@ -82,7 +82,7 @@ void FlipSwitchEffectConfig::save()
KCModule::save();
m_ui->shortcutEditor->save();
OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"),
OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.KWin"),
QStringLiteral("/Effects"),
QDBusConnection::sessionBus());
interface.reconfigureEffect(QStringLiteral("flipswitch"));

2
effects/glide/glide_config.cpp
View File

@ -48,7 +48,7 @@ GlideEffectConfig::~GlideEffectConfig()
void GlideEffectConfig::save()
{
KCModule::save();
OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"),
OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.KWin"),
QStringLiteral("/Effects"),
QDBusConnection::sessionBus());
interface.reconfigureEffect(QStringLiteral("glide"));

2
effects/invert/invert_config.cpp
View File

@ -87,7 +87,7 @@ void InvertEffectConfig::save()
mShortcutEditor->save(); // undo() will restore to this state from now on
emit changed(false);
OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"),
OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.KWin"),
QStringLiteral("/Effects"),
QDBusConnection::sessionBus());
interface.reconfigureEffect(QStringLiteral("invert"));

2
effects/lookingglass/lookingglass_config.cpp
View File

@ -99,7 +99,7 @@ void LookingGlassEffectConfig::save()
m_ui->editor->save(); // undo() will restore to this state from now on
OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"),
OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.KWin"),
QStringLiteral("/Effects"),
QDBusConnection::sessionBus());
interface.reconfigureEffect(QStringLiteral("lookingglass"));

2
effects/magiclamp/magiclamp_config.cpp
View File

@ -58,7 +58,7 @@ MagicLampEffectConfig::MagicLampEffectConfig(QWidget* parent, const QVariantList
void MagicLampEffectConfig::save()
{
KCModule::save();
OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"),
OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.KWin"),
QStringLiteral("/Effects"),
QDBusConnection::sessionBus());
interface.reconfigureEffect(QStringLiteral("magiclamp"));

2
effects/magnifier/magnifier_config.cpp
View File

@ -100,7 +100,7 @@ void MagnifierEffectConfig::save()
m_ui->editor->save(); // undo() will restore to this state from now on
KCModule::save();
OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"),
OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.KWin"),
QStringLiteral("/Effects"),
QDBusConnection::sessionBus());
interface.reconfigureEffect(QStringLiteral("magnifier"));

2
effects/mouseclick/mouseclick_config.cpp
View File

@ -80,7 +80,7 @@ void MouseClickEffectConfig::save()
{
KCModule::save();
m_ui->editor->save(); // undo() will restore to this state from now on
OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"),
OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.KWin"),
QStringLiteral("/Effects"),
QDBusConnection::sessionBus());
interface.reconfigureEffect(QStringLiteral("mouseclick"));

2
effects/mousemark/mousemark_config.cpp
View File

@ -94,7 +94,7 @@ void MouseMarkEffectConfig::save()
m_actionCollection->writeSettings();
m_ui->editor->save(); // undo() will restore to this state from now on
OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"),
OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.KWin"),
QStringLiteral("/Effects"),
QDBusConnection::sessionBus());
interface.reconfigureEffect(QStringLiteral("mousemark"));

2
effects/presentwindows/presentwindows_config.cpp
View File

@ -98,7 +98,7 @@ void PresentWindowsEffectConfig::save()
{
KCModule::save();
m_ui->shortcutEditor->save();
OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"),
OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.KWin"),
QStringLiteral("/Effects"),
QDBusConnection::sessionBus());
interface.reconfigureEffect(QStringLiteral("presentwindows"));

2
effects/resize/resize_config.cpp
View File

@ -57,7 +57,7 @@ ResizeEffectConfig::ResizeEffectConfig(QWidget* parent, const QVariantList& args
void ResizeEffectConfig::save()
{
KCModule::save();
OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"),
OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.KWin"),
QStringLiteral("/Effects"),
QDBusConnection::sessionBus());
interface.reconfigureEffect(QStringLiteral("resize"));

2
effects/showfps/showfps_config.cpp
View File

@ -54,7 +54,7 @@ ShowFpsEffectConfig::~ShowFpsEffectConfig()
void ShowFpsEffectConfig::save()
{
KCModule::save();
OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"),
OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.KWin"),
QStringLiteral("/Effects"),
QDBusConnection::sessionBus());
interface.reconfigureEffect(QStringLiteral("showfps"));

2
effects/thumbnailaside/thumbnailaside_config.cpp
View File

@ -86,7 +86,7 @@ ThumbnailAsideEffectConfig::~ThumbnailAsideEffectConfig()
void ThumbnailAsideEffectConfig::save()
{
KCModule::save();
OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"),
OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.KWin"),
QStringLiteral("/Effects"),
QDBusConnection::sessionBus());
interface.reconfigureEffect(QStringLiteral("thumbnailaside"));

2
effects/trackmouse/trackmouse_config.cpp
View File

@ -99,7 +99,7 @@ void TrackMouseEffectConfig::save()
{
KCModule::save();
m_actionCollection->writeSettings();
OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"),
OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.KWin"),
QStringLiteral("/Effects"),
QDBusConnection::sessionBus());
interface.reconfigureEffect(QStringLiteral("trackmouse"));

2
effects/windowgeometry/windowgeometry_config.cpp
View File

@ -76,7 +76,7 @@ void WindowGeometryConfig::save()
{
KCModule::save();
myUi->shortcuts->save(); // undo() will restore to this state from now on
OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"),
OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.KWin"),
QStringLiteral("/Effects"),
QDBusConnection::sessionBus());
interface.reconfigureEffect(QStringLiteral("windowgeometry"));

2
effects/wobblywindows/wobblywindows_config.cpp
View File

@ -98,7 +98,7 @@ void WobblyWindowsEffectConfig::save()
{
KCModule::save();
OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"),
OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.KWin"),
QStringLiteral("/Effects"),
QDBusConnection::sessionBus());
interface.reconfigureEffect(QStringLiteral("wobblywindows"));

2
effects/zoom/zoom_config.cpp
View File

@ -136,7 +136,7 @@ void ZoomEffectConfig::save()
{
m_ui->editor->save(); // undo() will restore to this state from now on
KCModule::save();
OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"),
OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.KWin"),
QStringLiteral("/Effects"),
QDBusConnection::sessionBus());
interface.reconfigureEffect(QStringLiteral("zoom"));

2
scripting/genericscriptedconfig.cpp
View File

@ -122,7 +122,7 @@ KConfigGroup ScriptedEffectConfig::configGroup()
void ScriptedEffectConfig::reload()
{
OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.kwin.Effects"),
OrgKdeKwinEffectsInterface interface(QStringLiteral("org.kde.KWin"),
QStringLiteral("/Effects"),
QDBusConnection::sessionBus());
interface.reconfigureEffect(packageName());