Merge lp:~aacid/unity-2d/unity-2d_kill_launcherdbus into lp:unity-2d

[Albert Astals Cid]

Remove LauncherDBus

I convinced Florian not to do it a while ago, but with the MulitMonitor work it's just more work keeping it for no real reason

[Michał Sawicz (saviq)]

review: Approve

[Unity Merger (unity-merger)]

No approved revision specified.

=== modified file '.bzrignore'
--- .bzrignore	2012-02-07 18:41:24 +0000
+++ .bzrignore	2012-02-23 10:23:17 +0000
@@ -2,7 +2,6 @@
 
 shell/app/dashadaptor.*
 shell/app/launcheradaptor.*
-shell/app/unity-2d-launcher.service
 shell/app/unity-2d-places.service
 shell/app/unity-2d-shell
 

=== modified file 'debian/unity-2d-shell.install.in'
--- debian/unity-2d-shell.install.in	2011-12-02 16:51:20 +0000
+++ debian/unity-2d-shell.install.in	2012-02-23 10:23:17 +0000
@@ -1,7 +1,6 @@
 @DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/unity-2d-shell
 @DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/applications/unity-2d-shell.desktop
 @DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/dbus-1/services/unity-2d-places.service
-@DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/dbus-1/services/unity-2d-launcher.service
 @DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/unity-2d/shell/*.qml
 @DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/unity-2d/shell/dash
 @DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/unity-2d/shell/launcher

=== modified file 'shell/app/CMakeLists.txt'
--- shell/app/CMakeLists.txt	2012-02-13 23:46:04 +0000
+++ shell/app/CMakeLists.txt	2012-02-23 10:23:17 +0000
@@ -6,13 +6,11 @@
 set(shell_SRCS
     shell.cpp
     dashdbus.cpp
-    launcherdbus.cpp
     shelldeclarativeview.cpp
     )
 
 set(shell_MOC_HDRS
     dashdbus.h
-    launcherdbus.h
     shelldeclarativeview.h
     )
 
@@ -22,9 +20,6 @@
 configure_file(unity-2d-places.service.in unity-2d-places.service)
 qt4_add_dbus_adaptor(shell_SRCS dash.xml dashdbus.h DashDBus)
 
-configure_file(unity-2d-launcher.service.in unity-2d-launcher.service)
-qt4_add_dbus_adaptor(shell_SRCS launcher.xml launcherdbus.h LauncherDBus)
-
 add_executable(unity-2d-shell ${shell_SRCS} ${shell_MOC_SRCS})
 
 include_directories(
@@ -58,10 +53,6 @@
     DESTINATION ${CMAKE_INSTALL_DATADIR}/dbus-1/services
     )
 
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unity-2d-launcher.service
-    DESTINATION ${CMAKE_INSTALL_DATADIR}/dbus-1/services
-    )
-
 install(FILES unity-2d-shell.desktop
     DESTINATION ${CMAKE_INSTALL_DATADIR}/applications
     )

=== removed file 'shell/app/launcher.xml'
--- shell/app/launcher.xml	2011-11-18 10:38:26 +0000
+++ shell/app/launcher.xml	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node xmlns:dox="http://www.ayatana.org/dbus/dox.dtd">
-    <dox:d><![CDATA[
-      @mainpage
-
-      An interface to activate the launcher in Unity2d.
-    ]]></dox:d>
-    <interface name="com.canonical.Unity2d.Launcher" xmlns:dox="http://www.ayatana.org/dbus/dox.dtd">
-        <dox:d>
-          An interface to activate the launcher in Unity2d.
-        </dox:d>
-        <method name="AddWebFavorite">
-            <dox:d><![CDATA[
-               Request a URL to be added to the launcher as a web favorite.
-            ]]></dox:d>
-            <arg name="url" type="s" direction="in">
-                <dox:d>The URL to be favorited.</dox:d>
-            </arg>
-        </method>
-    </interface>
-</node>
-

=== removed file 'shell/app/launcherdbus.cpp'
--- shell/app/launcherdbus.cpp	2011-11-18 10:38:26 +0000
+++ shell/app/launcherdbus.cpp	1970-01-01 00:00:00 +0000
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2011 Canonical, Ltd.
- *
- * Authors:
- *  Olivier Tilloy <[e-mail]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "launcherdbus.h"
-#include "launcheradaptor.h"
-
-// Local
-#include <shelldeclarativeview.h>
-
-// Qt
-#include <QtDBus/QDBusConnection>
-
-static const char* LAUNCHER_DBUS_SERVICE = "com.canonical.Unity2d.Launcher";
-static const char* LAUNCHER_DBUS_OBJECT_PATH = "/Launcher";
-
-LauncherDBus::LauncherDBus(ShellDeclarativeView* view, QObject* parent)
-: QObject(parent)
-, m_view(view)
-{
-}
-
-LauncherDBus::~LauncherDBus()
-{
-    QDBusConnection::sessionBus().unregisterService(LAUNCHER_DBUS_SERVICE);
-}
-
-bool
-LauncherDBus::connectToBus()
-{
-    bool ok = QDBusConnection::sessionBus().registerService(LAUNCHER_DBUS_SERVICE);
-    if (!ok) {
-        return false;
-    }
-    new LauncherAdaptor(this);
-    QDBusConnection::sessionBus().registerObject(LAUNCHER_DBUS_OBJECT_PATH, this);
-
-    return true;
-}
-
-void
-LauncherDBus::AddWebFavorite(const QString& url)
-{
-    Q_EMIT m_view->addWebFavoriteRequested(url);
-}

=== removed file 'shell/app/launcherdbus.h'
--- shell/app/launcherdbus.h	2011-11-18 10:38:26 +0000
+++ shell/app/launcherdbus.h	1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2011 Canonical, Ltd.
- *
- * Authors:
- *  Olivier Tilloy <[e-mail]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef LauncherDBus_H
-#define LauncherDBus_H
-
-#include <QtCore/QObject>
-#include <QtDBus/QDBusContext>
-
-class ShellDeclarativeView;
-
-/**
- * DBus interface for the launcher.
- *
- * Note: Methods from this class should not be called from within the Launcher:
- * some of them may rely on the call coming from DBus.
- */
-class LauncherDBus : public QObject, protected QDBusContext
-{
-    Q_OBJECT
-
-public:
-    LauncherDBus(ShellDeclarativeView* view, QObject* parent=0);
-    ~LauncherDBus();
-
-    bool connectToBus();
-
-public Q_SLOTS:
-    Q_NOREPLY void AddWebFavorite(const QString& url);
-
-private:
-    ShellDeclarativeView* m_view;
-};
-
-#endif // LauncherDBus_H
-

=== modified file 'shell/app/shell.cpp'
--- shell/app/shell.cpp	2012-02-13 23:46:04 +0000
+++ shell/app/shell.cpp	2012-02-23 10:23:17 +0000
@@ -44,7 +44,6 @@
 #include "shelldeclarativeview.h"
 #include "dashclient.h"
 #include "dashdbus.h"
-#include "launcherdbus.h"
 
 int main(int argc, char *argv[])
 {
@@ -119,8 +118,5 @@
         return -1;
     }
 
-    LauncherDBus launcherDBus(&view);
-    launcherDBus.connectToBus();
-
     return application.exec();
 }

=== modified file 'shell/app/shelldeclarativeview.h'
--- shell/app/shelldeclarativeview.h	2012-02-13 23:46:04 +0000
+++ shell/app/shelldeclarativeview.h	2012-02-23 10:23:17 +0000
@@ -88,7 +88,6 @@
     void monitoredAreaChanged();
     void monitoredAreaContainsMouseChanged();
 
-    void addWebFavoriteRequested(const QUrl& url);
     void superKeyHeldChanged(bool superKeyHeld);
     void superKeyTapped();
     void activateShortcutPressed(int itemIndex);
@@ -134,7 +133,6 @@
     bool m_monitoredAreaContainsMouse;
 
     friend class DashDBus;
-    friend class LauncherDBus;
 };
 
 Q_DECLARE_METATYPE(ShellDeclarativeView*)

=== removed file 'shell/app/unity-2d-launcher.service.in'
--- shell/app/unity-2d-launcher.service.in	2011-11-11 18:46:20 +0000
+++ shell/app/unity-2d-launcher.service.in	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=com.canonical.Unity2d.Launcher
-Exec=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/unity-2d-shell

=== modified file 'shell/launcher/Launcher.qml'
--- shell/launcher/Launcher.qml	2012-02-17 17:38:27 +0000
+++ shell/launcher/Launcher.qml	2012-02-23 10:23:17 +0000
@@ -205,11 +205,6 @@
     }
 
     Connections {
-        target: declarativeView
-        onAddWebFavoriteRequested: applications.insertWebFavorite(url)
-    }
-
-    Connections {
         target: applications
         onApplicationBecameUrgent: {
             if (main.autoScrolling) {