← Back to branch summary

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

« back to all changes in this revision

Viewing changes to network/connection.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:
network/connection.c
477
477
        return reply;
478
478
}
479
479
 
480
 
static void connection_free(struct network_conn *nc)
 
480
static void connection_free(void *data)
481
481
{
 
482
        struct network_conn *nc = data;
 
483
 
482
484
        if (nc->dc_id)
483
485
                device_remove_disconnect_watch(nc->peer->device, nc->dc_id);
484
486
 
490
492
 
491
493
static void peer_free(struct network_peer *peer)
492
494
{
493
 
        g_slist_foreach(peer->connections, (GFunc) connection_free, NULL);
494
 
        g_slist_free(peer->connections);
 
495
        g_slist_free_full(peer->connections, connection_free);
495
496
        btd_device_unref(peer->device);
496
497
        g_free(peer->path);
497
498
        g_free(peer);