Reviewers: ,
Please review this at http://codereview.tryton.org/35009/ Affected files: M tryton/gui/main.py M tryton/rpc.py Index: tryton/gui/main.py =================================================================== --- a/tryton/gui/main.py +++ b/tryton/gui/main.py @@ -1102,6 +1102,8 @@ self.notebook.set_current_page(page - 1) def sig_user_preferences(self, widget): + if not self.close_pages(): + return False win = Preference(rpc._USER, self.window) if win.run(): rpc.context_reload() @@ -1123,6 +1125,7 @@ CONFIG['client.lang'] = prefs['language'] CONFIG.save() self.window.present() + self.sig_win_menu() return True def sig_win_close(self, widget): @@ -1192,6 +1195,7 @@ except Exception, exception: common.process_exception(exception, self.window) return + rpc.context_reload() self.refresh_ssl() if log_response > 0: try: @@ -1234,7 +1238,7 @@ self.open_url(url) return True - def sig_logout(self, widget, disconnect=True): + def close_pages(self): res = True while res: wid = self.get_page() @@ -1253,6 +1257,11 @@ if self.menu_screen: self.menu_screen.destroy() self.menu_screen = None + return True + + def sig_logout(self, widget, disconnect=True): + if not self.close_pages(): + return False self.sb_username.set_text('') self.sb_servername.set_text('') self.sb_requests.set_text('') Index: tryton/rpc.py =================================================================== --- a/tryton/rpc.py +++ b/tryton/rpc.py @@ -157,7 +157,6 @@ _SESSION = res[1] _DATABASE = database SECURE = _SOCK.ssl - context_reload() IPCServer(host, port, database).run() return 1 -- [email protected] mailing list
