Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove "synchronous" from get_gui_name. Use suggested code to get the port.

Browse Source
This commit is contained in:
Charles Haley 2012-09-20 14:46:10 +02:00
parent c9e4eb68cd
commit 6dd1312693
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/calibre/devices/smart_device_app/driver.py
View File

@ -102,7 +102,7 @@ class ConnectionListener (Thread):
content_server_port = b''; content_server_port = b'';
try : try :
content_server_port = \ content_server_port = \
str(ConfigProxy(content_server_config())['port']) str(content_server_config().parse().port)
except: except:
pass pass
message = str(self.driver.ZEROCONF_CLIENT_STRING + b' (on ' + message = str(self.driver.ZEROCONF_CLIENT_STRING + b' (on ' +
@ -901,7 +901,6 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
raise raise
return False return False
@synchronous('sync_lock')
def get_gui_name(self): def get_gui_name(self):
if self.client_device_kind: if self.client_device_kind:
return self.gui_name_template%(self.gui_name, self.client_device_kind) return self.gui_name_template%(self.gui_name, self.client_device_kind)