diff options
Diffstat (limited to 'addressbook')
| -rw-r--r-- | addressbook/ChangeLog | 11 | ||||
| -rw-r--r-- | addressbook/gui/component/Makefile.am | 1 | ||||
| -rw-r--r-- | addressbook/gui/component/select-names/e-select-names.c | 4 | ||||
| -rw-r--r-- | addressbook/gui/contact-editor/e-contact-editor.c | 10 |
4 files changed, 14 insertions, 12 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 5121ed4429..4be4b34561 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,14 @@ +2001-07-02 Christopher James Lahey <clahey@ximian.com> + + * gui/component/Makefile.am (evolution_addressbook_LDADD): Added + $(BONOBO_CONF_LIBS). + + * gui/component/select-names/e-select-names.c + (e_select_names_create_categories), + gui/contact-editor/e-contact-editor.c (categories_clicked): + Switched to an ECategoriesMasterListWombat instead of an + ECategoriesMasterListArray here. + 2001-07-02 Peter Williams <peterw@ximian.com> * gui/contact-editor/Makefile.am (INCLUDES): srcdir != diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am index d58c768328..898a415747 100644 --- a/addressbook/gui/component/Makefile.am +++ b/addressbook/gui/component/Makefile.am @@ -47,6 +47,7 @@ evolution_addressbook_LDADD = \ $(top_builddir)/shell/libeshell.la \ $(EXTRA_GNOME_LIBS) \ $(BONOBO_HTML_GNOME_LIBS) \ + $(BONOBO_CONF_LIBS) \ $(top_builddir)/addressbook/gui/widgets/libeminicard.a \ $(top_builddir)/addressbook/backend/ebook/libebook.la \ $(top_builddir)/e-util/ename/libename.la \ diff --git a/addressbook/gui/component/select-names/e-select-names.c b/addressbook/gui/component/select-names/e-select-names.c index 581c5a635f..efa5a13102 100644 --- a/addressbook/gui/component/select-names/e-select-names.c +++ b/addressbook/gui/component/select-names/e-select-names.c @@ -40,7 +40,7 @@ #include <addressbook/backend/ebook/e-card-simple.h> #include "e-select-names-table-model.h" #include <gal/widgets/e-categories-master-list-combo.h> -#include <gal/widgets/e-categories-master-list-array.h> +#include <e-util/e-categories-master-list-wombat.h> static void e_select_names_init (ESelectNames *card); static void e_select_names_class_init (ESelectNamesClass *klass); @@ -431,7 +431,7 @@ e_select_names_create_categories (gchar *name, ECategoriesMasterList *ecml; GtkWidget *combo; - ecml = e_categories_master_list_array_new (); + ecml = e_categories_master_list_wombat_new (); combo = e_categories_master_list_combo_new (ecml); gtk_object_unref (GTK_OBJECT (ecml)); diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c index 5781ffcc65..2b9c22a249 100644 --- a/addressbook/gui/contact-editor/e-contact-editor.c +++ b/addressbook/gui/contact-editor/e-contact-editor.c @@ -39,9 +39,7 @@ #include <gal/widgets/e-unicode.h> #include <gal/e-text/e-entry.h> -#if 0 #include <e-util/e-categories-master-list-wombat.h> -#endif #include "addressbook/printing/e-contact-print.h" #include "addressbook/printing/e-contact-print-envelope.h" @@ -652,9 +650,7 @@ categories_clicked(GtkWidget *button, EContactEditor *editor) GnomeDialog *dialog; int result; GtkWidget *entry = glade_xml_get_widget(editor->gui, "entry-categories"); -#if 0 ECategoriesMasterList *ecml; -#endif if (entry && GTK_IS_ENTRY(entry)) categories = e_utf8_gtk_entry_get_text(GTK_ENTRY(entry)); else if (editor->card) @@ -662,18 +658,12 @@ categories_clicked(GtkWidget *button, EContactEditor *editor) "categories", &categories, NULL); dialog = GNOME_DIALOG(e_categories_new(categories)); -#if 0 ecml = e_categories_master_list_wombat_new (); -#endif gtk_object_set(GTK_OBJECT(dialog), "header", _("This contact belongs to these categories:"), -#if 0 "ecml", ecml, -#endif NULL); -#if 0 gtk_object_unref (GTK_OBJECT (ecml)); -#endif gtk_widget_show(GTK_WIDGET(dialog)); result = gnome_dialog_run (dialog); g_free (categories); |