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

« back to all changes in this revision

Viewing changes to input/server.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2011-06-06 18:11:44 UTC
  • mfrom: (1.1.33 upstream) (6.3.13 sid)
  • Revision ID: james.westby@ubuntu.com-20110606181144-28qwmmobedosb2ct
Tags: 4.94-0ubuntu1
* Resynchronize on Debian, remaining diff:
* debian/bluez.bluetooth.default:
  - Drop.  Doesn't do anything now.
* debian/control:
  - use arch: any rather than a list of architectures
* debian/bluez.bluetooth.init:
  - Drop most calls in this script as now all it serves as is to 
    workaround a problem with dbus not being ready early enough. Once dbus is 
    started by an upstart service, this should be able to be converted 
    to an upstart service too.
* debian/rules:
  - Don't build hid2hci anymore.  It's part of udev now.
  - Don't install bluez_agent.udev, doesn't work in Ubuntu.
  - Don't use simple-patchsys
* debian/source_bluez.py, debian/bluez.install:
  - apport hook made by Baptiste Mille-Mathias.      
* debian/source/format: 
  - use source format 3.0.

Show diffs side-by-side

added added

removed removed

Lines of Context:
91
91
        /* Send unplug virtual cable to unknown devices */
92
92
        if (ret == -ENOENT && psm == L2CAP_PSM_HIDP_CTRL) {
93
93
                unsigned char unplug = 0x15;
94
 
                int err, sk = g_io_channel_unix_get_fd(chan);
95
 
                err = write(sk, &unplug, sizeof(unplug));
 
94
                int sk = g_io_channel_unix_get_fd(chan);
 
95
                if (write(sk, &unplug, sizeof(unplug)) < 0)
 
96
                        error("Unable to send virtual cable unplug");
96
97
        }
97
98
 
98
99
        g_io_channel_shutdown(chan, TRUE, NULL);