diff options
| author | Hans Petter <hansp@src.gnome.org> | 2003-09-12 06:04:44 +0800 |
|---|---|---|
| committer | Hans Petter <hansp@src.gnome.org> | 2003-09-12 06:04:44 +0800 |
| commit | 697761cc337aa77a47140c8df50ed84bc25e23f6 (patch) | |
| tree | b785830f72e9938cceaa016a419c7b6d9892bada /libical/src/libicalss/icalmessage.c | |
| parent | 733d77e657516f9a59b5c1a7b62acb87b03ec86f (diff) | |
| download | gsoc2013-evolution-697761cc337aa77a47140c8df50ed84bc25e23f6.tar gsoc2013-evolution-697761cc337aa77a47140c8df50ed84bc25e23f6.tar.gz gsoc2013-evolution-697761cc337aa77a47140c8df50ed84bc25e23f6.tar.bz2 gsoc2013-evolution-697761cc337aa77a47140c8df50ed84bc25e23f6.tar.lz gsoc2013-evolution-697761cc337aa77a47140c8df50ed84bc25e23f6.tar.xz gsoc2013-evolution-697761cc337aa77a47140c8df50ed84bc25e23f6.tar.zst gsoc2013-evolution-697761cc337aa77a47140c8df50ed84bc25e23f6.zip | |
Import new libical from mainline HEAD and make appropriate changes to
Evolution.
svn path=/trunk/; revision=22538
Diffstat (limited to 'libical/src/libicalss/icalmessage.c')
| -rw-r--r-- | libical/src/libicalss/icalmessage.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/libical/src/libicalss/icalmessage.c b/libical/src/libicalss/icalmessage.c index e1e8d8015c..731a2c7cfc 100644 --- a/libical/src/libicalss/icalmessage.c +++ b/libical/src/libicalss/icalmessage.c @@ -40,7 +40,7 @@ icalcomponent* icalmessage_get_inner(icalcomponent* comp) } } -char* lowercase(const char* str) +static char* lowercase(const char* str) { char* p = 0; char* n = icalmemory_strdup(str); @@ -158,8 +158,13 @@ icalcomponent *icalmessage_new_reply_base(icalcomponent* c, icalcomponent_add_property(reply,icalproperty_new_version("2.0")); +#ifndef WIN32 sprintf(tmp, "-//SoftwareStudio//NONSGML %s %s //EN",PACKAGE,VERSION); +#else + sprintf(tmp, + "-//SoftwareStudio//NONSGML %s %s //EN",ICAL_PACKAGE,ICAL_VERSION); +#endif icalcomponent_add_property(reply,icalproperty_new_prodid(tmp)); return reply; @@ -230,11 +235,11 @@ icalcomponent* icalmessage_new_counterpropose_reply(icalcomponent* oldc, icalerror_check_arg_rz(oldc,"oldc"); icalerror_check_arg_rz(newc,"newc"); - reply = icalcomponent_new_clone(newc); + reply = icalmessage_new_reply_base(newc,user,msg); icalcomponent_set_method(reply,ICAL_METHOD_COUNTER); - return newc; + return reply; } @@ -353,10 +358,7 @@ icalcomponent* icalmessage_new_error_reply(icalcomponent* c, rs.debug = debug; icalcomponent_add_property(inner, - icalproperty_new_requeststatus( - icalreqstattype_as_string(rs) - ) - ); + icalproperty_new_requeststatus(rs)); } else { /* code == ICAL_UNKNOWN_STATUS */ /* Copy all of the request status properties */ |