tMerge branch 'master' of ssh://github.com/spesmilo/electrum - electrum - Electrum Bitcoin wallet
 (HTM) git clone https://git.parazyd.org/electrum
 (DIR) Log
 (DIR) Files
 (DIR) Refs
 (DIR) Submodules
       ---
 (DIR) commit 2c582ff28a8c82ecfd1f84c1c0e099421bcf769c
 (DIR) parent 25120ddaf343f5966ac054b1c3029ed3534466d6
 (HTM) Author: Maran <maran.hidskes@gmail.com>
       Date:   Mon, 30 Sep 2013 16:21:36 +0200
       
       Merge branch 'master' of ssh://github.com/spesmilo/electrum
       
       Diffstat:
         M gui/qt/main_window.py               |       4 +++-
       
       1 file changed, 3 insertions(+), 1 deletion(-)
       ---
 (DIR) diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py
       t@@ -2019,7 +2019,9 @@ class ElectrumWindow(QMainWindow):
                        cb.clicked.connect(mk_toggle(cb,p))
                        grid.addWidget(cb, i, 0)
                        if p.requires_settings():
       -                    grid.addWidget(EnterButton(_('Settings'), p.settings_dialog), i, 1)
       +                    b = EnterButton(_('Settings'), p.settings_dialog)
       +                    b.setEnabled( p.is_enabled() )
       +                    grid.addWidget(b, i, 1)
                        grid.addWidget(HelpButton(p.description()), i, 2)
                    except:
                        print_msg(_("Error: cannot display plugin"), p)