← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/bluez/oneiric-proposed

« back to all changes in this revision

Viewing changes to src/device.c

  • Committer: Bazaar Package Importer
  • Author(s): Mathieu Trudel-Lapierre
  • Date: 2011-07-28 16:47:35 UTC
  • mfrom: (1.1.34 upstream) (6.3.15 sid)
  • Revision ID: james.westby@ubuntu.com-20110728164735-f34luwrarv52mhlq
Tags: 4.95-0ubuntu1
* New upstream release.
* Resynchronize with Debian unstable, remaining changes:
  - debian/source_bluez.py, debian/bluez.install:
    + apport hook made by Baptiste Mille-Mathias.
  - debian/rules: don't use simple-patchsys.
  - debian/source/format: use source format 3.0.
  - debian/patches/pkg-config-install-paths.patch: install bluez-alsa plugin
    to the multiarch path, now that alsa-lib has transitioned.
* debian/patches/02_disable_hal.patch: refreshed.
* debian/patches/pkg-config-install-paths.patch: refreshed.
* debian/control, debian/rules: run autoreconf when building as required by
  pkg-config-install-paths.patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/device.c
156
156
                dbus_connection_unref(req->conn);
157
157
        if (req->device)
158
158
                btd_device_unref(req->device);
159
 
        g_slist_foreach(req->profiles_added, (GFunc) g_free, NULL);
160
 
        g_slist_free(req->profiles_added);
 
159
        g_slist_free_full(req->profiles_added, g_free);
161
160
        g_slist_free(req->profiles_removed);
162
161
        if (req->records)
163
162
                sdp_list_free(req->records, (sdp_free_func_t) sdp_record_free);
198
197
                                agent_is_busy(agent, device->authr)))
199
198
                agent_cancel(agent);
200
199
 
201
 
        g_slist_foreach(device->services, (GFunc) g_free, NULL);
202
 
        g_slist_free(device->services);
203
 
 
204
 
        g_slist_foreach(device->uuids, (GFunc) g_free, NULL);
205
 
        g_slist_free(device->uuids);
206
 
 
207
 
        g_slist_foreach(device->primaries, (GFunc) g_free, NULL);
208
 
        g_slist_free(device->primaries);
 
200
        g_slist_free_full(device->services, g_free);
 
201
        g_slist_free_full(device->uuids, g_free);
 
202
        g_slist_free_full(device->primaries, g_free);
209
203
 
210
204
        if (device->tmp_records)
211
205
                sdp_list_free(device->tmp_records,
965
959
        /* Delete the link key from storage */
966
960
        textfile_casedel(filename, dstaddr);
967
961
 
 
962
        create_name(filename, PATH_MAX, STORAGEDIR, srcaddr,
 
963
                                                "aliases");
 
964
        /* Remove alias when bonding is deleted */
 
965
        textfile_casedel(filename, dstaddr);
 
966
 
968
967
        btd_adapter_remove_bonding(device->adapter, &device->bdaddr);
969
968
}
970
969
 
2214
2213
}
2215
2214
 
2216
2215
int device_request_authentication(struct btd_device *device, auth_type_t type,
2217
 
                                                uint32_t passkey, void *cb)
 
2216
                                uint32_t passkey, gboolean secure, void *cb)
2218
2217
{
2219
2218
        struct authentication_req *auth;
2220
2219
        struct agent *agent;
2244
2243
 
2245
2244
        switch (type) {
2246
2245
        case AUTH_TYPE_PINCODE:
2247
 
                err = agent_request_pincode(agent, device, pincode_cb,
 
2246
                err = agent_request_pincode(agent, device, pincode_cb, secure,
2248
2247
                                                                auth, NULL);
2249
2248
                break;
2250
2249
        case AUTH_TYPE_PASSKEY: