← Back to branch summary

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

« back to all changes in this revision

Viewing changes to .pc/02_disable_hal.patch/audio/telephony-maemo6.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:
.pc/02_disable_hal.patch/audio/telephony-maemo6.c
448
448
        }
449
449
}
450
450
 
451
 
static void pending_req_finalize(struct pending_req *req)
 
451
static void pending_req_finalize(void *data)
452
452
{
 
453
        struct pending_req *req = data;
 
454
 
453
455
        if (!dbus_pending_call_get_completed(req->call))
454
456
                dbus_pending_call_cancel(req->call);
455
457
 
1486
1488
        }
1487
1489
}
1488
1490
 
1489
 
static void csd_call_free(struct csd_call *call)
 
1491
static void csd_call_free(void *data)
1490
1492
{
 
1493
        struct csd_call *call = data;
 
1494
 
1491
1495
        if (!call)
1492
1496
                return;
1493
1497
 
1975
1979
        g_slist_free(active_calls);
1976
1980
        active_calls = NULL;
1977
1981
 
1978
 
        g_slist_foreach(calls, (GFunc) csd_call_free, NULL);
1979
 
        g_slist_free(calls);
 
1982
        g_slist_free_full(calls, csd_call_free);
1980
1983
        calls = NULL;
1981
1984
 
1982
 
        g_slist_foreach(pending, (GFunc) pending_req_finalize, NULL);
1983
 
        g_slist_free(pending);
 
1985
        g_slist_free_full(pending, pending_req_finalize);
1984
1986
        pending = NULL;
1985
1987
 
1986
 
        g_slist_foreach(watches, (GFunc) remove_watch, NULL);
1987
 
        g_slist_free(watches);
 
1988
        g_slist_free_full(pending, remove_watch);
1988
1989
        watches = NULL;
1989
1990
 
1990
1991
        dbus_connection_unref(connection);