~ubuntu-branches/ubuntu/trusty/bluez/trusty

« back to all changes in this revision

Viewing changes to audio/telephony-ofono.c

  • Committer: Package Import Robot
  • Author(s): Mathieu Trudel-Lapierre
  • Date: 2013-12-19 21:36:00 UTC
  • Revision ID: package-import@ubuntu.com-20131219213600-4g6ut812p970tp2u
Tags: 4.101-0ubuntu10
* debian/patches/telephony_ofono_add_watch.patch: fix telephony-ofono code
  to have the add_watch function not be conditioned out, since it's used.
* debian/rules: explicitly specify to use ofono a the telephony service. 
* debian/bluez.dirs: add /var/lib/bluetooth, we need to have it created
  on Ubuntu Touch so that discovery writes cache data for classes, seen
  addresses, etc. (LP: #1234361)

Show diffs side-by-side

added added

removed removed

Lines of Context:
1465
1465
        return TRUE;
1466
1466
}
1467
1467
 
1468
 
static void add_watch(const char *sender, const char *path,
1469
 
                                const char *interface, const char *member,
1470
 
                                GDBusSignalFunction function)
1471
 
{
1472
 
        guint watch;
1473
 
 
1474
 
        watch = g_dbus_add_signal_watch(connection, sender, path, interface,
1475
 
                                        member, function, NULL, NULL);
1476
 
 
1477
 
        watches = g_slist_prepend(watches, GUINT_TO_POINTER(watch));
1478
 
}
1479
 
 
1480
1468
static void hal_find_device_reply(DBusPendingCall *call, void *user_data)
1481
1469
{
1482
1470
        DBusMessage *reply;
1529
1517
}
1530
1518
#endif /* Disable hal */
1531
1519
 
 
1520
static void add_watch(const char *sender, const char *path,
 
1521
                                const char *interface, const char *member,
 
1522
                                GDBusSignalFunction function)
 
1523
{
 
1524
        guint watch;
 
1525
 
 
1526
        watch = g_dbus_add_signal_watch(connection, sender, path, interface,
 
1527
                                        member, function, NULL, NULL);
 
1528
 
 
1529
        watches = g_slist_prepend(watches, GUINT_TO_POINTER(watch));
 
1530
}
 
1531
 
1532
1532
static void handle_service_connect(DBusConnection *conn, void *user_data)
1533
1533
{
1534
1534
        DBG("telephony-ofono: %s found", OFONO_BUS_NAME);