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

Change name of disconnect_from_folder to unmount_device

Browse Source
This commit is contained in:
Charles Haley 2010-06-25 18:05:01 +01:00
parent 25894632dc
commit 9c75cac5a2
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/calibre/devices/apple/driver.py
View File

@ -2721,11 +2721,11 @@ class ITUNES_ASYNC(ITUNES):
else: else:
return BookList(self.log) return BookList(self.log)
def disconnect_from_folder(self): def unmount_device(self):
''' '''
''' '''
if DEBUG: if DEBUG:
self.log.info("ITUNES_ASYNC:disconnect_from_folder()") self.log.info("ITUNES_ASYNC:unmount_device()")
self.connected = False self.connected = False
def eject(self): def eject(self):

2
src/calibre/devices/folder_device/driver.py
View File

@ -66,7 +66,7 @@ class FOLDER_DEVICE(USBMS):
detected_device=None): detected_device=None):
pass pass
def disconnect_from_folder(self): def unmount_device(self):
self._main_prefix = '' self._main_prefix = ''
self.is_connected = False self.is_connected = False

4
src/calibre/gui2/device.py
View File

@ -201,10 +201,10 @@ class DeviceManager(Thread): # {{{
self.connected_device.eject() self.connected_device.eject()
self.ejected_devices.add(self.connected_device) self.ejected_devices.add(self.connected_device)
self.connected_slot(False, self.connected_device_kind) self.connected_slot(False, self.connected_device_kind)
elif hasattr(self.connected_device, 'disconnect_from_folder'): elif hasattr(self.connected_device, 'unmount_device'):
# As we are on the wrong thread, this call must *not* do # As we are on the wrong thread, this call must *not* do
# anything besides set a flag that the right thread will see. # anything besides set a flag that the right thread will see.
self.connected_device.disconnect_from_folder() self.connected_device.unmount_device()
def next(self): def next(self):
if not self.jobs.empty(): if not self.jobs.empty():