aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--addressbook/ChangeLog8
-rw-r--r--addressbook/backend/pas/Makefile.am3
-rw-r--r--addressbook/gui/component/select-names/e-select-names-manager.c1
-rw-r--r--addressbook/gui/search/Makefile.am3
-rw-r--r--addressbook/printing/Makefile.am3
5 files changed, 15 insertions, 3 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 0ba837da6d..77e4776a11 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,11 @@
+2000-10-27 Christopher James Lahey <clahey@helixcode.com>
+
+ * backend/pas/Makefile.am, gui/search/Makefile.am,
+ printing/Makefile.am: Fixed these to include EXTRA_GNOME_CFLAGS.
+
+ * gui/component/select-names/e-select-names-manager.c: Turned off
+ newlines in header fields.
+
2000-10-26 Michael Meeks <michael@helixcode.com>
* printing/e-contact-print.c (e_contact_print_letter_tab),
diff --git a/addressbook/backend/pas/Makefile.am b/addressbook/backend/pas/Makefile.am
index f0a5f79e11..819f99e57d 100644
--- a/addressbook/backend/pas/Makefile.am
+++ b/addressbook/backend/pas/Makefile.am
@@ -18,7 +18,8 @@ INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/addressbook/backend \
-I$(top_builddir)/addressbook/backend \
- $(BONOBO_GNOME_CFLAGS)
+ $(BONOBO_GNOME_CFLAGS) \
+ $(EXTRA_GNOME_CFLAGS)
LDAP_BACKEND_SOURCES = pas-backend-ldap.c pas-backend-ldap.h
diff --git a/addressbook/gui/component/select-names/e-select-names-manager.c b/addressbook/gui/component/select-names/e-select-names-manager.c
index 55c5ae1608..f93d94b276 100644
--- a/addressbook/gui/component/select-names/e-select-names-manager.c
+++ b/addressbook/gui/component/select-names/e-select-names-manager.c
@@ -266,6 +266,7 @@ GtkWidget *e_select_names_manager_create_entry (
"model", model,
"editable", TRUE,
"use_ellipsis", TRUE,
+ "allow_newlines", FALSE,
NULL);
gtk_signal_connect(GTK_OBJECT(eentry), "destroy",
GTK_SIGNAL_FUNC(entry_destroyed), manager);
diff --git a/addressbook/gui/search/Makefile.am b/addressbook/gui/search/Makefile.am
index c4b23523fe..d932aaac77 100644
--- a/addressbook/gui/search/Makefile.am
+++ b/addressbook/gui/search/Makefile.am
@@ -12,7 +12,8 @@ INCLUDES = \
-I$(top_srcdir)/widgets/e-text \
-I$(top_srcdir)/widgets/misc \
-DSEARCH_RULE_DIR=\"$(ruledir)\" \
- $(BONOBO_GNOME_CFLAGS)
+ $(BONOBO_GNOME_CFLAGS) \
+ $(EXTRA_GNOME_CFLAGS)
noinst_LIBRARIES = \
libeaddressbooksearch.a
diff --git a/addressbook/printing/Makefile.am b/addressbook/printing/Makefile.am
index 4009415773..c020aac676 100644
--- a/addressbook/printing/Makefile.am
+++ b/addressbook/printing/Makefile.am
@@ -19,7 +19,8 @@ INCLUDES = \
-DEVOLUTION_ECPSDIR=\""$(ecpsdir)"\" \
-DDATADIR=\""$(datadir)"\" \
$(GNOME_PRINT_CFLAGS) \
- $(BONOBO_GNOME_CFLAGS)
+ $(BONOBO_GNOME_CFLAGS) \
+ $(EXTRA_GNOME_CFLAGS)
noinst_LIBRARIES = \
libecontactprint.a