Ticket #4231: 0001-Avoid-trace-in-log-for-PDF-tab-SL-4231.patch

File 0001-Avoid-trace-in-log-for-PDF-tab-SL-4231.patch, 1.4 KB (added by humitos, 11 years ago)

  • webtoolbar.py 

    From c12fd55c5e9af2cb7b78b1146fef8d947a497002 Mon Sep 17 00:00:00 2001
From: Manuel Kaufmann <humitos@gmail.com>
Date: Mon, 19 Nov 2012 10:04:39 -0300
Subject: [PATCH Browse] Avoid trace in log for PDF tab SL #4231

DummyBrowser doesn't have 'loading_uri', so we check if the Browse's
instance is DummyBrowser before trying to get its value.

Signed-off-by: Manuel Kaufmann <humitos@gmail.com>
---
 webtoolbar.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/webtoolbar.py b/webtoolbar.py
index b4ce94c..2307231 100644
    a b import filepicker 
    3535import places
    3636from sugarmenuitem import SugarMenuItem
    3737from browser import Browser
    38 
     38from pdfviewer import DummyBrowser
    3939
    4040_MAX_HISTORY_ENTRIES = 15
    4141_SEARCH_ENTRY_MARGIN = style.zoom(14)
    … … class PrimaryToolbar(ToolbarBase): 
    357357            self._browser.disconnect(self._loading_changed_hid)
    358358
    359359        self._browser = browser
    360         address = self._browser.props.uri or self._browser.loading_uri
     360        if not isinstance(self._browser, DummyBrowser):
     361            address = self._browser.props.uri or self._browser.loading_uri
     362        else:
     363            address = self._browser.props.uri
    361364        self._set_address(address)
    362365        self._set_progress(self._browser.props.progress)
    363366        self._set_status(self._browser.props.load_status)