From 0512c29740db61ad73e533480839e3d26a033bbe Mon Sep 17 00:00:00 2001
From: Manuel Quiñones <manuq@laptop.org>
Date: Tue, 29 Nov 2011 11:28:57 +0000
Subject: Remove mozilla xpcom and hulahop, add WebKit

This commit breaks a lot of Browse functionality.  This is marked in
the code with a FIXME keyword.

Original work was done by Daniel Drake.

Signed-off-by: Manuel Quiñones <manuq@laptop.org>
---
(limited to 'webtoolbar.py')

diff --git a/webtoolbar.py b/webtoolbar.py
index 00a7e87..af89fb5 100644
--- a/webtoolbar.py
+++ b/webtoolbar.py
@@ -21,7 +21,6 @@ from gettext import gettext as _
 from gi.repository import GObject
 from gi.repository import Gtk
 from gi.repository import Pango
-from xpcom.components import interfaces
 
 from sugar3.graphics.toolbutton import ToolButton
 from sugar3.graphics.menuitem import MenuItem
@@ -30,7 +29,8 @@ from sugar3.graphics.toolbarbox import ToolbarBox as ToolbarBase
 from sugar3.activity.widgets import ActivityToolbarButton
 from sugar3.activity.widgets import StopButton
 
-import filepicker
+# FIXME
+# import filepicker
 import places
 
 
@@ -48,7 +48,7 @@ class WebEntry(iconentry.IconEntry):
         self._title = None
         self._search_view = self._search_create_view()
 
-        self._search_window = Gtk.Window(Gtk.WindowType.POPUP)
+        self._search_window = Gtk.Window(type=Gtk.WindowType.POPUP)
         self._search_window.add(self._search_view)
         self._search_view.show()
 
@@ -102,7 +102,7 @@ class WebEntry(iconentry.IconEntry):
         cell.props.font = 'Bold'
         column.pack_start(cell, True)
 
-        column.set_attributes(cell, text=self._COL_TITLE)
+        column.add_attribute(cell, 'text', self._COL_TITLE)
 
         cell = Gtk.CellRendererText()
         cell.props.ellipsize = Pango.EllipsizeMode.END
@@ -110,7 +110,7 @@ class WebEntry(iconentry.IconEntry):
         cell.props.alignment = Pango.Alignment.LEFT
         column.pack_start(cell, True)
 
-        column.set_attributes(cell, text=self._COL_ADDRESS)
+        column.add_attribute(cell, 'text', self._COL_ADDRESS)
 
         return view
 
--
cgit v0.9.1