aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook
diff options
context:
space:
mode:
Diffstat (limited to 'addressbook')
-rw-r--r--addressbook/ChangeLog6
-rw-r--r--addressbook/gui/component/addressbook.c7
2 files changed, 10 insertions, 3 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 <michael@helixcode.com>
+
+ * 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 <ettore@helixcode.com>
* 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);