diff options
Diffstat (limited to 'addressbook')
| -rw-r--r-- | addressbook/ChangeLog | 6 | ||||
| -rw-r--r-- | addressbook/contact-editor/e-contact-editor.c | 16 | ||||
| -rw-r--r-- | addressbook/gui/component/addressbook.c | 18 | ||||
| -rw-r--r-- | addressbook/gui/contact-editor/e-contact-editor.c | 16 |
4 files changed, 20 insertions, 36 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 58ebc73c11..0c1302fdeb 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,9 @@ +2000-09-22 Michael Meeks <michael@helixcode.com> + + * gui/component/addressbook.c (control_activate): update. + + * contact-editor/e-contact-editor.c (create_ui): upd. + 2000-09-22 Chris Toshok <toshok@helixcode.com> * backend/pas/pas-backend-ldap.c: lots of changes. flesh out the diff --git a/addressbook/contact-editor/e-contact-editor.c b/addressbook/contact-editor/e-contact-editor.c index 07c4bf9dc3..42782fc549 100644 --- a/addressbook/contact-editor/e-contact-editor.c +++ b/addressbook/contact-editor/e-contact-editor.c @@ -739,7 +739,7 @@ static void create_ui (EContactEditor *ce) { char *fname; - xmlNode *ui; + BonoboUINode *ui; BonoboUIComponent *component; Bonobo_UIContainer container; @@ -748,17 +748,11 @@ create_ui (EContactEditor *ce) bonobo_ui_component_add_verb_list_with_data ( component, verbs, ce); - - fname = bonobo_ui_util_get_ui_fname ( - EVOLUTION_DATADIR, "evolution-contact-editor.xml"); - g_warning ("Attempting ui load from '%s'", fname); - - ui = bonobo_ui_util_new_ui (component, fname, "evolution-contact-editor"); - - bonobo_ui_component_set_tree (component, container, "/", ui, NULL); - g_free (fname); - xmlFreeNode (ui); + bonobo_ui_util_set_ui (component, container, + EVOLUTION_DATADIR, + "evolution-contact-editor.xml", + "evolution-contact-editor"); } /* Callback used when the dialog box is destroyed */ diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c index a632c61ead..1c0aa4ada7 100644 --- a/addressbook/gui/component/addressbook.c +++ b/addressbook/gui/component/addressbook.c @@ -345,8 +345,6 @@ control_activate (BonoboControl *control, BonoboUIHandler *uih, AddressbookView *view) { Bonobo_UIContainer remote_uih; - char *fname; - xmlNode *ui; Bonobo_UIContainer container; BonoboUIComponent *component; GtkWidget *quick_search_widget; @@ -366,21 +364,13 @@ control_activate (BonoboControl *control, BonoboUIHandler *uih, bonobo_ui_container_freeze (container, NULL); + bonobo_ui_util_set_ui (component, container, EVOLUTION_DATADIR, #ifdef HAVE_LDAP - fname = bonobo_ui_util_get_ui_fname ( - EVOLUTION_DATADIR, "evolution-addressbook-ldap.xml"); + "evolution-addressbook-ldap.xml", #else - fname = bonobo_ui_util_get_ui_fname ( - EVOLUTION_DATADIR, "evolution-addressbook.xml"); + "evolution-addressbook.xml", #endif - g_warning ("Attempting ui load from '%s'", fname); - - ui = bonobo_ui_util_new_ui (component, fname, "evolution-addressbook"); - - bonobo_ui_component_set_tree (component, container, "/", ui, NULL); - - g_free (fname); - xmlFreeNode (ui); + "evolution-addressbook"); quick_search_widget = make_quick_search_widget ( search_entry_activated, view); diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index 07c4bf9dc3..42782fc549 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -739,7 +739,7 @@ static void create_ui (EContactEditor *ce) { char *fname; - xmlNode *ui; + BonoboUINode *ui; BonoboUIComponent *component; Bonobo_UIContainer container; @@ -748,17 +748,11 @@ create_ui (EContactEditor *ce) bonobo_ui_component_add_verb_list_with_data ( component, verbs, ce); - - fname = bonobo_ui_util_get_ui_fname ( - EVOLUTION_DATADIR, "evolution-contact-editor.xml"); - g_warning ("Attempting ui load from '%s'", fname); - - ui = bonobo_ui_util_new_ui (component, fname, "evolution-contact-editor"); - - bonobo_ui_component_set_tree (component, container, "/", ui, NULL); - g_free (fname); - xmlFreeNode (ui); + bonobo_ui_util_set_ui (component, container, + EVOLUTION_DATADIR, + "evolution-contact-editor.xml", + "evolution-contact-editor"); } /* Callback used when the dialog box is destroyed */ |