← Back to branch summary

~ubuntu-branches/ubuntu/vivid/blueman/vivid-proposed

« back to all changes in this revision

Viewing changes to blueman/main/HalManager.py

  • Committer: Package Import Robot
  • Author(s): Artur Rona
  • Date: 2014-12-24 18:33:36 UTC
  • mfrom: (2.3.8 sid)
  • Revision ID: package-import@ubuntu.com-20141224183336-cyb82ot0y8tz8flq
Tags: 1.99~alpha1-1ubuntu1
* Merge from Debian unstable.  Remaining changes:
  - debian/patches/01_dont_autostart_lxde.patch:
    + Don't autostart the applet in LXDE.
  - debian/patches/03_filemanager_fix.patch:
    + Add support for more filemanagers.
* debian/patches/02_dont_crash_on_non-bluetooth_card.patch:
  - Dropped, no longer applicable.

Show diffs side-by-side

added added

removed removed

Lines of Context:
blueman/main/HalManager.py
21
21
import re
22
22
from blueman.Lib import probe_modem
23
23
import os
24
 
import gobject
 
24
from gi.repository import GObject
25
25
 
26
26
def mkname():
27
27
    i = 0
52
52
                                        device = dbus.Interface(obj, 'org.freedesktop.Hal.Device')
53
53
                                        device.SetPropertyString("info.category", "net.80203")
54
54
                                        device.AddCapability("net.80203")
55
 
                gobject.timeout_add(1000, reg)
 
55
                GObject.timeout_add(1000, reg)
56
56
 
57
57
        def register(self, device_file, bd_addr, ok, err):
58
58
 
142
142
                                
143
143
                                        self.CommitToGdl(ref, "/org/freedesktop/Hal/devices/%s" % "rfcomm%s" % portid)
144
144
                                                
145
 
                                        gobject.timeout_add(1000, os.unlink, rule_file)
 
145
                                        GObject.timeout_add(1000, os.unlink, rule_file)
146
146
                
147
 
                                gobject.timeout_add(1000, check_hal, device)
 
147
                                GObject.timeout_add(1000, check_hal, device)
148
148
                
149
149
                dprint("Probing device %s for capabilities" % device_file)
150
150
                probe_modem(device_file, probe_response)