From d1a90085b7afa82c49bb4a9353121ec19a5829ec Mon Sep 17 00:00:00 2001 From: Peter Surda Date: Sun, 21 Aug 2016 11:54:34 +0200 Subject: [PATCH 1/2] Version bump for 0.6.1 --- src/shared.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared.py b/src/shared.py index ca9200e5..09433375 100644 --- a/src/shared.py +++ b/src/shared.py @@ -1,6 +1,6 @@ from __future__ import division -softwareVersion = '0.6.0' +softwareVersion = '0.6.1' verbose = 1 maximumAgeOfAnObjectThatIAmWillingToAccept = 216000 # This is obsolete with the change to protocol v3 but the singleCleaner thread still hasn't been updated so we need this a little longer. lengthOfTimeToHoldOnToAllPubkeys = 2419200 # Equals 4 weeks. You could make this longer if you want but making it shorter would not be advisable because there is a very small possibility that it could keep you from obtaining a needed pubkey for a period of time. From 2616a9d4c1c3ebc4c7f7b235926b4bbf2c730194 Mon Sep 17 00:00:00 2001 From: Peter Surda Date: Sat, 27 Aug 2016 21:47:40 +0800 Subject: [PATCH 2/2] Fix PyGI warnings - Partially addresses #893 --- src/bitmessageqt/__init__.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/bitmessageqt/__init__.py b/src/bitmessageqt/__init__.py index b7fa2552..593a8b4b 100644 --- a/src/bitmessageqt/__init__.py +++ b/src/bitmessageqt/__init__.py @@ -1,10 +1,13 @@ from debug import logger withMessagingMenu = False try: + import gi + gi.require_version('MessagingMenu', '1.0') from gi.repository import MessagingMenu + gi.require_version('Notify', '0.7') from gi.repository import Notify withMessagingMenu = True -except ImportError: +except (ImportError, ValueError): MessagingMenu = None try: