diff --git a/plugins/AnonymizingBrowser/__init__.py b/plugins/AnonymizingBrowser/__init__.py
deleted file mode 100755
index 26cf6b434..000000000
--- a/plugins/AnonymizingBrowser/__init__.py
+++ /dev/null
@@ -1,617 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# browser.py
-#
-# Copyright (C) Marcos Pinto 2007 <markybob@gmail.com>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-# 
-# This program 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 General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, write to:
-#     The Free Software Foundation, Inc.,
-#     51 Franklin Street, Fifth Floor
-#     Boston, MA  02110-1301, USA.
-#
-#  In addition, as a special exception, the copyright holders give
-#  permission to link the code of portions of this program with the OpenSSL
-#  library.
-#  You must obey the GNU General Public License in all respects for all of
-#  the code used other than OpenSSL. If you modify file(s) with this
-#  exception, you may extend this exception to your version of the file(s),
-#  but you are not obligated to do so. If you do not wish to do so, delete
-#  this exception statement from your version. If you delete this exception
-#  statement from all source files in the program, then also delete it here.
-
-plugin_name = "Anonymizing Browser"
-plugin_author = "Marcos Pinto"
-plugin_version = "0.2"
-plugin_description = _("Browser websites anonymously")
-
-def deluge_init(deluge_path):
-    global path
-    path = deluge_path
-
-def enable(core, interface):
-    global path
-    return Browser(path, core, interface)
-
-import os
-import deluge.common
-
-if deluge.common.windows_check():
-    import win32con
-    from ctypes import *
-    from ctypes.wintypes import *
-    from comtypes import IUnknown, GUID, COMMETHOD, COMObject
-    from comtypes.automation import IDispatch, VARIANT
-    from comtypes.hresult import *
-    from comtypes.client import CreateObject, GetModule
-    CreateObject("InternetExplorer.Application").Quit()
-    from comtypes.gen.SHDocVw import IWebBrowser2
-    kernel32 = windll.kernel32
-    user32 = windll.user32
-    atl = windll.atl
-else:
-    import gtkmozembed
-
-import pygtk
-pygtk.require("2.0")
-import gtk, gtk.keysyms, gtk.glade
-import gobject
-import deluge.common
-
-class Browser:
-    """class builds and displays our internal browser"""
-    def __init__(self, path, core, interface):
-        print "Found AnonymizingBrowser plugin..."
-        self.interface = interface
-        if deluge.common.windows_check():
-            self.widgets = gtk.glade.XML(path + "/browserwin.glade", domain='deluge')
-        else:
-            self.widgets = gtk.glade.XML(path + "/browser.glade", domain='deluge')
-        self.browserbutton_image = gtk.Image()
-        self.browserbutton_image.set_from_pixbuf(\
-            gtk.gdk.pixbuf_new_from_file_at_size(path + '/browser.png', 18, 18))
-        self.browserbutton = gtk.ToolButton(self.browserbutton_image, _("Browser"))
-        self.browserbutton_tip = gtk.Tooltips()
-        self.browserbutton.set_tooltip(self.browserbutton_tip, _("Launch Anonymizing Browser"))
-        self.browserbutton.connect("clicked", self.launch_browser_clicked)
-        self.toolbar = self.interface.wtree.get_widget("tb_left")
-        self.toolbar.insert(self.browserbutton, -1)
-        self.toolbar.show_all()
-        self.txt_url = self.widgets.get_widget("entry1")
-        self.widgets.get_widget("window1").set_title("Deluge Web Browser")
-        self.txt_google = self.widgets.get_widget("entry2")
-        self.window = self.widgets.get_widget("window1")
-        self.notebook = self.widgets.get_widget("notebook1")
-        self.window.set_default_size(940, 700)
-        self.window.set_position(gtk.WIN_POS_CENTER_ALWAYS)
-        self.window.set_focus(self.txt_url)
-        self.window.connect("key_press_event", self.key_pressed)
-        self.window.connect("delete_event", self.hide)
-        self.window.realize()
-        self.signal_dic = { "load_url" : self.load_url,
-                            "search" : self.search,
-                            "reload" : self.reload_url,
-                            "go_back" : self.go_back,
-                            "go_forward" : self.go_forward,
-                            "go_back2" : self.go_back2,
-                            "go_forward2" : self.go_forward2,
-                            "stop_load" : self.stop_load,
-                            "launch_main" : self.launch_main,
-                            "launch_footer" : self.launch_footer,
-                            "list_bookmarks" : self.bookmark_manager }
-        self.widgets.signal_autoconnect(self.signal_dic)
-
-        if not deluge.common.windows_check():
-            """do all the work nessecary setup the mozilla environment."""
-            self.window.set_icon(deluge.common.get_logo(48))
-            self.create_profile_directory()
-            self.create_prefs_js()
-            self.create_mime()
-            gtkmozembed.set_profile_path(deluge.common.CONFIG_DIR, "mozilla")
-            self.gtkmoz0 = gtkmozembed.MozEmbed()
-            self.gtkmozad = gtkmozembed.MozEmbed()
-            self.gtkmoz0.load_url("http://deluge-torrent.org/google_search.htm")
-            self.gtkmozad.load_url("http://deluge-torrent.org/google.php")
-            self.widgets.get_widget("frame0").add(self.gtkmoz0)
-            self.widgets.get_widget("ad").add(self.gtkmozad)
-            self.txt_url.set_text(self.gtkmoz0.get_location())
-    
-        else:
-            #
-            # here begins all the COM nonsense necessary for IE to use a different
-            # user-agent string.  we need to implement IOleClientSite, from which
-            # IE will ask for the user-agent string via IDispatch.  to make it ask,
-            # we need to prod it via IOleControl.OnAmbientPropertyChange()
-            #
-            USER_AGENT = "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1) Deluge BitTorrent/0.5.8"
-            PROXY = "147932-web1.dipconsultants.com:3128"
-            class INTERNET_PROXY_INFO(Structure):
-                 _fields_ = [
-                 ('dwAccessType', c_long),
-                 ('lpszProxy', c_char_p),
-                 ('lpszProxyBypass', c_char_p)
-                ]
-            INTERNET_OPEN_TYPE_PROXY = 3
-            INTERNET_OPTION_PROXY = 38
-            InternetSetOption = windll.wininet.InternetSetOptionA
-            ProxyInfo = INTERNET_PROXY_INFO()
-            ProxyInfo.dwAccessType = INTERNET_OPEN_TYPE_PROXY
-            ProxyInfo.lpszProxy = "http=" + PROXY
-            ProxyInfo.lpszProxyBypass = "<local>" # Any address with no dots isn't proxied
-            InternetSetOption(0, INTERNET_OPTION_PROXY, byref(ProxyInfo), sizeof(ProxyInfo))
-
-            class IOleClientSite(IUnknown):
-                _case_insensitive_ = True
-                _iid_ = GUID('{00000118-0000-0000-C000-000000000046}')
-                _idlflags_ = []
-    
-            IOleClientSite._methods_ = [
-                COMMETHOD([], HRESULT, 'SaveObject'),
-                COMMETHOD([], HRESULT, 'GetMoniker',
-                    ( ['in'], c_ulong, 'dwAssign' ),
-                    ( ['in'], c_ulong, 'dwWhichMoniker' ),
-                    ( ['out'], POINTER(POINTER(DWORD)), 'ppmk' )),  # should be IMoniker but we don't use it
-                COMMETHOD([], HRESULT, 'GetContainer',
-                    ( ['out'], POINTER(POINTER(DWORD)), 'ppContainer' )),  # should be IOleContainer but we don't use it
-                COMMETHOD([], HRESULT, 'ShowObject'),
-                COMMETHOD([], HRESULT, 'OnShowWindow',
-                    ( ['in'], c_int, 'fShow' )),
-                COMMETHOD([], HRESULT, 'RequestNewObjectLayout'),
-                ]
-
-            class IOleObject(IUnknown):
-                _case_insensitive_ = True
-                _iid_ = GUID('{00000112-0000-0000-C000-000000000046}')
-                _idlflags_ = []
-
-            IOleObject._methods_ = [
-                COMMETHOD([], HRESULT, 'SetClientSite',
-                  ( ['in'], POINTER(IOleClientSite), 'pClientSite' )),
-                # ...
-                ]
-
-            class IOleControl(IUnknown):
-                _case_insensitive_ = True
-                _iid_ = GUID('{B196B288-BAB4-101A-B69C-00AA00341D07}')
-
-            IOleControl._methods_ = [
-                COMMETHOD([], HRESULT, 'GetControlInfo',
-                          (['out'], POINTER(DWORD), 'pCI')),  # should be CONTROLINFO but we don't use it
-                COMMETHOD([], HRESULT, 'OnMnemonic',
-                          (['in'], POINTER(DWORD), 'pMsg')),  # should be MSG but we don't use it
-                COMMETHOD([], HRESULT, 'OnAmbientPropertyChange',
-                          (['in'], DWORD, 'dispID')),         # should be DISPID but we don't use it
-                # ...
-                ]
-
-            DISPID_AMBIENT_USERAGENT = -5513
-
-            class IESite(COMObject):
-                _com_interfaces_ = [IDispatch, IOleClientSite]
-                def IDispatch_Invoke(self, this, memid, riid, lcid, wFlags, pDispParams,
-                                     pVarResult, pExcepInfo, puArgErr):
-                    if memid == DISPID_AMBIENT_USERAGENT and pVarResult:
-                        pVarResult[0].value = USER_AGENT
-                    return S_OK
-
-            _ieSite = IESite()
-
-            #
-            # here ends the COM nonsense for user-agent.
-            #
-
-            self.container = self.widgets.get_widget('drawingarea1')
-            self.container2 = self.widgets.get_widget('drawingarea2')
-            self.winpage = "self.pBrowser%i" % self.notebook.get_current_page()
-            self.container.realize()
-            self.container2.realize()
-            self.container.show()
-            self.container2.show()
-            self.container.set_property("can-focus", True)
-            self.widgets.get_widget('vpaned1').set_position(600)
-            self.container.connect("focus", self.on_container_focus)
-            self.container.connect("size-allocate", self.on_container_size)
-            self.container2.connect("size-allocate", self.on_container_size)
-
-            def makeBrowser(container, num):
-                """Create and return an instance of IE via AtlAxWin.
-                'container' should be a gtk.DrawingArea which acts as IE's parent."""
-                # Create the IE control instance.
-                atl.AtlAxWinInit()
-                hInstance = kernel32.GetModuleHandleA(None)
-                parentHwnd = container.window.handle
-                self.atlAxWinHwnd = \
-                    user32.CreateWindowExA(0, "AtlAxWin",
-                            "{EAB22AC1-30C1-11CF-A7EB-0000C05BAE0B}", # IWebBrowser2
-                            win32con.WS_VISIBLE | win32con.WS_CHILD |
-                            win32con.WS_HSCROLL | win32con.WS_VSCROLL,
-                            0, 0, 100, 100, parentHwnd, None, hInstance, 0)
-        
-                # Get the IWebBrowser2 interface for the IE control.
-                pBrowserUnk = POINTER(IUnknown)()
-                atl.AtlAxGetControl(self.atlAxWinHwnd, byref(pBrowserUnk))
-                # Wire up our client site, which provides the User-Agent as an ambient property.
-                oleObject = pBrowserUnk.QueryInterface(IOleObject)
-                oleObject.SetClientSite(_ieSite);
-                oleControl = pBrowserUnk.QueryInterface(IOleControl)
-                oleControl.OnAmbientPropertyChange(DISPID_AMBIENT_USERAGENT);
-
-                if num == 1:
-                    self.pBrowser = pBrowserUnk.QueryInterface(IWebBrowser2)
-                    self.pBrowser.Navigate("about:blank")
-                    self.pBrowser.Navigate("http://deluge-torrent.org/google_search.htm")
-    
-                elif num == 2:
-                    self.pBrowser2 = pBrowserUnk.QueryInterface(IWebBrowser2)
-                    self.pBrowser2.Navigate("about:blank")
-                    self.pBrowser2.Navigate("http://deluge-torrent.org/google.php")
-                return gtk.gdk.window_foreign_new(long(self.atlAxWinHwnd))
-            # Create the IE controls.
-            self.ieParents = {
-                self.container: makeBrowser(self.container, 1),
-                self.container2: makeBrowser(self.container2, 2)
-                }
-
-
-        # Create the BookmarkManager
-        import bookmark
-        self.bookmarks = bookmark.BookmarkManager(path, self,
-            self.widgets.get_widget("toolbutton_bookmarks"))
-        gobject.timeout_add(int(1000), self.update)
-
-    def launch_browser_clicked(self, arg=None):
-        self.window.show_all()
-
-    def new_tab(self, arg=None):
-        num = "self.gtkmoz%i" % self.notebook.get_n_pages()
-        exec "%s = gtkmozembed.MozEmbed()" % num
-        eval(num).load_url("http://deluge-torrent.org/google_search.htm")
-        self.frame = gtk.Frame()
-        self.frame.add(eval(num))
-        self.notebook.append_page(self.frame, gtk.Label(_("Label")))
-        self.frame.show_all()
-        
-    def unload(self, arg=None):
-        self.toolbar.remove(self.browserbutton)
-
-    def on_widget_click(self, widget, data):
-        self.main.window.focus()
-
-    def on_container_size(self, widget, sizeAlloc):
-        self.ieParents[widget].move_resize(0, 0, sizeAlloc.width, sizeAlloc.height)
-        
-    def on_container_focus(self, widget, data):
-        rect = RECT()
-        user32.GetWindowRect(self.atlAxWinHwnd, byref(rect))
-        ieHwnd = user32.WindowFromPoint(POINT(rect.left, rect.top))
-        user32.SetFocus(ieHwnd)
-
-    def create_profile_directory(widget=None):
-        """create the mozilla profile directory, if needed."""
-        if not deluge.common.windows_check():
-            path = os.path.join(deluge.common.CONFIG_DIR, "mozilla")
-            if not os.path.exists(path):
-                os.makedirs(path)
-        else:
-            pass
-
-    def create_mime(widget=None):
-        """create the mimeTypes.rdf file"""
-        if not deluge.common.windows_check():
-            mime_content = """\
-<?xml version="1.0"?>
-<RDF:RDF xmlns:NC="http://home.netscape.com/NC-rdf#"
-         xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-  <RDF:Description RDF:about="urn:mimetype:handler:application/x-bittorrent"
-                   NC:saveToDisk="false"
-                   NC:alwaysAsk="false"
-                   NC:useSystemDefault="true">
-    <NC:externalApplication RDF:resource="urn:mimetype:externalApplication:application/x-bittorrent"/>
-  </RDF:Description>
-  <RDF:Seq RDF:about="urn:mimetypes:root">
-    <RDF:li RDF:resource="urn:mimetype:application/x-bittorrent"/>
-  </RDF:Seq>
-  <RDF:Description RDF:about="urn:mimetypes">
-    <NC:MIME-types RDF:resource="urn:mimetypes:root"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetype:application/x-bittorrent"
-                   NC:description="BitTorrent seed file"
-                   NC:value="application/x-bittorrent"
-                   NC:editable="true">
-    <NC:handlerProp RDF:resource="urn:mimetype:handler:application/x-bittorrent"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="urn:mimetype:externalApplication:application/x-bittorrent"
-                   NC:prettyName=""
-                   NC:path="" />
-</RDF:RDF>
-"""
-            mime_path = os.path.join(deluge.common.CONFIG_DIR, "mozilla", "mimeTypes.rdf")
-            f = open(mime_path, "wt")
-            f.write(mime_content)
-            f.close()
-        else:
-            pass
-
-    def create_prefs_js(widget=None):
-        """create the file prefs.js in the mozilla profile directory.  this
-        does things like turn off the warning when navigating to https pages.
-        """
-        if not deluge.common.windows_check():
-            prefs_content = """\
-user_pref("security.warn_entering_secure", false);
-user_pref("security.warn_entering_weak", false);
-user_pref("security.warn_viewing_mixed", false);
-user_pref("security.warn_leaving_secure", false);
-user_pref("security.warn_submit_insecure", false);
-user_pref("security.warn_entering_secure.show_once", false);
-user_pref("security.warn_entering_weak.show_once", false);
-user_pref("security.warn_viewing_mixed.show_once", false);
-user_pref("security.warn_leaving_secure.show_once", false);
-user_pref("security.warn_submit_insecure.show_once", false);
-user_pref("security.enable_java", false);
-user_pref("browser.xul.error_pages.enabled", false);
-user_pref("general.useragent.vendor", %s);
-user_pref("general.useragent.vendorSub", %s);
-user_pref("network.proxy.http", "%s");
-user_pref("network.proxy.http_port", %s);
-user_pref("network.proxy.ssl", "%s");
-user_pref("network.proxy.ssl_port", %s);
-user_pref("network.proxy.type", 1);
-""" % (repr("Deluge BitTorrent"),
-       repr("0.5.8"),
-       '147932-web1.dipconsultants.com',
-       3128,
-       '147932-web1.dipconsultants.com',
-       3128)
-            prefs_path = os.path.join(deluge.common.CONFIG_DIR, "mozilla", "prefs.js")
-            f = open(prefs_path, "wt")
-            f.write(prefs_content)
-            f.close()
-        else:
-            pass
-
-    def update(self):
-        """updates the GUI"""
-        self.linpage = "self.gtkmoz%i" % self.notebook.get_current_page()
-        if not deluge.common.windows_check():
-            if self.window.get_focus() != self.txt_url:
-                self.txt_url.set_text(eval(self.linpage).get_location())
-            try:
-                self.widgets.get_widget("window1").set_title("Deluge Web Browser " \
-                    + eval(self.linpage).get_title())
-            except:
-                pass
-            if eval(self.linpage).can_go_back():
-                self.widgets.get_widget("toolbutton_back").set_sensitive(True)
-            else:
-                self.widgets.get_widget("toolbutton_back").set_sensitive(False)
-            if eval(self.linpage).can_go_forward():
-                self.widgets.get_widget("toolbutton_forward").set_sensitive(True)
-            else:
-                self.widgets.get_widget("toolbutton_forward").set_sensitive(False)
-            if self.gtkmozad.can_go_back():
-                self.widgets.get_widget("toolbutton_back2").set_sensitive(True)
-            else:
-               self.widgets.get_widget("toolbutton_back2").set_sensitive(False)
-            if self.gtkmozad.can_go_forward():
-                self.widgets.get_widget("toolbutton_forward2").set_sensitive(True)
-            else:
-                self.widgets.get_widget("toolbutton_forward2").set_sensitive(False)
-        else:
-            self.txt_url.set_text(self.pBrowser.LocationURL)
-            try:
-                self.widgets.get_widget("window1").set_title("Deluge Web Browser " \
-                + self.pBrowser.LocationName)
-            except:
-                pass
-        return True
-
-    def key_pressed(self, widget, key):
-        """captures ctrl+ keys and sets focus accordingly, or quits"""
-        self.linpage = "self.gtkmoz%i" % self.notebook.get_current_page()
-        if key.keyval in (gtk.keysyms.L, gtk.keysyms.l) and (key.state & \
-            gtk.gdk.CONTROL_MASK) != 0:
-            self.window.set_focus(self.txt_url)
-        elif key.keyval in (gtk.keysyms.K, gtk.keysyms.k) and (key.state & \
-            gtk.gdk.CONTROL_MASK) != 0:
-            self.window.set_focus(self.txt_google)
-        elif key.keyval in (gtk.keysyms.R, gtk.keysyms.r) and (key.state & \
-            gtk.gdk.CONTROL_MASK) != 0:
-            if not deluge.common.windows_check():
-                eval(self.linpage).reload(0)
-            else:
-                self.pBrowser.refresh()
-        elif key.keyval == gtk.keysyms.Return and (key.state & \
-            gtk.gdk.CONTROL_MASK) != 0:
-            if not deluge.common.windows_check():
-                eval(self.linpage).load_url("http://www.%s.com" % (self.txt_url.get_text()))
-                self.txt_url.set_text(eval(self.linpage).get_location())
-            else:
-                v = byref(VARIANT())
-                self.pBrowser.Navigate("http://www.%s.com" % (self.txt_url.get_text()), v, v, v, v)
-        elif key.keyval == gtk.keysyms.Return and (key.state & \
-            gtk.gdk.SHIFT_MASK) != 0:
-            if not deluge.common.windows_check():
-                self.eval(self.linpage).load_url("http://www.%s.net" % (self.txt_url.get_text()))
-                self.txt_url.set_text(eval(self.linpage).get_location())
-            else:
-                v = byref(VARIANT())
-                self.pBrowser.Navigate("http://www.%s.net" % (self.txt_url.get_text()), v, v, v, v)                
-        elif key.keyval in (gtk.keysyms.Q, gtk.keysyms.q, gtk.keysyms.W, \
-            gtk.keysyms.w) and (key.state & gtk.gdk.CONTROL_MASK) != 0:
-            self.hide()
-
-
-    def search(self, widget=None):
-        """open a new search page"""
-        if not deluge.common.windows_check():
-            self.linpage = "self.gtkmoz%i" % self.notebook.get_current_page()
-            eval(self.linpage).load_url("http://www.google.com/cse?cx=0103316019315568500"
-                + "92%3Apfadwhze_jy&q=" + self.txt_google.get_text() + "&sa=Search&cof=FORID%3A1")
-            try:
-                self.widgets.get_widget("window1").set_title("Deluge Web Browser " \
-                + eval(self.linpage).get_title())
-            except:
-                pass
-        else:
-            v = byref(VARIANT())
-            self.pBrowser.Navigate("http://www.google.com/cse?cx=0103316019315568500"
-                + "92%3Apfadwhze_jy&q=" + self.txt_google.get_text() + "&sa=Search&cof=FORID%3A1", v, v, v, v)
-
-    def load_url(self, widget=None):
-        """open a new url"""
-        if not deluge.common.windows_check():
-            self.linpage = "self.gtkmoz%i" % self.notebook.get_current_page()
-            eval(self.linpage).load_url(self.txt_url.get_text())
-            try:
-                self.widgets.get_widget("window1").set_title("Deluge Web Browser " \
-                + eval(self.linpage).get_title())
-            except:
-                pass
-        else:
-            v = byref(VARIANT())
-            self.pBrowser.Navigate(self.txt_url.get_text(), v, v, v, v)
-
-    def launch_site(self, url):
-        """open a new url"""
-        if not deluge.common.windows_check():
-            eval(self.linpage).load_url(url)
-            try:
-                self.widgets.get_widget("window1").set_title("Deluge Web Browser " \
-                + eval(self.linpage).get_title())
-            except:
-                pass
-        else:
-            v = byref(VARIANT())
-            self.pBrowser.Navigate(url, v, v, v, v)
-
-    def reload_url(self, widget=None):
-        """refresh the current url"""
-        if not deluge.common.windows_check():
-            self.linpage = "self.gtkmoz%i" % self.notebook.get_current_page()
-            print "self.gtkmoz%i" % self.notebook.get_current_page()
-            eval(self.linpage).reload(0)
-        else:
-            self.pBrowser.refresh()
-
-    def launch_main(self, widget=None):
-        """loads frame into external browser"""
-        import threading
-        import webbrowser
-        if not deluge.common.windows_check():
-            self.link = eval(self.linpage).get_location()
-        else:
-            self.link = self.pBrowser.LocationURL
-
-        class BrowserThread(threading.Thread):
-           def __init__(self, link):
-               threading.Thread.__init__(self)
-               self.url = link
-           def run(self):
-               webbrowser.open(self.url)
-        BrowserThread(self.link).start()
-        return True
-
-    def launch_footer(self, widget=None):
-        """loads frame into external browser"""
-        import threading
-        import webbrowser
-        if not deluge.common.windows_check():
-            self.link = self.gtkmozad.get_location()
-        else:
-            self.link = self.pBrowser2.LocationURL
-
-        class BrowserThread(threading.Thread):
-           def __init__(self, link):
-               threading.Thread.__init__(self)
-               self.url = link
-           def run(self):
-               webbrowser.open(self.url)
-        BrowserThread(self.link).start()
-        return True
-
-    def go_back(self, widget=None):
-        """go a page back"""
-        if not deluge.common.windows_check():
-            self.linpage = "self.gtkmoz%i" % self.notebook.get_current_page()
-            if eval(self.linpage).can_go_back():
-                eval(self.linpage).go_back()
-                self.txt_url.set_text(eval(self.linpage).get_location())
-            try:
-                self.widgets.get_widget("window1").set_title("Deluge Web Browser " \
-                    + eval(self.linpage).get_title())
-            except:
-                pass
-        else:
-            self.pBrowser.GoBack()
-            self.txt_url.set_text(self.pBrowser.LocationURL)
-            try:
-                self.widgets.get_widget("window1").set_title("Deluge Web Browser" \
-                    + self.pBrowser.LocationName)
-            except:
-                pass
-
-    def go_forward(self, widget=None):
-        """go a page ahead"""
-        if not deluge.common.windows_check():
-            self.linpage = "self.gtkmoz%i" % self.notebook.get_current_page()
-            if eval(self.linpage).can_go_forward():
-                eval(self.linpage).go_forward()
-                self.txt_url.set_text(eval(self.linpage).get_location())
-            try:
-                self.widgets.get_widget("window1").set_title("Deluge Web Browser " \
-                + eval(self.linpage).get_title())
-            except:
-                pass
-        else:
-            self.pBrowser.GoForward()
-            self.txt_url.set_text(self.pBrowser.LocationURL)
-            try:
-                self.widgets.get_widget("window1").set_title("Deluge Web Browser" \
-                    + self.pBrowser.LocationName)
-            except:
-                pass
-
-    def go_back2(self, widget=None):
-        """go a page back"""
-        if not deluge.common.windows_check():
-            if self.gtkmozad.can_go_back():
-                self.gtkmozad.go_back()
-        else:
-            self.pBrowser2.GoBack()
-
-    def go_forward2(self, widget=None):
-        """go a page ahead"""
-        if not deluge.common.windows_check():
-            if self.gtkmozad.can_go_forward():
-                self.gtkmozad.go_forward()
-        else:
-            self.pBrowser2.GoForward()
-
-    def stop_load(self, widget=None):
-        """stop loading current page"""
-        if not deluge.common.windows_check():
-            self.linpage = "self.gtkmoz%i" % self.notebook.get_current_page()
-            eval(self.linpage).stop_load()
-        else:
-            self.pBrowser.Stop()
-
-    def bookmark_manager(self, widget=None):
-        """show bookmark manager"""
-        self.bookmarks.show()
-
-    def hide(self, widget=None, arg=None):
-        """close browser"""
-        self.window.hide()
-        return True
-
diff --git a/plugins/AnonymizingBrowser/bookmark.py b/plugins/AnonymizingBrowser/bookmark.py
deleted file mode 100755
index bf74c58a3..000000000
--- a/plugins/AnonymizingBrowser/bookmark.py
+++ /dev/null
@@ -1,257 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# bookmark.py
-#
-# Copyright (C) Marcos Pinto 2007 <markybob@gmail.com>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-# 
-# This program 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 General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, write to:
-#     The Free Software Foundation, Inc.,
-#     51 Franklin Street, Fifth Floor
-#     Boston, MA  02110-1301, USA.
-#
-#  In addition, as a special exception, the copyright holders give
-#  permission to link the code of portions of this program with the OpenSSL
-#  library.
-#  You must obey the GNU General Public License in all respects for all of
-#  the code used other than OpenSSL. If you modify file(s) with this
-#  exception, you may extend this exception to your version of the file(s),
-#  but you are not obligated to do so. If you do not wish to do so, delete
-#  this exception statement from your version. If you delete this exception
-#  statement from all source files in the program, then also delete it here.
-
-import cPickle
-import os.path
-import pygtk
-pygtk.require("2.0")
-import gtk.glade
-import deluge.common
-
-class BookmarkManager:
-    """class builds and displays our internal bookmark manager"""
-    def __init__(self, path, parent, toolbutton):
-        """show bookmark manager"""
-        self.bookmarks = []
-        self.toolbutton = toolbutton
-        self.menu = gtk.Menu()
-        self.parent = parent
-        self.widgets = gtk.glade.XML(path + "/list_bookmarks.glade")
-        self.list_dlg = self.widgets.get_widget("list_bookmarks_dialog")
-        self.treeview = self.widgets.get_widget("bookmarks_treeview")
-        self.add_bookmark_dialog = self.widgets.get_widget("add_bookmark_dialog")
-        self.edit_bookmark_dialog = self.widgets.get_widget("edit_bookmark_dialog")
-        if deluge.common.windows_check():
-            self.add_bookmark_dialog.set_position(gtk.WIN_POS_CENTER_ALWAYS)
-            self.edit_bookmark_dialog.set_position(gtk.WIN_POS_CENTER_ALWAYS)
-        else:
-            self.list_dlg.set_icon(deluge.common.get_logo(18))
-            self.edit_bookmark_dialog.set_icon(deluge.common.get_logo(18))
-            self.add_bookmark_dialog.set_icon(deluge.common.get_logo(18))
-        self.list_dlg.set_transient_for(self.parent.window)
-        self.signal_dic = { "on_button_cancel_clicked" : self.on_button_cancel_clicked,
-                            "on_button_ok_clicked" : self.on_button_ok_clicked,
-                            "on_button_add_clicked" : self.on_button_add_clicked,
-                            "on_button_edit_clicked" : self.on_button_edit_clicked,
-                            "on_button_remove_clicked" : self.on_button_remove_clicked,
-                            "on_button_add_ok_clicked" : self.on_button_add_ok_clicked,
-                            "on_button_add_cancel_clicked" : self.on_button_add_cancel_clicked,
-                            "on_button_edit_ok_clicked" : self.on_button_edit_ok_clicked,
-                            "on_button_edit_cancel_clicked" : self.on_button_edit_cancel_clicked,
-                            "quit" : self.on_button_cancel_clicked
-                         }
-        self.widgets.signal_autoconnect(self.signal_dic)
-        # Create a liststore for tier, url
-        self.liststore = gtk.ListStore(str, str)
-        
-        # Create the columns
-        self.treeview.append_column(
-            gtk.TreeViewColumn("Name", gtk.CellRendererText(), text=0))
-        self.treeview.append_column(
-            gtk.TreeViewColumn("URL", gtk.CellRendererText(), text=1))
-
-        self.treeview.set_model(self.liststore)            
-        self.liststore.set_sort_column_id(0, gtk.SORT_ASCENDING)
-        self.load_bookmarks()
-        
-        self.build_menu()
-
-    def show(self):
-        self.list_dlg.show()
-
-    def hide(self):
-        self.list_dlg.hide()
-        if deluge.common.windows_check():
-            path = os.path.join(deluge.common.CONFIG_DIR, "bookmarks.save")
-        else:
-            path = os.path.join(deluge.common.CONFIG_DIR, "mozilla", "bookmarks.save")
-        try:
-            bookmark_file = open(path, "wb")
-            cPickle.dump(self.bookmarks, bookmark_file)
-            bookmark_file.close()
-        except Exception, e:
-            print "Unable to save bookmarks file: %s", e
-
-    def load_bookmarks(self):
-        bookmarks = None
-        if deluge.common.windows_check():
-            path = os.path.join(deluge.common.CONFIG_DIR, "bookmarks.save")
-        else:
-            path = os.path.join(deluge.common.CONFIG_DIR, "mozilla", "bookmarks.save")
-
-        if os.path.exists(path):
-            try:
-                bookmark_file = open(path, "rb")
-                bookmarks = cPickle.load(bookmark_file)
-                bookmark_file.close()
-            except Exception, e:
-                print "Unable to load bookmarks file: %s", e
-        
-        if bookmarks == None:
-            return
-        
-        self.liststore.clear()
-            
-        for bookmark in bookmarks:
-            self.liststore.append([bookmark["name"], bookmark["url"]])
-        
-        self.bookmarks = bookmarks
-            
-        self.build_menu()
-    
-    def build_menu(self):
-        """Builds the bookmark menu"""
-        self.menu = gtk.Menu()
-        menuitem = gtk.MenuItem("Bookmark This Page...")
-        menuitem.connect("activate", self.menuitem_activate)
-        self.menu.append(menuitem)
-        menuitem = gtk.SeparatorMenuItem()
-        self.menu.append(menuitem)
-        # Iterate through the bookmark list and make menuitems for them
-        def add_menuitem(model, path, row, data):
-            menuitem = gtk.MenuItem(model.get_value(row, 0))
-            menuitem.connect("activate", self.menuitem_activate)
-            self.menu.append(menuitem)
-        
-        self.liststore.foreach(add_menuitem, None)
-        self.menu.show_all()
-        # Set the new menu on the toolbutton
-        self.toolbutton.set_menu(self.menu)
-        
-    def add_bookmark(self, name, url):
-        """Adds a bookmark to the list"""
-        self.liststore.append([name, url])
-        self.build_menu()
-
-    def get_selected(self):
-        """Returns the selected bookmark"""
-        return self.treeview.get_selection().get_selected()[1]
-
-    def on_button_add_clicked(self, widget):
-        # Show the add bookmark dialog
-        self.add_bookmark_dialog.show()
-        self.widgets.get_widget("entry_add_name").grab_focus()
-
-    def on_button_edit_clicked(self, widget):
-        # Show the edit bookmark dialog
-        selected = self.get_selected()
-        if selected != None:
-            self.edit_bookmark_dialog.show()
-            self.widgets.get_widget("entry_edit_name").grab_focus()
-            self.widgets.get_widget("entry_edit_name").set_text(self.liststore.\
-                get_value(selected, 0))
-            self.widgets.get_widget("entry_edit_url").set_text(self.liststore.\
-                get_value(selected, 1))
-
-    def on_button_add_ok_clicked(self, widget):
-        # Get values from the entry widgets
-        name = self.widgets.get_widget("entry_add_name").get_text()
-        url = self.widgets.get_widget("entry_add_url").get_text()
-        
-        self.add_bookmark(name, url)
-        # Clear the entry widget and hide the dialog
-        self.widgets.get_widget("entry_add_name").set_text("")
-        self.widgets.get_widget("entry_add_url").set_text("")
-        self.add_bookmark_dialog.hide()
-
-    def on_button_add_cancel_clicked(self, widget, arg=None):
-        # Clear the entry widget and hide the dialog
-        self.widgets.get_widget("entry_add_name").set_text("")
-        self.widgets.get_widget("entry_add_url").set_text("")
-        self.add_bookmark_dialog.hide()
-        if arg != None:
-            return True
-        
-    def on_button_edit_ok_clicked(self, widget):
-        # Get values from the entry widgets
-        name = self.widgets.get_widget("entry_edit_name").get_text()
-        url = self.widgets.get_widget("entry_edit_url").get_text()
-        selected = self.get_selected()
-        if selected != None:
-            self.liststore.remove(selected)
-        self.add_bookmark(name, url)
-        self.build_menu()
-
-        # Clear the entry widget and hide the dialog
-        self.widgets.get_widget("entry_edit_name").set_text("")
-        self.widgets.get_widget("entry_edit_url").set_text("")
-        self.edit_bookmark_dialog.hide()
-
-    def on_button_edit_cancel_clicked(self, widget, arg=None):
-        # Clear the entry widget and hide the dialog
-        self.widgets.get_widget("entry_edit_name").set_text("")
-        self.widgets.get_widget("entry_edit_url").set_text("")
-        self.edit_bookmark_dialog.hide()
-        if arg != None:
-            return True
-        
-    def on_button_remove_clicked(self, widget):
-        selected = self.get_selected()
-        if selected != None:
-            self.liststore.remove(selected)
-
-        self.build_menu()
-        
-    def on_button_cancel_clicked(self, widget, arg=None):
-        self.load_bookmarks()
-        self.hide()
-        if arg != None:
-            return True
-        
-    def on_button_ok_clicked(self, widget):
-        def each(model, path, iter, data):
-            bookmark = {}
-            bookmark["name"] = model.get_value(iter, 0)
-            bookmark["url"] = model.get_value(iter, 1)
-            self.bookmarks.append(bookmark)
-        self.bookmarks = []
-        self.liststore.foreach(each, None)
-        self.hide()
-
-    def menuitem_activate(self, widget):
-        text = widget.get_child().get_text()
-        def load_url(model, path, row, data):
-            if model.get_value(row, 0) == text:
-                # Grab the URL and load it
-                url = model.get_value(row, 1)
-                self.parent.txt_url.set_text(url)
-                self.parent.load_url()
-        if text == "Bookmark This Page...":
-            # Show the add bookmark dialog
-            self.add_bookmark_dialog.show()
-            self.widgets.get_widget("entry_add_name").grab_focus()
-            self.widgets.get_widget("entry_add_url").set_text(
-                self.parent.txt_url.get_text())
-            self.on_button_ok_clicked(widget)
-            return
-            
-        self.liststore.foreach(load_url, None)
diff --git a/plugins/AnonymizingBrowser/browser.glade b/plugins/AnonymizingBrowser/browser.glade
deleted file mode 100755
index e5eb28b1e..000000000
--- a/plugins/AnonymizingBrowser/browser.glade
+++ /dev/null
@@ -1,342 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.1 on Tue Jan  8 19:54:03 2008 -->
-<glade-interface>
-  <widget class="GtkWindow" id="window1">
-    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-    <child>
-      <widget class="GtkVBox" id="vbox1">
-        <property name="visible">True</property>
-        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-        <child>
-          <widget class="GtkToolbar" id="toolbar3">
-            <property name="visible">True</property>
-            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <property name="icon_size">GTK_ICON_SIZE_MENU</property>
-            <property name="icon_size_set">True</property>
-            <child>
-              <widget class="GtkToolButton" id="toolbutton_back">
-                <property name="visible">True</property>
-                <property name="sensitive">False</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="stock_id">gtk-go-back</property>
-                <signal name="clicked" handler="go_back"/>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkToolButton" id="toolbutton_forward">
-                <property name="visible">True</property>
-                <property name="sensitive">False</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="stock_id">gtk-go-forward</property>
-                <signal name="clicked" handler="go_forward"/>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkToolButton" id="toolbutton17">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="stock_id">gtk-refresh</property>
-                <signal name="clicked" handler="reload"/>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkSeparatorToolItem" id="separatortoolitem5">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkToolItem" id="toolbutton18">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <child>
-                  <widget class="GtkEntry" id="entry1">
-                    <property name="width_request">300</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <signal name="activate" handler="load_url"/>
-                  </widget>
-                </child>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkToolButton" id="toolbutton19">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="label" translatable="yes">Go</property>
-                <property name="stock_id">gtk-jump-to</property>
-                <signal name="clicked" handler="load_url"/>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkToolButton" id="toolbutton20">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="stock_id">gtk-stop</property>
-                <signal name="clicked" handler="stop_load"/>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkSeparatorToolItem" id="separatortoolitem6">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkMenuToolButton" id="toolbutton_bookmarks">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="label" translatable="yes">Bookmarks</property>
-                <property name="stock_id">gtk-justify-fill</property>
-                <signal name="clicked" handler="list_bookmarks"/>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkSeparatorToolItem" id="separatortoolitem1">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkToolItem" id="toolbutton1">
-                <property name="width_request">150</property>
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <child>
-                  <widget class="GtkEntry" id="entry2">
-                    <property name="width_request">150</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <signal name="activate" handler="search"/>
-                  </widget>
-                </child>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkSeparatorToolItem" id="separatortoolitem2">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkToolButton" id="toolbutton2">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="tooltip" translatable="yes">Launch Main Externally</property>
-                <property name="label" translatable="yes">Launch Main</property>
-                <property name="stock_id">gtk-goto-top</property>
-                <signal name="clicked" handler="launch_main"/>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkToolButton" id="toolbutton3">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="has_tooltip">True</property>
-                <property name="tooltip" translatable="yes">Launch Footer Externally</property>
-                <property name="label" translatable="yes">Launch Footer</property>
-                <property name="stock_id">gtk-goto-bottom</property>
-                <signal name="clicked" handler="launch_footer"/>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkVPaned" id="vpaned1">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <child>
-              <widget class="GtkNotebook" id="notebook1">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="show_border">False</property>
-                <property name="tab_border">0</property>
-                <property name="tab_hborder">0</property>
-                <property name="tab_vborder">0</property>
-                <child>
-                  <widget class="GtkFrame" id="frame0">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="label_xalign">0</property>
-                    <property name="shadow_type">GTK_SHADOW_NONE</property>
-                    <child>
-                      <placeholder/>
-                    </child>
-                    <child>
-                      <placeholder/>
-                      <packing>
-                        <property name="type">label_item</property>
-                      </packing>
-                    </child>
-                  </widget>
-                </child>
-                <child>
-                  <widget class="GtkLabel" id="label0">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="label" translatable="yes">Label1</property>
-                  </widget>
-                  <packing>
-                    <property name="type">tab</property>
-                    <property name="tab_fill">False</property>
-                  </packing>
-                </child>
-              </widget>
-              <packing>
-                <property name="resize">True</property>
-                <property name="shrink">True</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkHBox" id="hbox1">
-                <property name="height_request">98</property>
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <child>
-                  <widget class="GtkToolbar" id="toolbar1">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="orientation">GTK_ORIENTATION_VERTICAL</property>
-                    <property name="toolbar_style">GTK_TOOLBAR_ICONS</property>
-                    <property name="show_arrow">False</property>
-                    <property name="icon_size">GTK_ICON_SIZE_MENU</property>
-                    <child>
-                      <widget class="GtkToolButton" id="toolbutton_back2">
-                        <property name="height_request">94</property>
-                        <property name="visible">True</property>
-                        <property name="sensitive">False</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="stock_id">gtk-go-back</property>
-                        <signal name="clicked" handler="go_back2"/>
-                        <signal name="clicked" handler="go_back2"/>
-                      </widget>
-                      <packing>
-                        <property name="expand">False</property>
-                      </packing>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkFrame" id="ad">
-                    <property name="height_request">94</property>
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="label_xalign">0</property>
-                    <property name="shadow_type">GTK_SHADOW_NONE</property>
-                    <child>
-                      <placeholder/>
-                    </child>
-                    <child>
-                      <placeholder/>
-                      <packing>
-                        <property name="type">label_item</property>
-                      </packing>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkToolbar" id="toolbar2">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="orientation">GTK_ORIENTATION_VERTICAL</property>
-                    <property name="toolbar_style">GTK_TOOLBAR_ICONS</property>
-                    <property name="show_arrow">False</property>
-                    <property name="icon_size">GTK_ICON_SIZE_MENU</property>
-                    <child>
-                      <widget class="GtkToolButton" id="toolbutton_forward2">
-                        <property name="height_request">94</property>
-                        <property name="visible">True</property>
-                        <property name="sensitive">False</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="stock_id">gtk-go-forward</property>
-                        <signal name="clicked" handler="go_forward2"/>
-                      </widget>
-                      <packing>
-                        <property name="expand">False</property>
-                      </packing>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-              </widget>
-              <packing>
-                <property name="resize">False</property>
-                <property name="shrink">False</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-  </widget>
-</glade-interface>
diff --git a/plugins/AnonymizingBrowser/browser.png b/plugins/AnonymizingBrowser/browser.png
deleted file mode 100755
index bba66e1a8..000000000
Binary files a/plugins/AnonymizingBrowser/browser.png and /dev/null differ
diff --git a/plugins/AnonymizingBrowser/browserwin.glade b/plugins/AnonymizingBrowser/browserwin.glade
deleted file mode 100755
index 1ef87372d..000000000
--- a/plugins/AnonymizingBrowser/browserwin.glade
+++ /dev/null
@@ -1,295 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.0 on Mon Dec 24 21:29:26 2007 -->
-<glade-interface>
-  <widget class="GtkWindow" id="window1">
-    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-    <child>
-      <widget class="GtkVBox" id="vbox1">
-        <property name="visible">True</property>
-        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-        <child>
-          <widget class="GtkToolbar" id="toolbar3">
-            <property name="visible">True</property>
-            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <property name="icon_size">GTK_ICON_SIZE_MENU</property>
-            <property name="icon_size_set">True</property>
-            <child>
-              <widget class="GtkToolButton" id="toolbutton_back">
-                <property name="visible">True</property>
-                <property name="sensitive">False</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="stock_id">gtk-go-back</property>
-                <signal name="clicked" handler="go_back"/>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkToolButton" id="toolbutton_forward">
-                <property name="visible">True</property>
-                <property name="sensitive">False</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="stock_id">gtk-go-forward</property>
-                <signal name="clicked" handler="go_forward"/>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkToolButton" id="toolbutton17">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="stock_id">gtk-refresh</property>
-                <signal name="clicked" handler="reload"/>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkSeparatorToolItem" id="separatortoolitem5">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkToolItem" id="toolbutton18">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <child>
-                  <widget class="GtkEntry" id="entry1">
-                    <property name="width_request">300</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <signal name="activate" handler="load_url"/>
-                  </widget>
-                </child>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkToolButton" id="toolbutton19">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="label" translatable="yes">Go</property>
-                <property name="stock_id">gtk-jump-to</property>
-                <signal name="clicked" handler="load_url"/>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkToolButton" id="toolbutton20">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="stock_id">gtk-stop</property>
-                <signal name="clicked" handler="stop_load"/>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkSeparatorToolItem" id="separatortoolitem6">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkMenuToolButton" id="toolbutton_bookmarks">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="label" translatable="yes">Bookmarks</property>
-                <property name="stock_id">gtk-justify-fill</property>
-                <signal name="clicked" handler="list_bookmarks"/>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkSeparatorToolItem" id="separatortoolitem1">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkToolItem" id="toolbutton1">
-                <property name="width_request">150</property>
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <child>
-                  <widget class="GtkEntry" id="entry2">
-                    <property name="width_request">150</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <signal name="activate" handler="search"/>
-                  </widget>
-                </child>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkSeparatorToolItem" id="separatortoolitem2">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkToolButton" id="toolbutton2">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="tooltip" translatable="yes">Launch Main Externally</property>
-                <property name="label" translatable="yes">Launch Main</property>
-                <property name="stock_id">gtk-goto-top</property>
-                <signal name="clicked" handler="launch_main"/>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkToolButton" id="toolbutton3">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="tooltip" translatable="yes">Launch Footer Externally</property>
-                <property name="label" translatable="yes">Launch Footer</property>
-                <property name="stock_id">gtk-goto-bottom</property>
-                <signal name="clicked" handler="launch_footer"/>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkVPaned" id="vpaned1">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <child>
-              <widget class="GtkDrawingArea" id="drawingarea1">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-              </widget>
-              <packing>
-                <property name="resize">False</property>
-                <property name="shrink">True</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkHBox" id="hbox1">
-                <property name="height_request">98</property>
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <child>
-                  <widget class="GtkToolbar" id="toolbar1">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="orientation">GTK_ORIENTATION_VERTICAL</property>
-                    <property name="toolbar_style">GTK_TOOLBAR_ICONS</property>
-                    <property name="show_arrow">False</property>
-                    <property name="icon_size">GTK_ICON_SIZE_SMALL_TOOLBAR</property>
-                    <child>
-                      <widget class="GtkToolButton" id="toolbutton_back2">
-                        <property name="height_request">94</property>
-                        <property name="visible">True</property>
-                        <property name="sensitive">False</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="stock_id">gtk-go-back</property>
-                        <signal name="clicked" handler="go_back2"/>
-                        <signal name="clicked" handler="go_back2"/>
-                      </widget>
-                      <packing>
-                        <property name="expand">False</property>
-                      </packing>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkDrawingArea" id="drawingarea2">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                  </widget>
-                  <packing>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkToolbar" id="toolbar2">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="orientation">GTK_ORIENTATION_VERTICAL</property>
-                    <property name="toolbar_style">GTK_TOOLBAR_ICONS</property>
-                    <property name="show_arrow">False</property>
-                    <property name="icon_size">GTK_ICON_SIZE_SMALL_TOOLBAR</property>
-                    <child>
-                      <widget class="GtkToolButton" id="toolbutton_forward2">
-                        <property name="height_request">94</property>
-                        <property name="visible">True</property>
-                        <property name="sensitive">False</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="stock_id">gtk-go-forward</property>
-                        <signal name="clicked" handler="go_forward2"/>
-                      </widget>
-                      <packing>
-                        <property name="expand">False</property>
-                      </packing>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-              </widget>
-              <packing>
-                <property name="resize">False</property>
-                <property name="shrink">False</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-  </widget>
-</glade-interface>
diff --git a/plugins/AnonymizingBrowser/list_bookmarks.glade b/plugins/AnonymizingBrowser/list_bookmarks.glade
deleted file mode 100755
index be143a971..000000000
--- a/plugins/AnonymizingBrowser/list_bookmarks.glade
+++ /dev/null
@@ -1,597 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.0 on Sat Dec 22 01:05:23 2007 -->
-<glade-interface>
-  <widget class="GtkDialog" id="list_bookmarks_dialog">
-    <property name="width_request">425</property>
-    <property name="height_request">250</property>
-    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-    <property name="border_width">5</property>
-    <property name="title" translatable="yes">Edit Bookmarks</property>
-    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
-    <property name="default_width">400</property>
-    <property name="destroy_with_parent">True</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-    <property name="has_separator">False</property>
-    <signal name="close" handler="quit"/>
-    <signal name="destroy" handler="quit"/>
-    <signal name="delete_event" handler="quit"/>
-    <signal name="destroy_event" handler="quit"/>
-    <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-vbox1">
-        <property name="visible">True</property>
-        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-        <property name="spacing">2</property>
-        <child>
-          <widget class="GtkVBox" id="vbox3">
-            <property name="visible">True</property>
-            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <property name="spacing">5</property>
-            <child>
-              <widget class="GtkHBox" id="hbox5">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="spacing">10</property>
-                <child>
-                  <widget class="GtkImage" id="image3">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="stock">gtk-edit</property>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkLabel" id="label3">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="xalign">0.05000000074505806</property>
-                    <property name="ypad">10</property>
-                    <property name="label" translatable="yes">&lt;big&gt;&lt;b&gt;Edit Bookmarks&lt;/b&gt;&lt;/big&gt;</property>
-                    <property name="use_markup">True</property>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkHBox" id="hbox6">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="spacing">5</property>
-                <child>
-                  <widget class="GtkScrolledWindow" id="scrolledwindow3">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                    <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-                    <property name="shadow_type">GTK_SHADOW_IN</property>
-                    <child>
-                      <widget class="GtkTreeView" id="bookmarks_treeview">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                      </widget>
-                    </child>
-                  </widget>
-                </child>
-                <child>
-                  <widget class="GtkVButtonBox" id="vbuttonbox3">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="spacing">1</property>
-                    <property name="layout_style">GTK_BUTTONBOX_CENTER</property>
-                    <child>
-                      <widget class="GtkButton" id="button_add">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="label" translatable="yes">gtk-add</property>
-                        <property name="use_stock">True</property>
-                        <property name="response_id">0</property>
-                        <signal name="clicked" handler="on_button_add_clicked"/>
-                      </widget>
-                    </child>
-                    <child>
-                      <widget class="GtkButton" id="button1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="label" translatable="yes">gtk-edit</property>
-                        <property name="use_stock">True</property>
-                        <property name="response_id">0</property>
-                        <signal name="clicked" handler="on_button_edit_clicked"/>
-                      </widget>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkButton" id="button_remove">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="label" translatable="yes">gtk-remove</property>
-                        <property name="use_stock">True</property>
-                        <property name="response_id">0</property>
-                        <signal name="clicked" handler="on_button_remove_clicked"/>
-                      </widget>
-                      <packing>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </widget>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-action_area1">
-            <property name="visible">True</property>
-            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <property name="layout_style">GTK_BUTTONBOX_END</property>
-            <child>
-              <widget class="GtkButton" id="button_cancel">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="label" translatable="yes">gtk-cancel</property>
-                <property name="use_stock">True</property>
-                <property name="response_id">0</property>
-                <signal name="clicked" handler="on_button_cancel_clicked"/>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkButton" id="button_ok">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="label" translatable="yes">gtk-ok</property>
-                <property name="use_stock">True</property>
-                <property name="response_id">0</property>
-                <signal name="clicked" handler="on_button_ok_clicked"/>
-              </widget>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="pack_type">GTK_PACK_END</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-  </widget>
-  <widget class="GtkDialog" id="add_bookmark_dialog">
-    <property name="width_request">350</property>
-    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-    <property name="border_width">5</property>
-    <property name="title" translatable="yes">Add Bookmark</property>
-    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
-    <property name="destroy_with_parent">True</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-    <property name="skip_taskbar_hint">True</property>
-    <property name="has_separator">False</property>
-    <signal name="close" handler="on_button_add_cancel_clicked"/>
-    <signal name="delete_event" handler="on_button_add_cancel_clicked"/>
-    <signal name="destroy_event" handler="on_button_add_cancel_clicked"/>
-    <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-vbox2">
-        <property name="visible">True</property>
-        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-        <property name="spacing">2</property>
-        <child>
-          <widget class="GtkVBox" id="vbox1">
-            <property name="visible">True</property>
-            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <property name="spacing">5</property>
-            <child>
-              <widget class="GtkHBox" id="hbox1">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="spacing">5</property>
-                <child>
-                  <widget class="GtkImage" id="image1">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="stock">gtk-add</property>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkLabel" id="label1">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Add Bookmark&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkHSeparator" id="hseparator1">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkVBox" id="vbox2">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <child>
-                  <widget class="GtkTable" id="table1">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="n_rows">2</property>
-                    <property name="n_columns">2</property>
-                    <child>
-                      <widget class="GtkLabel" id="label2">
-                        <property name="visible">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Name:</property>
-                      </widget>
-                      <packing>
-                        <property name="x_options">GTK_FILL</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkLabel" id="label4">
-                        <property name="visible">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">URL:</property>
-                      </widget>
-                      <packing>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
-                        <property name="x_options">GTK_FILL</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkAlignment" id="alignment1">
-                        <property name="visible">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="left_padding">5</property>
-                        <child>
-                          <widget class="GtkEntry" id="entry_add_name">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                          </widget>
-                        </child>
-                      </widget>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkAlignment" id="alignment2">
-                        <property name="visible">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="left_padding">5</property>
-                        <child>
-                          <widget class="GtkEntry" id="entry_add_url">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                          </widget>
-                        </child>
-                      </widget>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
-                      </packing>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-              </widget>
-              <packing>
-                <property name="position">2</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-action_area2">
-            <property name="visible">True</property>
-            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <property name="layout_style">GTK_BUTTONBOX_END</property>
-            <child>
-              <widget class="GtkButton" id="button_add_cancel">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="label" translatable="yes">gtk-cancel</property>
-                <property name="use_stock">True</property>
-                <property name="response_id">0</property>
-                <signal name="clicked" handler="on_button_add_cancel_clicked"/>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkButton" id="button_add_ok">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="has_default">True</property>
-                <property name="receives_default">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="label" translatable="yes">gtk-ok</property>
-                <property name="use_stock">True</property>
-                <property name="response_id">0</property>
-                <signal name="clicked" handler="on_button_add_ok_clicked"/>
-              </widget>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="pack_type">GTK_PACK_END</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-  </widget>
-  <widget class="GtkDialog" id="edit_bookmark_dialog">
-    <property name="width_request">350</property>
-    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-    <property name="border_width">5</property>
-    <property name="title" translatable="yes">Add Bookmark</property>
-    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
-    <property name="destroy_with_parent">True</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-    <property name="skip_taskbar_hint">True</property>
-    <property name="has_separator">False</property>
-    <signal name="close" handler="on_button_edit_cancel_clicked"/>
-    <signal name="delete_event" handler="on_button_edit_cancel_clicked"/>
-    <signal name="destroy_event" handler="on_button_edit_cancel_clicked"/>
-    <child internal-child="vbox">
-      <widget class="GtkVBox" id="dialog-vbox6">
-        <property name="visible">True</property>
-        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-        <property name="spacing">2</property>
-        <child>
-          <widget class="GtkVBox" id="vbox8">
-            <property name="visible">True</property>
-            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <property name="spacing">5</property>
-            <child>
-              <widget class="GtkHBox" id="hbox4">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="spacing">5</property>
-                <child>
-                  <widget class="GtkImage" id="image5">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="stock">gtk-edit</property>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <widget class="GtkLabel" id="label11">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Edit Bookmark&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkHSeparator" id="hseparator4">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkVBox" id="vbox9">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <child>
-                  <widget class="GtkTable" id="table4">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="n_rows">2</property>
-                    <property name="n_columns">2</property>
-                    <child>
-                      <widget class="GtkLabel" id="label13">
-                        <property name="visible">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Name:</property>
-                      </widget>
-                      <packing>
-                        <property name="x_options">GTK_FILL</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkLabel" id="label12">
-                        <property name="visible">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">URL:</property>
-                      </widget>
-                      <packing>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
-                        <property name="x_options">GTK_FILL</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkAlignment" id="alignment8">
-                        <property name="visible">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="left_padding">5</property>
-                        <child>
-                          <widget class="GtkEntry" id="entry_edit_name">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                          </widget>
-                        </child>
-                      </widget>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkAlignment" id="alignment7">
-                        <property name="visible">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="left_padding">5</property>
-                        <child>
-                          <widget class="GtkEntry" id="entry_edit_url">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                          </widget>
-                        </child>
-                      </widget>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
-                      </packing>
-                    </child>
-                  </widget>
-                  <packing>
-                    <property name="expand">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-              </widget>
-              <packing>
-                <property name="position">2</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child internal-child="action_area">
-          <widget class="GtkHButtonBox" id="dialog-action_area6">
-            <property name="visible">True</property>
-            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <property name="layout_style">GTK_BUTTONBOX_END</property>
-            <child>
-              <widget class="GtkButton" id="button_edit_cancel">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="label" translatable="yes">gtk-cancel</property>
-                <property name="use_stock">True</property>
-                <property name="response_id">0</property>
-                <signal name="clicked" handler="on_button_edit_cancel_clicked"/>
-              </widget>
-            </child>
-            <child>
-              <widget class="GtkButton" id="button_edit_ok">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="has_default">True</property>
-                <property name="receives_default">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="label" translatable="yes">gtk-ok</property>
-                <property name="use_stock">True</property>
-                <property name="response_id">0</property>
-                <signal name="clicked" handler="on_button_edit_ok_clicked"/>
-              </widget>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="pack_type">GTK_PACK_END</property>
-          </packing>
-        </child>
-      </widget>
-    </child>
-  </widget>
-</glade-interface>