- release 2

[packages/calibre.git] / calibre-no-update.patch

diff --git a/calibre-no-update.patch b/calibre-no-update.patch
index d59d3a55e9fc0d7c984deff6b3411ae2de96c94f..3a0e8d774d9407afc90cf898ded2b1cee607a9b4 100644 (file)
--- a/calibre-no-update.patch
+++ b/calibre-no-update.patch
@@ -1,19 +1,36 @@
---- calibre/src/calibre/gui2/ui.py~    2010-06-12 00:28:24.000000000 +0200
-+++ calibre/src/calibre/gui2/ui.py     2010-06-18 11:35:45.509704767 +0200
-@@ -248,11 +248,11 @@
-         self.latest_version = ' '
-         self.vanity.setText(self.vanity_template%dict(version=' ', device=' '))
-         self.device_info = ' '
+diff -uNr calibre.old/src/calibre/gui2/ui.py calibre/src/calibre/gui2/ui.py
+--- calibre.old/src/calibre/gui2/ui.py 2011-06-26 19:51:17.912975862 +0200
++++ calibre/src/calibre/gui2/ui.py     2011-06-26 19:52:21.156346644 +0200
+@@ -647,7 +647,7 @@
+         if write_settings:
+             self.write_settings()
+         self.check_messages_timer.stop()
+-        self.update_checker.terminate()
++        # self.update_checker.terminate()
+         self.listener.close()
+         self.job_manager.server.close()
+         self.job_manager.threaded_server.close()
+diff -uNr calibre.old/src/calibre/gui2/update.py calibre/src/calibre/gui2/update.py
+--- calibre.old/src/calibre/gui2/update.py     2011-06-26 19:51:17.913975852 +0200
++++ calibre/src/calibre/gui2/update.py 2011-06-26 19:56:50.608665533 +0200
+@@ -121,13 +121,13 @@
+ 
+ class UpdateMixin(object):
+ 
+-    def __init__(self, opts):
+-        self.last_newest_calibre_version = NO_CALIBRE_UPDATE
 -        if not opts.no_update_check:
 -            self.update_checker = CheckForUpdates(self)
 -            self.update_checker.update_found.connect(self.update_found,
 -                    type=Qt.QueuedConnection)
 -            self.update_checker.start()
++    #def __init__(self, opts):
++        #self.last_newest_calibre_version = NO_CALIBRE_UPDATE
 +        #if not opts.no_update_check:
 +        #    self.update_checker = CheckForUpdates(self)
 +        #    self.update_checker.update_found.connect(self.update_found,
 +        #            type=Qt.QueuedConnection)
 +        #    self.update_checker.start()
  
-         ####################### Status Bar #####################
-         self.status_bar.initialize(self.system_tray_icon)
+     def recalc_update_label(self, number_of_plugin_updates):
+         self.update_found('%s%s%d'%(self.last_newest_calibre_version, VSEP,