From f2a3913ffe7df8a38d38a1127cb26d64ac3509b2 Mon Sep 17 00:00:00 2001 From: Kjartan Maraas Date: Wed, 9 Oct 2002 23:03:04 +0000 Subject: =?UTF-8?q?[=C2=A0Fix=20#7094,=20#7064,=20#7095,=20#31944,=20#3194?= =?UTF-8?q?5=20]=20Hook=20up=20new=20etspec=20file.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2002-10-10 Kjartan Maraas [ Fix #7094, #7064, #7095, #31944, #31945 ] * gui/component/Makefile.am: Hook up new etspec file. * gui/component/addressbook-config.c: Remove ETable spec. * gui/component/addressbook-config.etspec: New file. * gui/component/ldap-config.glade: Fix typo. * gui/component/select-names/e-select-names.c: Remove inline spec. * gui/component/select-names/e-select-names.etspec: New file. * gui/contact-list-editor/Makefile.am: Hook up etspec. * gui/contact-list-editor/e-contact-list-editor.c: Remove inline spec. * gui/contact-list-editor/e-contact-list-editor.etspec: New file. * gui/widgets/Makefile.am: Hook up new spec. * gui/widgets/e-addressbook-view.c: Remove inline spec. * gui/widgets/e-addressbook-view.etspec: New file. svn path=/trunk/; revision=18361 --- addressbook/gui/component/select-names/Makefile.am | 7 +++++-- .../gui/component/select-names/e-select-names.c | 23 ++++------------------ .../component/select-names/e-select-names.etspec | 7 +++++++ 3 files changed, 16 insertions(+), 21 deletions(-) create mode 100644 addressbook/gui/component/select-names/e-select-names.etspec (limited to 'addressbook/gui/component/select-names') diff --git a/addressbook/gui/component/select-names/Makefile.am b/addressbook/gui/component/select-names/Makefile.am index 1b49d29068..b417f18678 100644 --- a/addressbook/gui/component/select-names/Makefile.am +++ b/addressbook/gui/component/select-names/Makefile.am @@ -39,6 +39,7 @@ INCLUDES = \ -I$(top_srcdir)/addressbook/backend \ -I$(top_builddir)/addressbook/backend \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ + -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \ -DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" \ -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ -DCAMEL_PROVIDERDIR=\""$(providerdir)"\" \ @@ -72,13 +73,15 @@ libeselectnames_la_SOURCES = \ gladedir = $(datadir)/evolution/glade glade_DATA = select-names.glade - +etspecdir = $(datadir)/evolution/etspec +etspec_DATA = e-select-names.etspec EXTRA_DIST = \ $(glade_DATA) \ $(oaf_in_files) \ $(oaf_DATA) \ - $(idl_DATA) + $(idl_DATA) \ + $(etspec_DATA) BUILT_SOURCES = $(IDL_GENERATED) CLEANFILES = $(BUILT_SOURCES) diff --git a/addressbook/gui/component/select-names/e-select-names.c b/addressbook/gui/component/select-names/e-select-names.c index 24c977a433..e1251fe0f6 100644 --- a/addressbook/gui/component/select-names/e-select-names.c +++ b/addressbook/gui/component/select-names/e-select-names.c @@ -114,22 +114,6 @@ e_select_names_class_init (ESelectNamesClass *klass) object_class->destroy = e_select_names_destroy; } -#define SPEC " \ - \ - \ - \ - \ - \ -" - -#define SPEC2 " \ - \ - \ - \ - \ - \ -" - GtkWidget *e_addressbook_create_ebook_table(char *name, char *string1, char *string2, int num1, int num2); GtkWidget *e_addressbook_create_folder_selector(char *name, char *string1, char *string2, int num1, int num2); @@ -332,9 +316,10 @@ e_addressbook_create_ebook_table(char *name, char *string1, char *string2, int n esn_free_duped_key_fn, model); - spec = g_strdup_printf(SPEC, E_CARD_SIMPLE_FIELD_NAME_OR_ORG); - table = e_table_scrolled_new (without, NULL, spec, NULL); - g_free(spec); + table = e_table_scrolled_new_from_spec_file (without, + NULL, + EVOLUTION_ETSPECDIR "/e-select-names.etspec", + NULL); gtk_object_set_data(GTK_OBJECT(table), "adapter", adapter); gtk_object_set_data(GTK_OBJECT(table), "without", without); diff --git a/addressbook/gui/component/select-names/e-select-names.etspec b/addressbook/gui/component/select-names/e-select-names.etspec new file mode 100644 index 0000000000..3553ca90bf --- /dev/null +++ b/addressbook/gui/component/select-names/e-select-names.etspec @@ -0,0 +1,7 @@ + + + + + + + -- cgit v1.2.3