From 4f4957547732b0301be0bfa6db100a82b41e15d9 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Sun, 15 Oct 2006 21:54:15 +0000 Subject: [PATCH] Don't register the wrong name on D-Bus Konsole isn't a KUniqueApplication svn path=/trunk/KDE/kdebase/apps/konsole/; revision=595849 --- konsole/TESession.cpp | 1 - konsole/konsole.cpp | 7 +++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/konsole/TESession.cpp b/konsole/TESession.cpp index ff4f4aa7..240d0c17 100644 --- a/konsole/TESession.cpp +++ b/konsole/TESession.cpp @@ -78,7 +78,6 @@ TESession::TESession() : (void)new SessionAdaptor(this); QDBusConnection::sessionBus().registerObject(QLatin1String("/Session"), this); - QDBusConnection::sessionBus().registerService("org.kde.konsole"); //create teletype for I/O with shell process sh = new TEPty(); diff --git a/konsole/konsole.cpp b/konsole/konsole.cpp index a3f9eb73..9222f629 100644 --- a/konsole/konsole.cpp +++ b/konsole/konsole.cpp @@ -256,11 +256,10 @@ Konsole::Konsole(const char* name, int histon, bool menubaron, bool tabbaron, bo ,s_workDir(workdir) ,_sessionManager(0) { - setObjectName( name ); + setObjectName( name ); - (void)new KonsoleAdaptor(this); - QDBusConnection::sessionBus().registerObject(QLatin1String("/Konsole"), this); - QDBusConnection::sessionBus().registerService("org.kde.konsole"); + (void)new KonsoleAdaptor(this); + QDBusConnection::sessionBus().registerObject(QLatin1String("/Konsole"), this); m_sessionGroup = new QActionGroup(this); isRestored = b_inRestore;