diff options
| author | Michael Meeks <michael@helixcode.com> | 2000-10-15 02:18:28 +0800 |
|---|---|---|
| committer | Michael Meeks <mmeeks@src.gnome.org> | 2000-10-15 02:18:28 +0800 |
| commit | b394895eb670571fb5b235b45f8b0546f087c1c8 (patch) | |
| tree | 00c3f39ca3c99500c41386246b119a1e18107f1f | |
| parent | 6ac35c0e50d43858eef8f7ffba2b9b996db9f636 (diff) | |
| download | gsoc2013-evolution-b394895eb670571fb5b235b45f8b0546f087c1c8.tar.gz gsoc2013-evolution-b394895eb670571fb5b235b45f8b0546f087c1c8.tar.zst gsoc2013-evolution-b394895eb670571fb5b235b45f8b0546f087c1c8.zip | |
if we are in LDAP mode then merge in the extra few items, otherwise just
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.
* shell/e-shell-view-menu.c: rename debug verb.
svn path=/trunk/; revision=5920
| -rw-r--r-- | addressbook/ChangeLog | 6 | ||||
| -rw-r--r-- | addressbook/gui/component/addressbook.c | 7 | ||||
| -rw-r--r-- | 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 <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); 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); } |