From 96da61cc5650784556b09cb7b3649ebe2c17ee33 Mon Sep 17 00:00:00 2001
From: Jan Michael Alonzo <jmalonzo@unpluggable.com>
Date: Thu, 20 Sep 2007 19:23:48 +1000
Subject: [PATCH] Fix constructor return types and method ownership (for memory
 management)

	modified:   webbrowser.py
         - Add frame.get_title and frame.get_location
	modified:   webkitgtk.defs
         - WebKitGtkPage constructor should return GtkWidget*
         - WebKitGtkFrame constructor should return GObject*
         - get_page, get_title, get_location: add caller-owns-return
---
 webbrowser.py  | 13 ++++++-------
 webkitgtk.defs |  7 +++++--
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/webbrowser.py b/webbrowser.py
index f21c3cc..866fadf 100755
--- a/webbrowser.py
+++ b/webbrowser.py
@@ -210,9 +210,9 @@ class WebBrowser(gtk.Window):
         self.props.title = title
 
     def _loading_start_cb(self, page, frame):
-        #main_frame = self._browser.get_main_frame()
-        #if frame is main_frame:
-        #    self._set_title(_("Loading %s") % main_frame.get_title())
+        main_frame = self._browser.get_main_frame()
+        if frame is main_frame:
+            self._set_title(_("Loading %s - %s") % (frame.get_title(),frame.get_location()))
         self._toolbar.set_loading(True)
 
     def _loading_stop_cb(self, page, frame):
@@ -220,13 +220,13 @@ class WebBrowser(gtk.Window):
         self._toolbar.set_loading(False)
 
     def _loading_progress_cb(self, page, progress):
-        self._set_progress(progress)
+        self._set_progress(_("%s%s loaded") % (progress, '%'))
 
     def _set_progress(self, progress):
-        self._statusbar.display(_("%s%s loaded") % (progress, '%'))
+        self._statusbar.display(progress)
 
     def _title_changed_cb(self, widget, title, uri):
-        self._set_title(title)
+        self._set_title(_("%s - %s") % (title,uri))
 
     def _hover_link_cb(self, url, base_url):
         print "link ", url, ' ', base_url
@@ -244,7 +244,6 @@ class WebBrowser(gtk.Window):
         self._scrolled_window.props.hadjustment = hadjustment
         self._scrolled_window.props.vadjustment = vadjustment
 
-
 if __name__ == "__main__":
     webbrowser = WebBrowser()
     gtk.main()
diff --git a/webkitgtk.defs b/webkitgtk.defs
index a7d8452..c16f244 100644
--- a/webkitgtk.defs
+++ b/webkitgtk.defs
@@ -28,7 +28,7 @@
   (is-constructor-of "WebKitGtkPage")
   (c-name "webkit_gtk_page_new")
   (caller-owns-return #t)
-  (return-type "WebKitGtkPage")
+  (return-type "GtkWidget*")
 )
 
 (define-method open
@@ -110,23 +110,26 @@
   (is-constructor-of "WebKitGtkFrame")
   (c-name "webkit_gtk_frame_new")
   (caller-owns-return #t)
-  (return-type "WebKitGtkFrame")
+  (return-type "GObject*")
 )
 
 (define-method get_page
   (of-object "WebKitGtkFrame")
   (c-name "webkit_gtk_frame_get_type")
+  (caller-owns-return #t)
   (return-type "WebKitGtkPage*")
 )
 
 (define-method get_title
   (of-object "WebKitGtkFrame")
   (c-name "webkit_gtk_frame_get_title")
+  (caller-owns-return #f)
   (return-type "gchar*")
 )
 
 (define-method get_location
   (of-object "WebKitGtkFrame")
   (c-name "webkit_gtk_frame_get_location")
+  (caller-owns-return #f)
   (return-type "gchar*")
 )
-- 
2.11.4.GIT