projects / packages / bitlbee.git / blame
| Commit | Line | Data |
|---|---|---|
| e58b6401 ER |
1 | --- bitlbee-3.0.5/protocols/skype/skyped.py~ 2012-08-20 13:12:13.498690222 +0300 |
| 2 | +++ bitlbee-3.0.5/protocols/skype/skyped.py 2012-08-20 13:45:21.105984684 +0300 | |
| 3 | @@ -275,8 +275,12 @@ | |
| 4 | sock.close() | |
| 5 | ||
| 6 | class SkypeApi: | |
| 7 | - def __init__(self): | |
| 8 | - self.skype = Skype4Py.Skype() | |
| 9 | + def __init__(self, transport = None): | |
| 10 | + if transport: | |
| 11 | + self.skype = Skype4Py.Skype(Transport = transport) | |
| 12 | + else: | |
| 13 | + self.skype = Skype4Py.Skype() | |
| 14 | + | |
| 15 | self.skype.OnNotify = self.recv | |
| 16 | self.skype.Client.Start() | |
| 17 | ||
| 18 | @@ -352,6 +356,7 @@ | |
| 19 | self.host = "0.0.0.0" | |
| 20 | self.log = None | |
| 21 | self.port = None | |
| 22 | + self.transport = None | |
| 23 | self.version = False | |
| 24 | # well, this is a bit hackish. we store the socket of the last connected client | |
| 25 | # here and notify it. maybe later notify all connected clients? | |
| 26 | @@ -373,6 +378,7 @@ | |
| 27 | -l --log set the log file in background mode (default: none) | |
| 28 | -n --nofork don't run as daemon in the background | |
| 29 | -p --port set the tcp port (default: %s) | |
| 30 | + -t --transport enforce Skype4Py transport (x11 or dbus) (defaults to Skype4Py default) | |
| 31 | -v --version display version information""" % (self.cfgpath, self.host, self.port) | |
| 32 | sys.exit(ret) | |
| 33 | ||
| 34 | @@ -420,7 +426,7 @@ | |
| 35 | if __name__=='__main__': | |
| 36 | options = Options() | |
| 37 | try: | |
| 38 | - opts, args = getopt.getopt(sys.argv[1:], "c:dhH:l:np:v", ["config=", "debug", "help", "host=", "log=", "nofork", "port=", "version"]) | |
| 39 | + opts, args = getopt.getopt(sys.argv[1:], "c:dhH:l:np:t:v", ["config=", "debug", "help", "host=", "log=", "nofork", "port=", "transport=", "version"]) | |
| 40 | except getopt.GetoptError: | |
| 41 | options.usage(1) | |
| 42 | for opt, arg in opts: | |
| 43 | @@ -438,6 +444,8 @@ | |
| 44 | options.daemon = False | |
| 45 | elif opt in ("-p", "--port"): | |
| 46 | options.port = int(arg) | |
| 47 | + elif opt in ("-t", "--transport"): | |
| 48 | + options.transport = arg | |
| 49 | elif opt in ("-v", "--version"): | |
| 50 | options.version = True | |
| 51 | if options.help: | |
| 52 | @@ -484,7 +492,7 @@ | |
| 53 | if hasgobject: | |
| 54 | server(options.host, options.port) | |
| 55 | try: | |
| 56 | - skype = SkypeApi() | |
| 57 | + skype = SkypeApi(options.transport) | |
| 58 | except Skype4Py.SkypeAPIError, s: | |
| 59 | sys.exit("%s. Are you sure you have started Skype?" % s) | |
| 60 | if hasgobject: |