[SCM] libgnokii and core programs branch, master, updated. rel_0_6_29-172-gd78e397

[Daniele Forsi]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "libgnokii and core programs".

The branch, master has been updated
       via  d78e397a1408b36cba2b76b231458277f9e1890c (commit)
       via  fa10c909240e22d443b93026bad0ee6cf8785ae1 (commit)
      from  53d80fd7cd929473479f72cb04e89ee1e4c52ea9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/gnokii.git/commit/?id=d78e397a1408b36cba2b76b231458277f9e1890c


commit d78e397a1408b36cba2b76b231458277f9e1890c
Author: Daniele Forsi <address@hidden>
Date:   Tue Feb 1 22:41:29 2011 +0100

    With ICAL_ACTION_DISPLAY a DESCRIPTION property is mandatory
    
    See http://www.ietf.org/rfc/rfc2445.txt chapter 4.6.6 Alarm Component

diff --git a/common/vcal.c b/common/vcal.c
index 893bb8f..fc0ed16 100644
--- a/common/vcal.c
+++ b/common/vcal.c
@@ -242,8 +242,13 @@ norecurrence:
                valarm = icalcomponent_new_valarm();
 
                icalcomponent_add_property(valarm, 
icalproperty_new_trigger(trig));
-               /* FIXME: with ICAL_ACTION_DISPLAY a DESCRIPTION property is 
mandatory */
-               icalcomponent_add_property(valarm, 
icalproperty_new_action(calnote->alarm.tone ? ICAL_ACTION_AUDIO : 
ICAL_ACTION_DISPLAY));
+               /* With ICAL_ACTION_DISPLAY a DESCRIPTION property is mandatory 
*/
+               if (calnote->alarm.tone) {
+                       icalcomponent_add_property(valarm, 
icalproperty_new_action(ICAL_ACTION_AUDIO));
+               } else {
+                       icalcomponent_add_property(valarm, 
icalproperty_new_action(ICAL_ACTION_DISPLAY));
+                       icalcomponent_add_property(valarm, 
icalproperty_new_description(calnote->text));
+               }
 
                icalcomponent_add_component(vevent, valarm);
        }

http://git.savannah.gnu.org/cgit/gnokii.git/commit/?id=fa10c909240e22d443b93026bad0ee6cf8785ae1


commit d78e397a1408b36cba2b76b231458277f9e1890c
Author: Daniele Forsi <address@hidden>
Date:   Tue Feb 1 22:41:29 2011 +0100

    With ICAL_ACTION_DISPLAY a DESCRIPTION property is mandatory
    
    See http://www.ietf.org/rfc/rfc2445.txt chapter 4.6.6 Alarm Component

diff --git a/common/vcal.c b/common/vcal.c
index 893bb8f..fc0ed16 100644
--- a/common/vcal.c
+++ b/common/vcal.c
@@ -242,8 +242,13 @@ norecurrence:
                valarm = icalcomponent_new_valarm();
 
                icalcomponent_add_property(valarm, 
icalproperty_new_trigger(trig));
-               /* FIXME: with ICAL_ACTION_DISPLAY a DESCRIPTION property is 
mandatory */
-               icalcomponent_add_property(valarm, 
icalproperty_new_action(calnote->alarm.tone ? ICAL_ACTION_AUDIO : 
ICAL_ACTION_DISPLAY));
+               /* With ICAL_ACTION_DISPLAY a DESCRIPTION property is mandatory 
*/
+               if (calnote->alarm.tone) {
+                       icalcomponent_add_property(valarm, 
icalproperty_new_action(ICAL_ACTION_AUDIO));
+               } else {
+                       icalcomponent_add_property(valarm, 
icalproperty_new_action(ICAL_ACTION_DISPLAY));
+                       icalcomponent_add_property(valarm, 
icalproperty_new_description(calnote->text));
+               }
 
                icalcomponent_add_component(vevent, valarm);
        }

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog     |    2 ++
 common/vcal.c |   12 ++++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
libgnokii and core programs