From 01b51c1e18d1a5a6e23d184cd4af1d58d0548a32 Mon Sep 17 00:00:00 2001
From: Tomeu Vizoso <tomeu@tomeuvizoso.net>
Date: Tue, 13 Feb 2007 06:20:41 +0000
Subject: Wrap _sugar.AddressEntry in Entry.

---
diff --git a/addressentry.py b/addressentry.py
new file mode 100644
index 0000000..d5563e0
--- /dev/null
+++ b/addressentry.py
@@ -0,0 +1,36 @@
+# Copyright (C) 2007, One Laptop Per Child
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the
+# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+import gobject
+
+import _sugar
+from sugar.graphics.entry import Entry
+
+class AddressEntry(Entry):
+    __gtype_name__ = 'WebAddressEntry'
+
+    __gproperties__ = {
+        'title'    : (str, None, None, None, gobject.PARAM_READWRITE),
+        'address'  : (str, None, None, None, gobject.PARAM_READWRITE),
+        'progress' : (float, None, None, 0.0, 1.0, 0.0, gobject.PARAM_READWRITE)
+    }
+    
+    def __init__(self):
+        Entry.__init__(self)
+
+    def create_entry(self):
+        self._address_entry = _sugar.AddressEntry()
+        return self._address_entry
diff --git a/webtoolbar.py b/webtoolbar.py
index 591863e..a80d4e1 100755
--- a/webtoolbar.py
+++ b/webtoolbar.py
@@ -17,7 +17,7 @@
 import hippo
 import gtk
 
-from _sugar import AddressEntry
+from addressentry import AddressEntry
 
 from sugar.graphics.toolbar import Toolbar
 from sugar.graphics.button import Button
@@ -41,11 +41,8 @@ class WebToolbar(Toolbar):
         self.append(self._stop_and_reload)
 
         self._entry = AddressEntry()
-        self._entry.connect("activate", self._entry_activate_cb)
-
-        entry_widget = hippo.CanvasWidget()
-        entry_widget.props.widget = self._entry
-        self.append(entry_widget, hippo.PACK_EXPAND)
+        self._entry.connect("activated", self._entry_activate_cb)
+        self.append(self._entry, hippo.PACK_EXPAND)
 
         self._post = Button('theme:stock-add')
         self._post.props.active = False
@@ -93,7 +90,7 @@ class WebToolbar(Toolbar):
         self._forward.props.active = embed.props.can_go_forward
 
     def _entry_activate_cb(self, entry):
-        self._embed.load_url(entry.get_text())
+        self._embed.load_url(entry.props.text)
         self._embed.grab_focus()
 
     def _go_back_cb(self, button):
--
cgit v0.9.1