[SCM] libgnokii and core programs branch, master, updated. rel_0_6_28-197-gef7ae2b

[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  ef7ae2b49cba736f1fa13d51c5300aa2824eaa09 (commit)
      from  3ff9d46b096ee1925e037964b22d5961091c41ff (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=ef7ae2b49cba736f1fa13d51c5300aa2824eaa09


commit ef7ae2b49cba736f1fa13d51c5300aa2824eaa09
Author: Daniele Forsi <address@hidden>
Date:   Sat Apr 10 18:34:10 2010 +0200

    Move the VALARM component inside VEVENT

diff --git a/common/vcal.c b/common/vcal.c
index 0b19dc4..1009a48 100644
--- a/common/vcal.c
+++ b/common/vcal.c
@@ -112,8 +112,8 @@ GNOKII_API char *gn_calnote2icalstr(gn_calnote *calnote)
        ical_string str;
 
 #ifdef HAVE_LIBICAL
-#  define MAX_PROP_INDEX 5
-       icalcomponent *pIcal = NULL, *vevent = NULL;
+#  define MAX_PROP_INDEX 6
+       icalcomponent *pIcal = NULL;
        struct icaltimetype stime = {0}, etime = {0};
        icalproperty *properties[MAX_PROP_INDEX+1] = {0}; /* order and number 
of properties vary */
        int iprop = 0;
@@ -162,10 +162,10 @@ GNOKII_API char *gn_calnote2icalstr(gn_calnote *calnote)
                /* FIXME: with ICAL_ACTION_DISPLAY a DESCRIPTION property is 
mandatory */
                aproperty[1] = icalproperty_new_action(calnote->alarm.tone ? 
ICAL_ACTION_AUDIO : ICAL_ACTION_DISPLAY);
 
-               vevent = icalcomponent_vanew(ICAL_VALARM_COMPONENT,
-                                            aproperty[0],
-                                            aproperty[1],
-                                            NULL);
+               properties[iprop++] = icalcomponent_vanew(ICAL_VALARM_COMPONENT,
+                                                         aproperty[0],
+                                                         aproperty[1],
+                                                         NULL);
        }
 
        /* TODO: should the strings be configurable? */
@@ -256,8 +256,8 @@ norecurrence:
                                                        properties[2],
                                                        properties[3],
                                                        properties[4],
+                                                       properties[5],
                                                        0),
-                                   vevent,
                                    0);
 
        if (pIcal) {

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

Summary of changes:
 common/vcal.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
libgnokii and core programs