callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use "\r" rather than including literal CRs in the string, which confuses

Browse Source 
* 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.

svn path=/trunk/; revision=17722
This commit is contained in:
Dan Winship
2002-08-07 02:15:40 +00:00
parent 47a7a91181
commit 6916d03ad6
3 changed files with 35 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
addressbook/ChangeLog
View File

@ -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 ]

47
addressbook/backend/ebook/test-card.c
View File

@ -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)

35
addressbook/backend/ebook/test-client.c
View File

@ -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;