From 18c756760b78ebdf7680a6cfc44600d90e5cbbb0 Mon Sep 17 00:00:00 2001
From: Gonzalo Odiard <godiard@sugarlabs.org>
Date: Wed, 06 Oct 2010 17:39:37 +0000
Subject: fix #2383 : Browse: history not right when resuming

Previously Browse does not saved the current tabs opened, saved
the history and assumes the last url in the history is the current.
---
(limited to 'webtoolbar.py')

diff --git a/webtoolbar.py b/webtoolbar.py
index 428fd89..d87dbd8 100644
--- a/webtoolbar.py
+++ b/webtoolbar.py
@@ -281,11 +281,7 @@ class WebToolbar(gtk.Toolbar):
         gobject.idle_add(self._reload_session_history, current_page_index)
 
     def _location_changed_cb(self, progress_listener, uri):
-        cls = components.classes['@mozilla.org/intl/texttosuburi;1']
-        texttosuburi = cls.getService(interfaces.nsITextToSubURI)
-        ui_uri = texttosuburi.unEscapeURIForUI(uri.originCharset, uri.spec)
-
-        self._set_address(ui_uri)
+        self._set_address(self._browser.get_url_from_nsiuri(uri))
         self._update_navigation_buttons()
         filepicker.cleanup_temp_files()
 
--
cgit v0.9.1