force tracker update, and change for double encryption setting

brvier · Jun 19, 2013 · 4a6a9e5 · 4a6a9e5
2 parents 421e91a + 1f795ce
commit 4a6a9e5
Show file tree

Hide file tree

Showing 63 changed files with 10 additions and 6 deletions.
diff --git a/Application Privacy Policy.md b/Application Privacy Policy.md
diff --git a/MANIFEST.in b/MANIFEST.in
diff --git a/MORE.md b/MORE.md
diff --git a/README.md b/README.md
diff --git a/Todo.md b/Todo.md
diff --git a/bitpurse.conf b/bitpurse.conf
diff --git a/bitpurse.desktop b/bitpurse.desktop
diff --git a/bitpurse.png b/bitpurse.png
diff --git a/bitpurse.spec b/bitpurse.spec
diff --git a/bitpurse.svg b/bitpurse.svg
diff --git a/bitpurse/PBKDF2.py b/bitpurse/PBKDF2.py
diff --git a/bitpurse/__init__.py b/bitpurse/__init__.py
@@ -55,7 +55,8 @@
        Update wallet balance after sending a transaction
        Remove transaction without confirmation older than 7 days
        Add a copy address item menu in address page menu
-2.0.2: Workarround to try to fix tracker index for shareui'''
+2.0.2: Fix issue #4, avoid putting a change address with a null value
+2.0.3: Workarround to try to fix tracker index for shareui'''
 
 
 class BitPurse(QApplication):
@@ -128,4 +129,4 @@ def __init__(self):
         self.walletController.settings.numberOfLaunch += 1
 
 if __name__ == '__main__':
-    sys.exit(BitPurse().exec_())
+    sys.exit(BitPurse().exec_()) 
diff --git a/bitpurse/address.py b/bitpurse/address.py
diff --git a/bitpurse/base58.py b/bitpurse/base58.py
diff --git a/bitpurse/ecdsa/__init__.py b/bitpurse/ecdsa/__init__.py
diff --git a/bitpurse/ecdsa/curves.py b/bitpurse/ecdsa/curves.py
diff --git a/bitpurse/ecdsa/der.py b/bitpurse/ecdsa/der.py
diff --git a/bitpurse/ecdsa/ecdsa.py b/bitpurse/ecdsa/ecdsa.py
diff --git a/bitpurse/ecdsa/ellipticcurve.py b/bitpurse/ecdsa/ellipticcurve.py
diff --git a/bitpurse/ecdsa/keys.py b/bitpurse/ecdsa/keys.py
diff --git a/bitpurse/ecdsa/numbertheory.py b/bitpurse/ecdsa/numbertheory.py
diff --git a/bitpurse/ecdsa/test_pyecdsa.py b/bitpurse/ecdsa/test_pyecdsa.py
diff --git a/bitpurse/ecdsa/util.py b/bitpurse/ecdsa/util.py
diff --git a/bitpurse/qml/AboutPage.qml b/bitpurse/qml/AboutPage.qml
diff --git a/bitpurse/qml/AddressPage.qml b/bitpurse/qml/AddressPage.qml
diff --git a/bitpurse/qml/BitCoinField.qml b/bitpurse/qml/BitCoinField.qml
diff --git a/bitpurse/qml/BitCoinLabel.qml b/bitpurse/qml/BitCoinLabel.qml
diff --git a/bitpurse/qml/CommonDialog.qml b/bitpurse/qml/CommonDialog.qml
diff --git a/bitpurse/qml/DonationPage.qml b/bitpurse/qml/DonationPage.qml
diff --git a/bitpurse/qml/DoubleDecryptPage.qml b/bitpurse/qml/DoubleDecryptPage.qml
diff --git a/bitpurse/qml/DoubleEncryptPage.qml b/bitpurse/qml/DoubleEncryptPage.qml
diff --git a/bitpurse/qml/ExportTextPage.qml b/bitpurse/qml/ExportTextPage.qml
diff --git a/bitpurse/qml/Header.qml b/bitpurse/qml/Header.qml
diff --git a/bitpurse/qml/HelpPage.qml b/bitpurse/qml/HelpPage.qml
diff --git a/bitpurse/qml/ItemMenu.qml b/bitpurse/qml/ItemMenu.qml
diff --git a/bitpurse/qml/LabelDialog.qml b/bitpurse/qml/LabelDialog.qml
diff --git a/bitpurse/qml/LoginPage.qml b/bitpurse/qml/LoginPage.qml
diff --git a/bitpurse/qml/PasswordDialog.qml b/bitpurse/qml/PasswordDialog.qml
diff --git a/bitpurse/qml/RequestPage.qml b/bitpurse/qml/RequestPage.qml
diff --git a/bitpurse/qml/SendPage.qml b/bitpurse/qml/SendPage.qml
diff --git a/bitpurse/qml/SettingsPage.qml b/bitpurse/qml/SettingsPage.qml
diff --git a/bitpurse/qml/TitleLabel.qml b/bitpurse/qml/TitleLabel.qml
diff --git a/bitpurse/qml/WalletPage.qml b/bitpurse/qml/WalletPage.qml
diff --git a/bitpurse/qml/WelcomePage.qml b/bitpurse/qml/WelcomePage.qml
diff --git a/bitpurse/qml/WorkingSelectionDialog.qml b/bitpurse/qml/WorkingSelectionDialog.qml
diff --git a/bitpurse/qml/bitcoin.svg b/bitpurse/qml/bitcoin.svg
diff --git a/bitpurse/qml/bitpurse.svg b/bitpurse/qml/bitpurse.svg
diff --git a/bitpurse/qml/main.qml b/bitpurse/qml/main.qml
diff --git a/bitpurse/qml/tutorial/about.png b/bitpurse/qml/tutorial/about.png
diff --git a/bitpurse/qml/tutorial/contextmenu.png b/bitpurse/qml/tutorial/contextmenu.png
diff --git a/bitpurse/qml/tutorial/load.png b/bitpurse/qml/tutorial/load.png
diff --git a/bitpurse/qml/tutorial/welcome.png b/bitpurse/qml/tutorial/welcome.png
diff --git a/bitpurse/settings.py b/bitpurse/settings.py
diff --git a/bitpurse/transaction.py b/bitpurse/transaction.py
@@ -63,7 +63,8 @@ def __init__(self, from_addr, outputs, privKey, fee=None,
                                    " a fee of 0.0005 is required for"
                                    " small transactions")
 
-        outputs.append((change_addr, change_amount))
+        if change_amount != 0:
+            outputs.append((change_addr, change_amount))
 
         self.tx = self.signed_tx(inputs, outputs, privKey)
 

diff --git a/bitpurse/utils.py b/bitpurse/utils.py
diff --git a/bitpurse/wallet.py b/bitpurse/wallet.py
diff --git a/bitpurse/walletcontroller.py b/bitpurse/walletcontroller.py
diff --git a/bitpurse_128.png b/bitpurse_128.png
diff --git a/bitpurse_256.png b/bitpurse_256.png
diff --git a/bitpurse_64.png b/bitpurse_64.png
diff --git a/make.py b/make.py
@@ -15,7 +15,7 @@
 
 import os
 import sys
-
+import datetime
 import pypackager
 sys.path.append('bitpurse')
 
@@ -32,6 +32,8 @@
     p = pypackager.PyPackager("bitpurse")
     p.display_name = 'BitPurse'
     p.version = __version__
+    if 'git' in sys.argv:
+        p.version += '+%sgit' % datetime.datetime.now().strftime('%Y%m%d')
     p.buildversion = __build__
     p.summary = 'A nice looking Blockchain.info Bitcoin Wallet Client'
     p.description = ("A nice looking Blockchain.info Bitcoin Wallet Client "
@@ -89,8 +91,8 @@
     p['/usr/share/icons/hicolor/128x128/apps'] = ['bitpurse_128.png', ]
     p['/usr/share/icons/hicolor/scalable/apps'] = ['bitpurse.svg', ]
     p['/usr/share/applications'] = ['bitpurse.desktop', ]
-    p['/usr/share/backup-framework/applications'] = ['bitpurse.conf',]
+    p['/usr/share/backup-framework/applications'] = ['bitpurse.conf', ]
     p["/opt"] = files
     p["/opt/bitpurse"] = ['splash.png', ]
 
-    print p.generate(('debian_source', 'rpm_source', 'debian_binary'))   
+    print p.generate(('debian_source', 'rpm_source', 'debian_binary'))
diff --git a/setup.py b/setup.py
diff --git a/splash.png b/splash.png