← Back to branch summary

~robert-ancell/gnome-control-center/bluez5

« back to all changes in this revision

Viewing changes to debian/patches/revert-bluetooth-BlueZ5-interface.patch

  • Committer: Robert Ancell
  • Date: 2014-11-28 01:52:16 UTC
  • Revision ID: robert.ancell@canonical.com-20141128015216-p9652vq24haq2o6b
* debian/control:
  - Bump build-depends on libgnome-bluetooth-dev
* debian/patches/revert-bluetooth-BlueZ5-interface.patch:
* debian/patches/revert_git_new_bluetooth_panel.patch:
* debian/patches/revert_new_bluetooth.patch:
  - Drop, we now have Bluez 5

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/revert-bluetooth-BlueZ5-interface.patch
1
 
From d15a9709f2782dc36b8d86905507a014922f01ed Mon Sep 17 00:00:00 2001
2
 
From: Tim Lunn <tim@feathertop.org>
3
 
Date: Wed, 23 Oct 2013 07:39:24 +1100
4
 
Subject: [PATCH] Revert "Update adapter interface for BlueZ 5"
5
 
 
6
 
This reverts commit ac43647ac01cb990555c7b4ff7b8bf5fb8b17b83.
7
 
---
8
 
 panels/bluetooth/cc-bluetooth-panel.c | 7 ++-----
9
 
 1 file changed, 2 insertions(+), 5 deletions(-)
10
 
 
11
 
--- a/panels/bluetooth/cc-bluetooth-panel.c
12
 
+++ b/panels/bluetooth/cc-bluetooth-panel.c
13
 
@@ -43,9 +43,6 @@
14
 
 
15
 
 #define WID(s) GTK_WIDGET (gtk_builder_get_object (self->priv->builder, s))
16
 
 
17
 
-#define BLUEZ_SERVICE  "org.bluez"
18
 
-#define ADAPTER_IFACE  "org.bluez.Adapter1"
19
 
-
20
 
 #define KEYBOARD_PREFS         "keyboard"
21
 
 #define MOUSE_PREFS            "mouse"
22
 
 #define SOUND_PREFS            "sound"
23
 
@@ -675,9 +672,9 @@
24
 
        adapter_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
25
 
                                                       G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES | G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START,
26
 
                                                       NULL,
27
 
-                                                      BLUEZ_SERVICE,
28
 
+                                                      "org.bluez",
29
 
                                                       adapter,
30
 
-                                                      ADAPTER_IFACE,
31
 
+                                                      "org.bluez.Adapter",
32
 
                                                       NULL,
33
 
                                                       &error);
34
 
        g_free (adapter);