← Back to branch summary

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

« back to all changes in this revision

Viewing changes to audio/telephony-maemo5.c

  • 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:
audio/telephony-maemo5.c
1014
1014
                                        DBUS_TYPE_UINT32, &cause_type,
1015
1015
                                        DBUS_TYPE_UINT32, &cause,
1016
1016
                                        DBUS_TYPE_INVALID)) {
1017
 
                error("Unexpected paramters in Instance.CallStatus() signal");
 
1017
                error("Unexpected parameters in Instance.CallStatus() signal");
1018
1018
                return;
1019
1019
        }
1020
1020
 
1955
1955
                return btd_error_invalid_args(msg);
1956
1956
}
1957
1957
 
1958
 
static GDBusMethodTable telephony_maemo_methods[] = {
1959
 
        {"SetCallerId",         "s",    "",     set_callerid,
1960
 
                                                G_DBUS_METHOD_FLAG_ASYNC},
 
1958
static const GDBusMethodTable telephony_maemo_methods[] = {
 
1959
        { GDBUS_ASYNC_METHOD("SetCallerId",
 
1960
                                GDBUS_ARGS({ "id", "s" }), NULL,
 
1961
                                set_callerid) },
1961
1962
        { }
1962
1963
};
1963
1964