diff options
| author | fauno <fauno@endefensadelsl.org> | 2017-04-26 16:45:21 -0300 |
|---|---|---|
| committer | fauno <fauno@endefensadelsl.org> | 2017-04-26 16:45:21 -0300 |
| commit | bfa41cc99d7b265b64e95bd58bb233af7361653a (patch) | |
| tree | 23c1b54a4f588990fe25870cc71e2adf6a051018 /libre/calibre/0001-Remove-code-that-contacts-calibre-servers-to-check-u.patch | |
| parent | 5d358aa79c56d2c5765b5b41d5bbbb62ee6cc273 (diff) | |
| download | abslibre-bfa41cc99d7b265b64e95bd58bb233af7361653a.tar.gz abslibre-bfa41cc99d7b265b64e95bd58bb233af7361653a.tar.bz2 abslibre-bfa41cc99d7b265b64e95bd58bb233af7361653a.zip | |
calibre: correct patches
Diffstat (limited to 'libre/calibre/0001-Remove-code-that-contacts-calibre-servers-to-check-u.patch')
| -rw-r--r-- | libre/calibre/0001-Remove-code-that-contacts-calibre-servers-to-check-u.patch | 37 |
1 files changed, 9 insertions, 28 deletions
diff --git a/libre/calibre/0001-Remove-code-that-contacts-calibre-servers-to-check-u.patch b/libre/calibre/0001-Remove-code-that-contacts-calibre-servers-to-check-u.patch index 2b9a51f57..9610b29f8 100644 --- a/libre/calibre/0001-Remove-code-that-contacts-calibre-servers-to-check-u.patch +++ b/libre/calibre/0001-Remove-code-that-contacts-calibre-servers-to-check-u.patch @@ -1,7 +1,5 @@ -diff --git a/src/calibre/gui2/update.py b/src/calibre/gui2/update.py -index 3e294cac3..580f736ef 100644 ---- a/src/calibre/gui2/update.py -+++ b/src/calibre/gui2/update.py +--- calibre-2.83.0/src/calibre/gui2/update.py.orig 2017-04-26 14:55:30.824093338 -0300 ++++ calibre-2.83.0/src/calibre/gui2/update.py 2017-04-26 15:00:09.807495982 -0300 @@ -1,19 +1,17 @@ __license__ = 'GPL v3' __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>' @@ -27,7 +25,7 @@ index 3e294cac3..580f736ef 100644 from calibre.gui2.dialogs.plugin_updater import get_plugin_updates_available URL = 'https://code.calibre-ebook.com/latest' -@@ -30,35 +28,7 @@ def get_download_url(): +@@ -30,35 +28,7 @@ def get_newest_version(): @@ -64,7 +62,7 @@ index 3e294cac3..580f736ef 100644 class Signal(QObject): -@@ -81,12 +51,6 @@ class CheckForUpdates(Thread): +@@ -81,12 +51,6 @@ calibre_update_version = NO_CALIBRE_UPDATE plugins_update_found = 0 try: @@ -77,35 +75,18 @@ index 3e294cac3..580f736ef 100644 update_plugins = get_plugin_updates_available(raise_error=True) if update_plugins is not None: plugins_update_found = len(update_plugins) -@@ -200,22 +164,15 @@ class UpdateMixin(object): +@@ -193,13 +157,7 @@ self.status_bar.update_label.setText(msg) self.status_bar.update_label.setVisible(True) - if has_calibre_update: -- if (force or (config.get('new_version_notification') and -- dynamic.get('update to version %s'%calibre_version, True))): +- if force: - if not no_show_popup: - self._update_notification__ = UpdateNotification(calibre_version, - number_of_plugin_updates, parent=self) - self._update_notification__.show() - elif has_plugin_updates: -- if force: -- from calibre.gui2.dialogs.plugin_updater import (PluginUpdaterDialog, -- FILTER_UPDATE_AVAILABLE) -- d = PluginUpdaterDialog(self, -- initial_filter=FILTER_UPDATE_AVAILABLE) -- d.exec_() -- if d.do_restart: -- self.quit(restart=True) + if has_plugin_updates: -+ if force: -+ from calibre.gui2.dialogs.plugin_updater import (PluginUpdaterDialog, -+ FILTER_UPDATE_AVAILABLE) -+ d = PluginUpdaterDialog(self, -+ initial_filter=FILTER_UPDATE_AVAILABLE) -+ d.exec_() -+ if d.do_restart: -+ self.quit(restart=True) - - def plugin_update_found(self, number_of_updates): - # Change the plugin icon to indicate there are updates available + if force: + from calibre.gui2.dialogs.plugin_updater import (PluginUpdaterDialog, + FILTER_UPDATE_AVAILABLE) |