diff options
| -rw-r--r-- | addressbook/ChangeLog | 7 | ||||
| -rw-r--r-- | addressbook/backend/ebook/test-card.c | 47 | ||||
| -rw-r--r-- | addressbook/backend/ebook/test-client.c | 35 |
3 files changed, 35 insertions, 54 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 928468ad2f..0717f37798 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,10 @@ +2002-08-06 Dan Winship <danw@ximian.com> + + * backend/ebook/test-client.c (TEST_VCARD): Use "\r" rather than + including literal CRs in the string, which confuses gcc on OS X. + + * backend/ebook/test-card.c (TEST_VCARD): Likewise. + 2002-08-01 Chris Toshok <toshok@ximian.com> [ fixes bug #25958 ] diff --git a/addressbook/backend/ebook/test-card.c b/addressbook/backend/ebook/test-card.c index b17dc62174..d625214bfd 100644 --- a/addressbook/backend/ebook/test-card.c +++ b/addressbook/backend/ebook/test-card.c @@ -3,37 +3,22 @@ #include <libgnomeui/gnome-init.h> #include "e-card.h" -#define TEST_VCARD \ -"BEGIN:VCARD -" \ -"FN:Nat -" \ -"N:Friedman;Nat;D;Mr. -" \ -"ORG:Ximian, Inc. -" \ -"TITLE:Head Geek -" \ -"ROLE:Programmer/Executive -" \ -"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 -" \ -" -" +#define TEST_VCARD \ +"BEGIN:VCARD\r\n" \ +"FN:Nat\r\n" \ +"N:Friedman;Nat;D;Mr.\r\n" \ +"ORG:Ximian, Inc.\r\n" \ +"TITLE:Head Geek\r\n" \ +"ROLE:Programmer/Executive\r\n" \ +"BDAY:1977-08-06\r\n" \ +"TEL;WORK:617 679 1984\r\n" \ +"TEL;CELL:123 456 7890\r\n" \ +"EMAIL;INTERNET:nat@nat.org\r\n" \ +"EMAIL;INTERNET:nat@ximian.com\r\n" \ +"ADR;WORK;POSTAL:P.O. Box 101;;;Any Town;CA;91921-1234;\r\n" \ +"ADR;HOME;POSTAL;INTL:P.O. Box 202;;;Any Town 2;MI;12344-4321;USA\r\n" \ +"END:VCARD\r\n" \ +"\r\n" static char * read_file (char *name) diff --git a/addressbook/backend/ebook/test-client.c b/addressbook/backend/ebook/test-client.c index 04f2c5b0e3..300f25958b 100644 --- a/addressbook/backend/ebook/test-client.c +++ b/addressbook/backend/ebook/test-client.c @@ -11,29 +11,18 @@ #include "e-book.h" #include "e-book-util.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; -" \ -"END:VCARD -" \ -" -" +#define TEST_VCARD \ +"BEGIN:VCARD\r\n" \ +"FN:Nat\r\n" \ +"N:Friedman;Nat;D;Mr.\r\n" \ +"BDAY:1977-08-06\r\n" \ +"TEL;WORK:617 679 1984\r\n" \ +"TEL;CELL:123 456 7890\r\n" \ +"EMAIL;INTERNET:nat@nat.org\r\n" \ +"EMAIL;INTERNET:nat@ximian.com\r\n" \ +"ADR;WORK;POSTAL:P.O. Box 101;;;Any Town;CA;91921-1234;\r\n" \ +"END:VCARD\r\n" \ +"\r\n" static CORBA_Environment ev; static char *cardstr; |