From db2517b9012079c51745838ec48e6feda038b03e Mon Sep 17 00:00:00 2001
From: Neil Booth <kyuupichan@gmail.com>
Date: Thu, 30 Apr 2015 13:32:01 +0900
Subject: [PATCH] Shrink size of changes; functionality unchanged.

---
 gui/qt/main_window.py | 11 ++++-------
 lib/wallet.py         |  5 +----
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py
index 90c9c9e5c..b4043c804 100644
--- a/gui/qt/main_window.py
+++ b/gui/qt/main_window.py
@@ -200,12 +200,6 @@ class ElectrumWindow(QMainWindow):
         self.wallet.stop_threads()
         run_hook('close_wallet')
 
-    def title(self):
-        s = 'Electrum %s  -  %s' % (self.wallet.electrum_version, self.wallet.basename())
-        if self.wallet.is_watching_only():
-            s += ' [%s]' % (_('watching only'))
-        return s
-
     def load_wallet(self, wallet):
         import electrum
         self.wallet = wallet
@@ -217,7 +211,10 @@ class ElectrumWindow(QMainWindow):
         self.dummy_address = a[0] if a else None
         self.accounts_expanded = self.wallet.storage.get('accounts_expanded',{})
         self.current_account = self.wallet.storage.get("current_account", None)
-        self.setWindowTitle( self.title() )
+        title = 'Electrum %s  -  %s' % (self.wallet.electrum_version, self.wallet.basename())
+        if self.wallet.is_watching_only():
+            title += ' [%s]' % (_('watching only'))
+        self.setWindowTitle( title )
         self.update_history_tab()
         self.update_wallet()
         # Once GUI has been initialized check if we want to announce something since the callback has been called before the GUI was initialized
diff --git a/lib/wallet.py b/lib/wallet.py
index 20af3edac..527fb6a19 100644
--- a/lib/wallet.py
+++ b/lib/wallet.py
@@ -109,9 +109,6 @@ class WalletStorage(object):
                 self.data[key] = value
         self.file_exists = True
 
-    def basename(self):
-        return os.path.basename(self.path)
-
     def get(self, key, default=None):
         with self.lock:
             v = self.data.get(key)
@@ -235,7 +232,7 @@ class Abstract_Wallet(object):
         pass
 
     def basename(self):
-        return self.storage.basename()
+        return os.path.basename(self.storage.path)
 
     def convert_imported_keys(self, password):
         for k, v in self.imported_keys.items():