~noskcaj/gnome-control-center/3.14

From d15a9709f2782dc36b8d86905507a014922f01ed Mon Sep 17 00:00:00 2001

From: Tim Lunn <tim@feathertop.org>

Date: Wed, 23 Oct 2013 07:39:24 +1100

Subject: [PATCH] Revert "Update adapter interface for BlueZ 5"

 

This reverts commit ac43647ac01cb990555c7b4ff7b8bf5fb8b17b83.

---

 panels/bluetooth/cc-bluetooth-panel.c | 7 ++-----

 1 file changed, 2 insertions(+), 5 deletions(-)

 

--- a/panels/bluetooth/cc-bluetooth-panel.c

+++ b/panels/bluetooth/cc-bluetooth-panel.c

@@ -43,9 +43,6 @@

 

 #define WID(s) GTK_WIDGET (gtk_builder_get_object (self->priv->builder, s))

 

-#define BLUEZ_SERVICE  "org.bluez"

-#define ADAPTER_IFACE  "org.bluez.Adapter1"

-

 #define KEYBOARD_PREFS         "keyboard"

 #define MOUSE_PREFS            "mouse"

 #define SOUND_PREFS            "sound"

@@ -675,9 +672,9 @@

        adapter_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,

                                                       G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES | G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START,

                                                       NULL,

-                                                      BLUEZ_SERVICE,

+                                                      "org.bluez",

                                                       adapter,

-                                                      ADAPTER_IFACE,

+                                                      "org.bluez.Adapter",

                                                       NULL,

                                                       &error);

        g_free (adapter);