← Back to branch summary

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

« back to all changes in this revision

Viewing changes to blueman/plugins/applet/PPPSupport.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/plugins/applet/PPPSupport.py
24
24
from blueman.main.PPPConnection import PPPConnection
25
25
from blueman.main.Config import Config
26
26
 
27
 
import gobject
 
27
from gi.repository import GObject
28
28
 
29
29
from blueman.Sdp import *
30
30
import os
44
44
                        self.connect()
45
45
                else:
46
46
                        dprint("ModemManager is running, delaying connection 5sec for it to complete probing")
47
 
                        gobject.timeout_add(5000, self.connect)
 
47
                        GObject.timeout_add(5000, self.connect)
48
48
                
49
49
        def connect(self):
50
50
                c = Config("gsm_settings/" + self.device.Address)
59
59
        
60
60
        def on_error(self, error):
61
61
                self.error_handler(error)
62
 
                gobject.timeout_add(1000, self.device.Services["serial"].Disconnect, self.port)
 
62
                GObject.timeout_add(1000, self.device.Services["serial"].Disconnect, self.port)
63
63
                
64
64
        def on_connected(self, iface):
65
65
                self.reply_handler(self.port)