|
![](https://seccdn.libravatar.org/avatar/630eadeeb706bd60c5564ff8faa60f9c806c13d5293e298c7e42c2dfdf968e9c?s=16&d=retro) |
6074d15 |
diff -uNr calibre.old/src/calibre/gui2/ui.py calibre/src/calibre/gui2/ui.py
|
|
![](https://seccdn.libravatar.org/avatar/630eadeeb706bd60c5564ff8faa60f9c806c13d5293e298c7e42c2dfdf968e9c?s=16&d=retro) |
6074d15 |
--- calibre.old/src/calibre/gui2/ui.py 2011-01-11 22:08:00.684511166 +0100
|
|
![](https://seccdn.libravatar.org/avatar/630eadeeb706bd60c5564ff8faa60f9c806c13d5293e298c7e42c2dfdf968e9c?s=16&d=retro) |
6074d15 |
+++ calibre/src/calibre/gui2/ui.py 2011-01-11 22:11:34.522099663 +0100
|
|
![](https://seccdn.libravatar.org/avatar/630eadeeb706bd60c5564ff8faa60f9c806c13d5293e298c7e42c2dfdf968e9c?s=16&d=retro) |
6074d15 |
@@ -590,7 +590,7 @@
|
|
![](https://seccdn.libravatar.org/avatar/630eadeeb706bd60c5564ff8faa60f9c806c13d5293e298c7e42c2dfdf968e9c?s=16&d=retro) |
6074d15 |
if write_settings:
|
|
![](https://seccdn.libravatar.org/avatar/630eadeeb706bd60c5564ff8faa60f9c806c13d5293e298c7e42c2dfdf968e9c?s=16&d=retro) |
6074d15 |
self.write_settings()
|
|
![](https://seccdn.libravatar.org/avatar/630eadeeb706bd60c5564ff8faa60f9c806c13d5293e298c7e42c2dfdf968e9c?s=16&d=retro) |
6074d15 |
self.check_messages_timer.stop()
|
|
![](https://seccdn.libravatar.org/avatar/630eadeeb706bd60c5564ff8faa60f9c806c13d5293e298c7e42c2dfdf968e9c?s=16&d=retro) |
6074d15 |
- self.update_checker.terminate()
|
|
![](https://seccdn.libravatar.org/avatar/630eadeeb706bd60c5564ff8faa60f9c806c13d5293e298c7e42c2dfdf968e9c?s=16&d=retro) |
6074d15 |
+ # self.update_checker.terminate()
|
|
![](https://seccdn.libravatar.org/avatar/630eadeeb706bd60c5564ff8faa60f9c806c13d5293e298c7e42c2dfdf968e9c?s=16&d=retro) |
6074d15 |
self.listener.close()
|
|
![](https://seccdn.libravatar.org/avatar/630eadeeb706bd60c5564ff8faa60f9c806c13d5293e298c7e42c2dfdf968e9c?s=16&d=retro) |
6074d15 |
self.job_manager.server.close()
|
|
![](https://seccdn.libravatar.org/avatar/630eadeeb706bd60c5564ff8faa60f9c806c13d5293e298c7e42c2dfdf968e9c?s=16&d=retro) |
6074d15 |
while self.spare_servers:
|
|
![](https://seccdn.libravatar.org/avatar/630eadeeb706bd60c5564ff8faa60f9c806c13d5293e298c7e42c2dfdf968e9c?s=16&d=retro) |
6074d15 |
diff -uNr calibre.old/src/calibre/gui2/update.py calibre/src/calibre/gui2/update.py
|
|
![](https://seccdn.libravatar.org/avatar/630eadeeb706bd60c5564ff8faa60f9c806c13d5293e298c7e42c2dfdf968e9c?s=16&d=retro) |
6074d15 |
--- calibre.old/src/calibre/gui2/update.py 2011-01-11 22:08:00.684511166 +0100
|
|
![](https://seccdn.libravatar.org/avatar/630eadeeb706bd60c5564ff8faa60f9c806c13d5293e298c7e42c2dfdf968e9c?s=16&d=retro) |
6074d15 |
+++ calibre/src/calibre/gui2/update.py 2011-01-11 22:11:16.678301138 +0100
|
|
![](https://seccdn.libravatar.org/avatar/630eadeeb706bd60c5564ff8faa60f9c806c13d5293e298c7e42c2dfdf968e9c?s=16&d=retro) |
6074d15 |
@@ -87,12 +87,12 @@
|
|
![](https://seccdn.libravatar.org/avatar/f7da12229384408c01557967027413baa71e7a8344a84e573238766e29b33978?s=16&d=retro) |
3e00138 |
|
|
![](https://seccdn.libravatar.org/avatar/f7da12229384408c01557967027413baa71e7a8344a84e573238766e29b33978?s=16&d=retro) |
3e00138 |
class UpdateMixin(object):
|
|
![](https://seccdn.libravatar.org/avatar/f7da12229384408c01557967027413baa71e7a8344a84e573238766e29b33978?s=16&d=retro) |
3e00138 |
|
|
![](https://seccdn.libravatar.org/avatar/f7da12229384408c01557967027413baa71e7a8344a84e573238766e29b33978?s=16&d=retro) |
3e00138 |
- def __init__(self, opts):
|
|
Ionuț Arțăriși |
c3c738d |
- if not opts.no_update_check:
|
|
Ionuț Arțăriși |
c76318b |
- self.update_checker = CheckForUpdates(self)
|
|
![](https://seccdn.libravatar.org/avatar/f7da12229384408c01557967027413baa71e7a8344a84e573238766e29b33978?s=16&d=retro) |
d4b7b81 |
- self.update_checker.update_found.connect(self.update_found,
|
|
![](https://seccdn.libravatar.org/avatar/f7da12229384408c01557967027413baa71e7a8344a84e573238766e29b33978?s=16&d=retro) |
d4b7b81 |
- type=Qt.QueuedConnection)
|
|
![](https://seccdn.libravatar.org/avatar/f7da12229384408c01557967027413baa71e7a8344a84e573238766e29b33978?s=16&d=retro) |
d4b7b81 |
- self.update_checker.start()
|
|
![](https://seccdn.libravatar.org/avatar/f7da12229384408c01557967027413baa71e7a8344a84e573238766e29b33978?s=16&d=retro) |
3e00138 |
+ #def __init__(self, opts):
|
|
![](https://seccdn.libravatar.org/avatar/f7da12229384408c01557967027413baa71e7a8344a84e573238766e29b33978?s=16&d=retro) |
d4b7b81 |
+ #if not opts.no_update_check:
|
|
![](https://seccdn.libravatar.org/avatar/f7da12229384408c01557967027413baa71e7a8344a84e573238766e29b33978?s=16&d=retro) |
d4b7b81 |
+ # self.update_checker = CheckForUpdates(self)
|
|
![](https://seccdn.libravatar.org/avatar/f7da12229384408c01557967027413baa71e7a8344a84e573238766e29b33978?s=16&d=retro) |
d4b7b81 |
+ # self.update_checker.update_found.connect(self.update_found,
|
|
![](https://seccdn.libravatar.org/avatar/f7da12229384408c01557967027413baa71e7a8344a84e573238766e29b33978?s=16&d=retro) |
d4b7b81 |
+ # type=Qt.QueuedConnection)
|
|
![](https://seccdn.libravatar.org/avatar/f7da12229384408c01557967027413baa71e7a8344a84e573238766e29b33978?s=16&d=retro) |
d4b7b81 |
+ # self.update_checker.start()
|
|
![](https://seccdn.libravatar.org/avatar/f7da12229384408c01557967027413baa71e7a8344a84e573238766e29b33978?s=16&d=retro) |
3e00138 |
|
|
![](https://seccdn.libravatar.org/avatar/f7da12229384408c01557967027413baa71e7a8344a84e573238766e29b33978?s=16&d=retro) |
3e00138 |
def update_found(self, version):
|
|
![](https://seccdn.libravatar.org/avatar/f7da12229384408c01557967027413baa71e7a8344a84e573238766e29b33978?s=16&d=retro) |
3e00138 |
os = 'windows' if iswindows else 'osx' if isosx else 'linux'
|