aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--addressbook/ChangeLog5
-rw-r--r--addressbook/gui/component/addressbook.c13
2 files changed, 15 insertions, 3 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 03001f30dc..5f86fa875b 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,8 @@
+2000-08-22 Christopher James Lahey <clahey@helixcode.com>
+
+ * gui/component/addressbook.c: Linked in the search dialog again.
+ It looks like some changes in the shell made this not work.
+
2000-08-19 Christopher James Lahey <clahey@helixcode.com>
* conduit/address-conduit.c, conduit/address-conduit.h: Changed
diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c
index 6a997cd2a4..9c0213edd8 100644
--- a/addressbook/gui/component/addressbook.c
+++ b/addressbook/gui/component/addressbook.c
@@ -86,7 +86,8 @@ control_deactivate (BonoboControl *control, BonoboUIHandler *uih)
#ifdef HAVE_LDAP
bonobo_ui_handler_menu_remove (uih, "/Actions/New Directory Server");
#endif
- bonobo_ui_handler_menu_remove (uih, "/Tools/Search");
+ bonobo_ui_handler_menu_remove (uih, "/<Component Placeholder>/Tools");
+ bonobo_ui_handler_menu_remove (uih, "/<Component Placeholder>/Tools/Search");
/* remove our toolbar */
bonobo_ui_handler_dock_remove (uih, "/Toolbar");
}
@@ -540,8 +541,14 @@ control_activate (BonoboControl *control, BonoboUIHandler *uih,
(gpointer)view);
#endif
- bonobo_ui_handler_menu_new_item (uih, "/Tools/Search",
- N_("_Search for contacts"),
+ bonobo_ui_handler_menu_new_subtree (uih, "/<Component Placeholder>/Tools",
+ _("_Tools"),
+ NULL, -1,
+ BONOBO_UI_HANDLER_PIXMAP_NONE, NULL,
+ 0, 0);
+
+ bonobo_ui_handler_menu_new_item (uih, "/<Component Placeholder>/Tools/Search",
+ N_("_Search for contacts"),
NULL, -1,
BONOBO_UI_HANDLER_PIXMAP_STOCK, GNOME_STOCK_MENU_SEARCH,
0, 0, search_cb,