← Back to branch summary

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

« back to all changes in this revision

Viewing changes to audio/a2dp.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:
audio/a2dp.c
36
36
#include <bluetooth/sdp.h>
37
37
#include <bluetooth/sdp_lib.h>
38
38
 
 
39
#include "glib-helper.h"
39
40
#include "log.h"
40
41
#include "device.h"
41
42
#include "manager.h"
163
164
        setups = g_slist_remove(setups, s);
164
165
        if (s->session)
165
166
                avdtp_unref(s->session);
166
 
        g_slist_foreach(s->cb, (GFunc) g_free, NULL);
167
 
        g_slist_free(s->cb);
168
 
        g_slist_foreach(s->caps, (GFunc) g_free, NULL);
169
 
        g_slist_free(s->caps);
 
167
        g_slist_free_full(s->cb, g_free);
 
168
        g_slist_free_full(s->caps, g_free);
170
169
        g_free(s);
171
170
}
172
171
 
371
370
                sep->session = NULL;
372
371
        }
373
372
 
 
373
        sep->stream = NULL;
 
374
 
374
375
        if (sep->endpoint)
375
376
                media_endpoint_clear_configuration(sep->endpoint);
376
 
 
377
 
        sep->stream = NULL;
378
 
 
379
377
}
380
378
 
381
379
static gboolean auto_config(gpointer data)
1549
1547
        if (!server)
1550
1548
                return;
1551
1549
 
1552
 
        g_slist_foreach(server->sinks, (GFunc) a2dp_remove_sep, NULL);
1553
 
        g_slist_free(server->sinks);
1554
 
 
1555
 
        g_slist_foreach(server->sources, (GFunc) a2dp_remove_sep, NULL);
1556
 
        g_slist_free(server->sources);
 
1550
        g_slist_free_full(server->sinks, (GDestroyNotify) a2dp_remove_sep);
 
1551
        g_slist_free_full(server->sources, (GDestroyNotify) a2dp_remove_sep);
1557
1552
 
1558
1553
        avdtp_exit(src);
1559
1554
 
2074
2069
 
2075
2070
        /* Copy given caps if they are different than current caps */
2076
2071
        if (setup->caps != caps) {
2077
 
                g_slist_foreach(setup->caps, (GFunc) g_free, NULL);
2078
 
                g_slist_free(setup->caps);
 
2072
                g_slist_free_full(setup->caps, g_free);
2079
2073
                setup->caps = g_slist_copy(caps);
2080
2074
        }
2081
2075