From 6e7f6fbe973a6a13b3f954053373f5edf71d5e3b Mon Sep 17 00:00:00 2001
From: Gary Martin <gary@garycmartin.com>
Date: Mon, 07 Sep 2009 02:08:42 +0000
Subject: Migrated search ToolbarButton content into the Edit ToolbarButton (feedback from Eben).

---
(limited to 'AbiWordActivity.py')

diff --git a/AbiWordActivity.py b/AbiWordActivity.py
index 419d885..eec6606 100644
--- a/AbiWordActivity.py
+++ b/AbiWordActivity.py
@@ -69,7 +69,7 @@ class AbiWordActivity (activity.Activity):
         toolbar_box.toolbar.insert(activity_button, 0)
 
         edit_toolbar = ToolbarButton()
-        edit_toolbar.props.page = EditToolbar(self)
+        edit_toolbar.props.page = EditToolbar(self, toolbar_box)
         edit_toolbar.props.icon_name = 'toolbar-edit'
         edit_toolbar.props.label = _('Edit')
         toolbar_box.toolbar.insert(edit_toolbar, -1)
@@ -98,13 +98,6 @@ class AbiWordActivity (activity.Activity):
         insert_toolbar.props.label = _('Insert')
         toolbar_box.toolbar.insert(insert_toolbar, -1)
 
-        search_toolbar = ToolbarButton()
-        search_toolbar.props.page = SearchToolbar(self.abiword_canvas,
-                toolbar_box)
-        search_toolbar.props.icon_name = 'search-bar'
-        search_toolbar.props.label = _('Search')
-        toolbar_box.toolbar.insert(search_toolbar, -1)
-
         separator = gtk.SeparatorToolItem()
         toolbar_box.toolbar.insert(separator, -1)
 
--
cgit v0.9.1