diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-07-01 22:47:10 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-07-01 22:47:10 +0800 |
| commit | 1351c8e4fb443a9705bb1225c3c574c05a36f8ca (patch) | |
| tree | e049bafefac361ae66dfa43abdb956f1f3a730e0 /addressbook | |
| parent | 624f48121f523101fe26c3d3a8b51a4eeda90990 (diff) | |
| parent | 42e75c9162402078ac629740821c3533925ee342 (diff) | |
| download | gsoc2013-evolution-1351c8e4fb443a9705bb1225c3c574c05a36f8ca.tar gsoc2013-evolution-1351c8e4fb443a9705bb1225c3c574c05a36f8ca.tar.gz gsoc2013-evolution-1351c8e4fb443a9705bb1225c3c574c05a36f8ca.tar.bz2 gsoc2013-evolution-1351c8e4fb443a9705bb1225c3c574c05a36f8ca.tar.lz gsoc2013-evolution-1351c8e4fb443a9705bb1225c3c574c05a36f8ca.tar.xz gsoc2013-evolution-1351c8e4fb443a9705bb1225c3c574c05a36f8ca.tar.zst gsoc2013-evolution-1351c8e4fb443a9705bb1225c3c574c05a36f8ca.zip | |
Merge branch 'master' into kill-bonobo
Diffstat (limited to 'addressbook')
| -rw-r--r-- | addressbook/gui/contact-editor/Makefile.am | 4 | ||||
| -rw-r--r-- | addressbook/gui/contact-editor/test-editor.c | 23 | ||||
| -rw-r--r-- | addressbook/gui/contact-list-editor/Makefile.am | 4 |
3 files changed, 19 insertions, 12 deletions
diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am index ccd40deebb..29ddb6ee9c 100644 --- a/addressbook/gui/contact-editor/Makefile.am +++ b/addressbook/gui/contact-editor/Makefile.am @@ -1,3 +1,7 @@ +if OS_WIN32 +WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libevolution-addressbook.la +endif + AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ diff --git a/addressbook/gui/contact-editor/test-editor.c b/addressbook/gui/contact-editor/test-editor.c index 751bab4203..d6f77c3261 100644 --- a/addressbook/gui/contact-editor/test-editor.c +++ b/addressbook/gui/contact-editor/test-editor.c @@ -29,18 +29,17 @@ #include "ebook/e-card.h" #define TEST_VCARD \ -"BEGIN:VCARD" \ -"FN:Nat" \ -"N:Friedman;Nat;D;Mr." \ -"BDAY:1977-08-06" \ -"TEL;WORK:617 679 1984" \ -"TEL;CELL:123 456 7890" \ -"EMAIL;INTERNET:nat@nat.org" \ -"EMAIL;INTERNET:nat@ximian.com" \ -"ADR;WORK;POSTAL:P.O. Box 101;;;Any Town;CA;91921-1234;" \ -"ADR;HOME;POSTAL;INTL:P.O. Box 202;;;Any Town 2;MI;12344-4321;USA" \ -"END:VCARD" \ -"" +"BEGIN:VCARD\n" \ +"FN:Nat\n" \ +"N:Friedman;Nat;D;Mr.\n" \ +"BDAY:1977-08-06\n" \ +"TEL;WORK:617 679 1984\n" \ +"TEL;CELL:123 456 7890\n" \ +"EMAIL;INTERNET:nat@nat.org\n" \ +"EMAIL;INTERNET:nat@ximian.com\n" \ +"ADR;WORK;POSTAL:P.O. Box 101;;;Any Town;CA;91921-1234;\n" \ +"ADR;HOME;POSTAL;INTL:P.O. Box 202;;;Any Town 2;MI;12344-4321;USA\n" \ +"END:VCARD\n" static gchar * read_file (gchar *name) diff --git a/addressbook/gui/contact-list-editor/Makefile.am b/addressbook/gui/contact-list-editor/Makefile.am index 491c1ba62b..608707395d 100644 --- a/addressbook/gui/contact-list-editor/Makefile.am +++ b/addressbook/gui/contact-list-editor/Makefile.am @@ -1,3 +1,7 @@ +if OS_WIN32 +WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libevolution-addressbook.la +endif + AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ |