From 336e98675742987620350ca08693f1af2a9723d6 Mon Sep 17 00:00:00 2001 From: Lucian Branescu Mihaila Date: Thu, 22 Jul 2010 12:52:39 +0000 Subject: Fix history retrieval limits in history palettes. --- diff --git a/browser.py b/browser.py index 986f07c..58eae98 100644 --- a/browser.py +++ b/browser.py @@ -247,11 +247,12 @@ class Browser(webkit.WebView): def get_session(self): history = self.get_back_forward_list() - limit = history.get_limit() - back_list = history.get_back_list_with_limit(limit) + back_list = history.get_back_list_with_limit( + history.get_back_length()) back_list.reverse() - forward_list = history.get_forward_list_with_limit(limit) + forward_list = history.get_forward_list_with_limit( + history.get_forward_length()) forward_list.reverse() history_items = back_list + [history.get_current_item()] + \ diff --git a/webtoolbar.py b/webtoolbar.py index ffa8131..7bf6b49 100644 --- a/webtoolbar.py +++ b/webtoolbar.py @@ -397,9 +397,10 @@ class PrimaryToolbar(ToolbarBox): self._stop_and_reload.set_tooltip(_('Reload')) def _reload_session_history(self): + logging.debug('Updating history palettes.') + browser = self._tabbed_view.props.current_browser history = browser.get_back_forward_list() - limit = history.get_limit() back_palette = self._back.get_palette() forward_palette = self._forward.get_palette() @@ -408,12 +409,19 @@ class PrimaryToolbar(ToolbarBox): for menu_item in palette.menu.get_children(): palette.menu.remove(menu_item) + + back_length = history.get_back_length() + forward_length = history.get_forward_length() + self._populate_history_palette( - history.get_back_list_with_limit(limit), back_palette) + history.get_back_list_with_limit(back_length), + back_palette) self._populate_history_palette( - history.get_forward_list_with_limit(limit), forward_palette) + history.get_forward_list_with_limit(forward_length), + forward_palette) def _populate_history_palette(self, history_list, palette): + logging.debug('Populating a history palette.') for history_item in history_list: menu_item = MenuItem(history_item.get_title(), text_maxlen=60) menu_item.connect('activate', self.__history_item_activated_cb, -- cgit v0.9.1