← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/main.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:
src/main.c
33
33
#include <stdlib.h>
34
34
#include <string.h>
35
35
#include <signal.h>
 
36
#include <sys/types.h>
36
37
#include <sys/stat.h>
37
 
#include <sys/ioctl.h>
38
 
#include <sys/socket.h>
39
 
#include <sys/types.h>
40
38
 
41
39
#include <bluetooth/bluetooth.h>
42
40
#include <bluetooth/uuid.h>
53
51
#include "sdpd.h"
54
52
#include "attrib-server.h"
55
53
#include "adapter.h"
56
 
#include "event.h"
57
54
#include "dbus-common.h"
58
55
#include "agent.h"
59
56
#include "manager.h"
238
235
{
239
236
        /* Default HCId settings */
240
237
        memset(&main_opts, 0, sizeof(main_opts));
241
 
        main_opts.scan  = SCAN_PAGE;
242
238
        main_opts.mode  = MODE_CONNECTABLE;
243
239
        main_opts.name  = g_strdup("BlueZ");
244
240
        main_opts.discovto      = DEFAULT_DISCOVERABLE_TIMEOUT;