~ubuntu-branches/ubuntu/trusty/bluez/trusty

« back to all changes in this revision

Viewing changes to debian/patches/telephony_ofono_add_watch.patch

  • Committer: Package Import Robot
  • Author(s): Mathieu Trudel-Lapierre
  • Date: 2013-12-19 21:36:00 UTC
  • Revision ID: package-import@ubuntu.com-20131219213600-4g6ut812p970tp2u
Tags: 4.101-0ubuntu10
* debian/patches/telephony_ofono_add_watch.patch: fix telephony-ofono code
  to have the add_watch function not be conditioned out, since it's used.
* debian/rules: explicitly specify to use ofono a the telephony service. 
* debian/bluez.dirs: add /var/lib/bluetooth, we need to have it created
  on Ubuntu Touch so that discovery writes cache data for classes, seen
  addresses, etc. (LP: #1234361)

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
From: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>
 
2
Subject: Move add_watch so it's available to the code calling it.
 
3
 
 
4
It should not have been conditioned out, add_watch is not hal code
 
5
and is used elsewhere in the telephony ofono plugin.
 
6
 
 
7
---
 
8
 audio/telephony-ofono.c |   24 ++++++++++++------------
 
9
 2 files changed, 14 insertions(+), 12 deletions(-)
 
10
 
 
11
Index: b/audio/telephony-ofono.c
 
12
===================================================================
 
13
--- a/audio/telephony-ofono.c
 
14
+++ b/audio/telephony-ofono.c
 
15
@@ -1465,18 +1465,6 @@ static gboolean handle_hal_property_modi
 
16
        return TRUE;
 
17
 }
 
18
 
 
19
-static void add_watch(const char *sender, const char *path,
 
20
-                               const char *interface, const char *member,
 
21
-                               GDBusSignalFunction function)
 
22
-{
 
23
-       guint watch;
 
24
-
 
25
-       watch = g_dbus_add_signal_watch(connection, sender, path, interface,
 
26
-                                       member, function, NULL, NULL);
 
27
-
 
28
-       watches = g_slist_prepend(watches, GUINT_TO_POINTER(watch));
 
29
-}
 
30
-
 
31
 static void hal_find_device_reply(DBusPendingCall *call, void *user_data)
 
32
 {
 
33
        DBusMessage *reply;
 
34
@@ -1529,6 +1517,18 @@ done:
 
35
 }
 
36
 #endif /* Disable hal */
 
37
 
 
38
+static void add_watch(const char *sender, const char *path,
 
39
+                               const char *interface, const char *member,
 
40
+                               GDBusSignalFunction function)
 
41
+{
 
42
+       guint watch;
 
43
+
 
44
+       watch = g_dbus_add_signal_watch(connection, sender, path, interface,
 
45
+                                       member, function, NULL, NULL);
 
46
+
 
47
+       watches = g_slist_prepend(watches, GUINT_TO_POINTER(watch));
 
48
+}
 
49
+
 
50
 static void handle_service_connect(DBusConnection *conn, void *user_data)
 
51
 {
 
52
        DBG("telephony-ofono: %s found", OFONO_BUS_NAME);