From b394895eb670571fb5b235b45f8b0546f087c1c8 Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Sat, 14 Oct 2000 18:18:28 +0000 Subject: if we are in LDAP mode then merge in the extra few items, otherwise just 2000-10-14 Michael Meeks * gui/component/addressbook.c (control_activate): if we are in LDAP mode then merge in the extra few items, otherwise just merge the standard thing; saves duplication. * shell/e-shell-view-menu.c: rename debug verb. svn path=/trunk/; revision=5920 --- addressbook/ChangeLog | 6 ++++++ addressbook/gui/component/addressbook.c | 7 ++++--- shell/e-shell-view-menu.c | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 72bdd25484..50e8296bff 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,9 @@ +2000-10-14 Michael Meeks + + * gui/component/addressbook.c (control_activate): if we are in + LDAP mode then merge in the extra few items, otherwise just merge + the standard thing; saves duplication. + 2000-10-14 Ettore Perazzoli * gui/component/addressbook.oafinfo: Added diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c index 65f4fdca93..51e6e297d3 100644 --- a/addressbook/gui/component/addressbook.c +++ b/addressbook/gui/component/addressbook.c @@ -347,12 +347,13 @@ control_activate (BonoboControl *control, bonobo_ui_component_freeze (uic, NULL); bonobo_ui_util_set_ui (uic, EVOLUTION_DATADIR, + "evolution-addressbook.xml", + "evolution-addressbook"); #ifdef HAVE_LDAP + bonobo_ui_util_set_ui (uic, EVOLUTION_DATADIR, "evolution-addressbook-ldap.xml", -#else - "evolution-addressbook.xml", -#endif "evolution-addressbook"); +#endif quick_search_widget = make_quick_search_widget ( search_entry_activated, view); diff --git a/shell/e-shell-view-menu.c b/shell/e-shell-view-menu.c index 8d943fadd0..e551e8ce3f 100644 --- a/shell/e-shell-view-menu.c +++ b/shell/e-shell-view-menu.c @@ -435,7 +435,7 @@ menu_do_misc (BonoboUIComponent *component, component, "HelpAbout", (BonoboUIVerbFn) command_about_box, shell_view); bonobo_ui_component_add_verb ( - component, "DumpXML", + component, "DebugDumpXml", (BonoboUIVerbFn) command_xml_dump, shell_view); } -- cgit v1.2.3