Unity: remove the dbus-glib dependency

We don't really need it anymore. (bzr r2554.1.1)

6 files changed, 2 insertions, 20 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ef345f187..34e2b8a79 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -134,7 +134,7 @@ endif (DISABLE_MAINTAINER_CFLAGS)
 # Compiz Plugins
 #
 
-set (UNITY_PLUGIN_DEPS "compiz;nux-3.0>=3.0.0;libbamf3;dee-1.0;gio-2.0;gio-unix-2.0;dbusmenu-glib-0.4;dbus-glib-1;x11;libstartup-notification-1.0;gthread-2.0;indicator3-0.4>=0.4.90;atk;unity-misc>=0.4.0;gtk+-3.0>=3.1;sigc++-2.0;json-glib-1.0;libnotify;xfixes;unity-protocol-private>=5.93.1;libgeis")
+set (UNITY_PLUGIN_DEPS "compiz;nux-3.0>=3.0.0;libbamf3;dee-1.0;gio-2.0;gio-unix-2.0;dbusmenu-glib-0.4;x11;libstartup-notification-1.0;gthread-2.0;indicator3-0.4>=0.4.90;atk;unity-misc>=0.4.0;gtk+-3.0>=3.1;sigc++-2.0;json-glib-1.0;libnotify;xfixes;unity-protocol-private>=5.93.1;libgeis")
 # FIXME: unity-protocol-private shouldn't be there, but building of unityshell is just broken
 set (UNITY_PROTOCOL_PRIVATE_DEPS "unity-protocol-private>=5.93.1")
 
diff --git a/launcher/StandaloneLauncher.cpp b/launcher/StandaloneLauncher.cpp
index 8dba0e4f7..a4a2dc01e 100644
--- a/launcher/StandaloneLauncher.cpp
+++ b/launcher/StandaloneLauncher.cpp
@@ -37,7 +37,6 @@
 #include "Launcher.h"
 #include "unity-shared/PanelStyle.h"
 #include "unity-shared/UnitySettings.h"
-#include <dbus/dbus-glib.h>
 
 using namespace unity;
 
@@ -52,11 +51,7 @@ void ThreadWidgetInit(nux::NThread* thread, void* InitData)
 int main(int argc, char** argv)
 {
 g_type_init();
- 
 gtk_init(&argc, &argv);
-
- dbus_g_thread_init();
-
 nux::NuxInitialize(0);
 
 unity::Settings settings;
diff --git a/launcher/StandaloneSwitcher.cpp b/launcher/StandaloneSwitcher.cpp
index 894f04e85..9a9745ba0 100644
--- a/launcher/StandaloneSwitcher.cpp
+++ b/launcher/StandaloneSwitcher.cpp
@@ -34,7 +34,6 @@
 #include "SwitcherController.h"
 #include "MockLauncherIcon.h"
 #include "unity-shared/BackgroundEffectHelper.h"
-#include <dbus/dbus-glib.h>
 
 using namespace unity::switcher;
 using namespace unity::ui;
@@ -288,9 +287,7 @@ void ThreadWidgetInit(nux::NThread* thread, void* InitData)
 int main(int argc, char** argv)
 {
 g_type_init();
- 
 gtk_init(&argc, &argv);
-
 nux::NuxInitialize(0);
 
 BackgroundEffectHelper::blur_type = unity::BLUR_ACTIVE;
diff --git a/panel/StandalonePanel.cpp b/panel/StandalonePanel.cpp
index 6dfa4ff11..0ca26601f 100644
--- a/panel/StandalonePanel.cpp
+++ b/panel/StandalonePanel.cpp
@@ -28,7 +28,6 @@
 #include "unity-shared/UnitySettings.h"
 #include "unity-shared/PanelStyle.h"
 #include "PanelView.h"
-#include <dbus/dbus-glib.h>
 
 void ThreadWidgetInit(nux::NThread* thread, void* InitData)
 {
@@ -46,11 +45,7 @@ void ThreadWidgetInit(nux::NThread* thread, void* InitData)
 int main(int argc, char** argv)
 {
 g_type_init();
- 
 gtk_init(&argc, &argv);
-
- dbus_g_thread_init();
-
 nux::NuxInitialize(0);
 
 // The instances for the pseudo-singletons.
diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index fafd00333..73c243491 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -39,8 +39,6 @@
 #include "BackgroundEffectHelper.h"
 #include "UnityGestureBroker.h"
 
-#include <dbus/dbus.h>
-#include <dbus/dbus-glib.h>
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
@@ -202,8 +200,6 @@ UnityScreen::UnityScreen(CompScreen* screen)
 {
 notify_init("unityshell");
 
- dbus_g_thread_init();
-
 unity_a11y_preset_environment();
 
 XSetErrorHandler(old_handler);
diff --git a/shortcuts/StandaloneShortcuts.cpp b/shortcuts/StandaloneShortcuts.cpp
index e989b4d3a..7abb1f2ef 100644
--- a/shortcuts/StandaloneShortcuts.cpp
+++ b/shortcuts/StandaloneShortcuts.cpp
@@ -16,8 +16,7 @@
 *
 * Authored by: Andrea Azzarone <azzaronea@gmail.com>
 */
- 
-#include <dbus/dbus-glib.h>
+
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 #include <Nux/Nux.h>