Diffstat (limited to 'libical/src/libicalss/icalmessage.c') (more/less context) (show whitespace changes)
-rw-r--r-- | libical/src/libicalss/icalmessage.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/libical/src/libicalss/icalmessage.c b/libical/src/libicalss/icalmessage.c index d5c57c1..731a2c7 100644 --- a/libical/src/libicalss/icalmessage.c +++ b/libical/src/libicalss/icalmessage.c | |||
@@ -37,13 +37,13 @@ icalcomponent* icalmessage_get_inner(icalcomponent* comp) | |||
37 | return icalcomponent_get_first_real_component(comp); | 37 | return icalcomponent_get_first_real_component(comp); |
38 | } else { | 38 | } else { |
39 | return comp; | 39 | return comp; |
40 | } | 40 | } |
41 | } | 41 | } |
42 | 42 | ||
43 | char* lowercase(const char* str) | 43 | static char* lowercase(const char* str) |
44 | { | 44 | { |
45 | char* p = 0; | 45 | char* p = 0; |
46 | char* n = icalmemory_strdup(str); | 46 | char* n = icalmemory_strdup(str); |
47 | 47 | ||
48 | if(str ==0){ | 48 | if(str ==0){ |
49 | return 0; | 49 | return 0; |
@@ -155,14 +155,19 @@ icalcomponent *icalmessage_new_reply_base(icalcomponent* c, | |||
155 | icalcomponent_add_property(inner,icalproperty_new_clone(attendee)); | 155 | icalcomponent_add_property(inner,icalproperty_new_clone(attendee)); |
156 | 156 | ||
157 | /* Add PRODID and VERSION */ | 157 | /* Add PRODID and VERSION */ |
158 | 158 | ||
159 | icalcomponent_add_property(reply,icalproperty_new_version("2.0")); | 159 | icalcomponent_add_property(reply,icalproperty_new_version("2.0")); |
160 | 160 | ||
161 | #ifndef WIN32 | ||
161 | sprintf(tmp, | 162 | sprintf(tmp, |
162 | "-//SoftwareStudio//NONSGML %s %s //EN",PACKAGE,VERSION); | 163 | "-//SoftwareStudio//NONSGML %s %s //EN",PACKAGE,VERSION); |
164 | #else | ||
165 | sprintf(tmp, | ||
166 | "-//SoftwareStudio//NONSGML %s %s //EN",ICAL_PACKAGE,ICAL_VERSION); | ||
167 | #endif | ||
163 | icalcomponent_add_property(reply,icalproperty_new_prodid(tmp)); | 168 | icalcomponent_add_property(reply,icalproperty_new_prodid(tmp)); |
164 | 169 | ||
165 | return reply; | 170 | return reply; |
166 | 171 | ||
167 | } | 172 | } |
168 | 173 | ||
@@ -227,17 +232,17 @@ icalcomponent* icalmessage_new_counterpropose_reply(icalcomponent* oldc, | |||
227 | { | 232 | { |
228 | icalcomponent *reply; | 233 | icalcomponent *reply; |
229 | 234 | ||
230 | icalerror_check_arg_rz(oldc,"oldc"); | 235 | icalerror_check_arg_rz(oldc,"oldc"); |
231 | icalerror_check_arg_rz(newc,"newc"); | 236 | icalerror_check_arg_rz(newc,"newc"); |
232 | 237 | ||
233 | reply = icalcomponent_new_clone(newc); | 238 | reply = icalmessage_new_reply_base(newc,user,msg); |
234 | 239 | ||
235 | icalcomponent_set_method(reply,ICAL_METHOD_COUNTER); | 240 | icalcomponent_set_method(reply,ICAL_METHOD_COUNTER); |
236 | 241 | ||
237 | return newc; | 242 | return reply; |
238 | 243 | ||
239 | } | 244 | } |
240 | 245 | ||
241 | 246 | ||
242 | icalcomponent* icalmessage_new_delegate_reply(icalcomponent* c, | 247 | icalcomponent* icalmessage_new_delegate_reply(icalcomponent* c, |
243 | const char* user, | 248 | const char* user, |