← Back to branch summary

~ubuntu-branches/ubuntu/saucy/bluez/saucy

« back to all changes in this revision

Viewing changes to debian/patches/02_disable_hal.patch

  • Committer: Package Import Robot
  • Author(s): Robert Ancell
  • Date: 2012-07-04 13:28:49 UTC
  • mfrom: (1.1.38)
  • Revision ID: package-import@ubuntu.com-20120704132849-tmwu1x7p2vxcclt1
Tags: 4.101-0ubuntu1
* New upstream release
* debian/libbluetooth3.symbols:
  - Updated
* debian/patches/10-unregister_interface_on_exit.patch:
* debian/patches/11-explicitly_close.patch:
* debian/patches/python3.patch:
  - Applied upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/02_disable_hal.patch
5
5
Updated by Nobuhiro Iwamatsu <iwamatsu@debian.org>
6
6
Debian BTS: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=599023
7
7
 
8
 
Index: ubuntu/audio/telephony-maemo5.c
 
8
Index: bluez-4.101/audio/telephony-maemo5.c
9
9
===================================================================
10
 
--- ubuntu.orig/audio/telephony-maemo5.c        2012-05-01 15:49:23.081014137 +0100
11
 
+++ ubuntu/audio/telephony-maemo5.c     2012-05-01 15:49:52.937012824 +0100
 
10
--- bluez-4.101.orig/audio/telephony-maemo5.c   2012-06-14 03:04:20.000000000 +1200
 
11
+++ bluez-4.101/audio/telephony-maemo5.c        2012-07-04 13:31:49.200092014 +1200
12
12
@@ -1385,6 +1385,7 @@
13
13
        return type == DBUS_TYPE_INVALID ? TRUE : FALSE;
14
14
 }
41
41
 
42
42
 static void phonebook_read_reply(DBusPendingCall *call, void *user_data)
43
43
 {
44
 
@@ -2018,9 +2022,11 @@
 
44
@@ -2019,9 +2023,11 @@
45
45
        else if (dbus_message_is_signal(msg, NETWORK_INTERFACE,
46
46
                                        "signal_strength_change"))
47
47
                handle_signal_strength_change(msg);
53
53
        else if (dbus_message_is_signal(msg, SSC_DBUS_IFACE,
54
54
                                                "modem_state_changed_ind"))
55
55
                handle_modem_state(msg);
56
 
@@ -2077,6 +2083,7 @@
 
56
@@ -2078,6 +2084,7 @@
57
57
 
58
58
        telephony_ready_ind(features, maemo_indicators, BTRH_NOT_SUPPORTED,
59
59
                                                                chld_str);
61
61
        if (send_method_call("org.freedesktop.Hal",
62
62
                                "/org/freedesktop/Hal/Manager",
63
63
                                "org.freedesktop.Hal.Manager",
64
 
@@ -2085,7 +2092,7 @@
 
64
@@ -2086,7 +2093,7 @@
65
65
                                DBUS_TYPE_STRING, &battery_cap,
66
66
                                DBUS_TYPE_INVALID) < 0)
67
67
                error("Unable to send HAL method call");
70
70
        return 0;
71
71
 }
72
72
 
73
 
Index: ubuntu/audio/telephony-maemo6.c
 
73
Index: bluez-4.101/audio/telephony-maemo6.c
74
74
===================================================================
75
 
--- ubuntu.orig/audio/telephony-maemo6.c        2012-05-01 15:49:23.069014137 +0100
76
 
+++ ubuntu/audio/telephony-maemo6.c     2012-05-01 15:49:52.941012824 +0100
77
 
@@ -1576,6 +1576,7 @@
 
75
--- bluez-4.101.orig/audio/telephony-maemo6.c   2012-06-14 03:04:20.000000000 +1200
 
76
+++ bluez-4.101/audio/telephony-maemo6.c        2012-07-04 13:31:49.200092014 +1200
 
77
@@ -1575,6 +1575,7 @@
78
78
        return type == DBUS_TYPE_INVALID ? TRUE : FALSE;
79
79
 }
80
80
 
82
82
 static void hal_battery_level_reply(DBusPendingCall *call, void *user_data)
83
83
 {
84
84
        DBusError err;
85
 
@@ -1691,6 +1692,7 @@
 
85
@@ -1690,6 +1691,7 @@
86
86
                dbus_message_iter_next(&array);
87
87
        }
88
88
 }
90
90
 
91
91
 static void csd_call_free(void *data)
92
92
 {
93
 
@@ -2045,9 +2047,11 @@
 
93
@@ -2044,9 +2046,11 @@
94
94
        else if (dbus_message_is_signal(msg, CSD_CSNET_SIGNAL,
95
95
                                "SignalBarsChanged"))
96
96
                handle_signal_bars_changed(msg);
102
102
        else if (dbus_message_is_signal(msg, SSC_DBUS_IFACE,
103
103
                                                "modem_state_changed_ind"))
104
104
                handle_modem_state(msg);
105
 
@@ -2066,6 +2070,7 @@
 
105
@@ -2065,6 +2069,7 @@
106
106
        watches = g_slist_prepend(watches, GUINT_TO_POINTER(watch));
107
107
 }
108
108
 
110
110
 static void hal_find_device_reply(DBusPendingCall *call, void *user_data)
111
111
 {
112
112
        DBusError err;
113
 
@@ -2116,6 +2121,8 @@
 
113
@@ -2115,6 +2120,8 @@
114
114
        remove_pending(call);
115
115
 }
116
116
 
119
119
 int telephony_init(void)
120
120
 {
121
121
        const char *battery_cap = "battery";
122
 
@@ -2155,6 +2162,7 @@
 
122
@@ -2154,6 +2161,7 @@
123
123
 
124
124
        telephony_ready_ind(features, maemo_indicators, BTRH_NOT_SUPPORTED,
125
125
                                                                chld_str);
127
127
        if (send_method_call("org.freedesktop.Hal",
128
128
                                "/org/freedesktop/Hal/Manager",
129
129
                                "org.freedesktop.Hal.Manager",
130
 
@@ -2163,7 +2171,7 @@
 
130
@@ -2162,7 +2170,7 @@
131
131
                                DBUS_TYPE_STRING, &battery_cap,
132
132
                                DBUS_TYPE_INVALID) < 0)
133
133
                error("Unable to send HAL method call");
136
136
        return 0;
137
137
 }
138
138
 
139
 
Index: ubuntu/audio/telephony-ofono.c
 
139
Index: bluez-4.101/audio/telephony-ofono.c
140
140
===================================================================
141
 
--- ubuntu.orig/audio/telephony-ofono.c 2012-05-01 15:49:23.093014136 +0100
142
 
+++ ubuntu/audio/telephony-ofono.c      2012-05-01 15:49:52.941012824 +0100
143
 
@@ -1344,6 +1344,7 @@
 
141
--- bluez-4.101.orig/audio/telephony-ofono.c    2012-06-14 03:04:20.000000000 +1200
 
142
+++ bluez-4.101/audio/telephony-ofono.c 2012-07-04 13:31:49.200092014 +1200
 
143
@@ -1343,6 +1343,7 @@
144
144
        return TRUE;
145
145
 }
146
146
 
148
148
 static void hal_battery_level_reply(DBusPendingCall *call, void *user_data)
149
149
 {
150
150
        DBusMessage *reply;
151
 
@@ -1527,6 +1528,7 @@
 
151
@@ -1526,6 +1527,7 @@
152
152
        dbus_message_unref(reply);
153
153
        remove_pending(call);
154
154
 }
156
156
 
157
157
 static void handle_service_connect(DBusConnection *conn, void *user_data)
158
158
 {
159
 
@@ -1582,6 +1584,7 @@
 
159
@@ -1581,6 +1583,7 @@
160
160
 
161
161
        watches = g_slist_prepend(watches, GUINT_TO_POINTER(watch));
162
162
 
164
164
        ret = send_method_call("org.freedesktop.Hal",
165
165
                                "/org/freedesktop/Hal/Manager",
166
166
                                "org.freedesktop.Hal.Manager",
167
 
@@ -1591,7 +1594,7 @@
 
167
@@ -1590,7 +1593,7 @@
168
168
                                DBUS_TYPE_INVALID);
169
169
        if (ret < 0)
170
170
                return ret;