From 594845eb623c5a71bbcc0065040b4cdca592c733 Mon Sep 17 00:00:00 2001
From: Manuel Quiñones <manuq@laptop.org>
Date: Wed, 02 Nov 2011 11:37:07 +0000
Subject: Restore page title in tabs

Signed-off-by: Manuel Quiñones <manuq@laptop.org>
---
diff --git a/browser.py b/browser.py
index ba67d9e..e80f47c 100644
--- a/browser.py
+++ b/browser.py
@@ -34,6 +34,7 @@ from widgets import BrowserNotebook
 
 _ZOOM_AMOUNT = 0.1
 _LIBRARY_PATH = '/usr/share/library-common/index.html'
+_UNTITLED_TEXT = _('Untitled')
 
 
 class TabbedView(BrowserNotebook):
@@ -214,9 +215,9 @@ class TabLabel(Gtk.HBox):
         GObject.GObject.__init__(self)
 
         self._browser = browser
-        self._browser.connect('is-setup', self.__browser_is_setup_cb)
+        self._browser.connect('notify::title', self.__title_changed_cb)
 
-        self._label = Gtk.Label(label=_('Untitled'))
+        self._label = Gtk.Label(label=_UNTITLED_TEXT)
         self._label.set_ellipsize(Pango.EllipsizeMode.END)
         self._label.set_alignment(0, 0.5)
         self.pack_start(self._label, True, True, 0)
@@ -249,31 +250,17 @@ class TabLabel(Gtk.HBox):
     def __button_clicked_cb(self, button):
         self.emit('tab-close', self._browser)
 
-    def __browser_is_setup_cb(self, browser):
-        browser.connect('notify::uri', self.__location_changed_cb)
-        browser.connect('notify::title', self.__title_changed_cb)
-
-    def __location_changed_cb(self, widget, param):
-        url = widget.get_uri()
-        if url == 'about:blank':
-            self._label.set_text(_('Loading...'))
-        else:
-            self._label.set_text(url)
-
     def __title_changed_cb(self, widget, param):
         if widget.props.title:
-            self._label.set_text(browser.props.title)
+            self._label.set_text(widget.props.title)
         else:
-            self._label.set_text(_('Untitled'))
+            self._label.set_text(_UNTITLED_TEXT)
 
 
 class Browser(WebKit.WebView):
     __gtype_name__ = 'Browser'
 
     __gsignals__ = {
-        'is-setup': (GObject.SignalFlags.RUN_FIRST,
-                     None,
-                     ([])),
         'new-tab': (GObject.SignalFlags.RUN_FIRST,
                     None,
                     ([str])),
--
cgit v0.9.1