From 978cc1edf77fc88c6c80c75694f96e2848c02ef1 Mon Sep 17 00:00:00 2001
From: Lucian Branescu Mihaila <lucian.branescu@gmail.com>
Date: Wed, 06 Oct 2010 13:22:48 +0000
Subject: Fix history on resume. The code is a bit hacky because of xulrunner limitations. I plan to make this code nicer when we move to webkit.

---
(limited to 'webtoolbar.py')

diff --git a/webtoolbar.py b/webtoolbar.py
index 20616a4..290011e 100644
--- a/webtoolbar.py
+++ b/webtoolbar.py
@@ -366,9 +366,7 @@ class PrimaryToolbar(ToolbarBox):
 
     def _set_address(self, uri):
         if uri is not None:
-            cls = components.classes['@mozilla.org/intl/texttosuburi;1']
-            texttosuburi = cls.getService(interfaces.nsITextToSubURI)
-            ui_uri = texttosuburi.unEscapeURIForUI(uri.originCharset, uri.spec)
+            ui_uri = self._browser.get_url_from_nsiuri(uri)
         else:
             ui_uri = None
         self.entry.props.address = ui_uri
--
cgit v0.9.1