[SCM] libgnokii and core programs branch, master, updated. rel_0_6_28-199-ga03362f

[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  a03362fc38f9c3c738b3349fe9605beaa7e08c8f (commit)
      from  bb6a97abe9147a70962d0d0a953277dd9061d2b6 (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=a03362fc38f9c3c738b3349fe9605beaa7e08c8f


commit a03362fc38f9c3c738b3349fe9605beaa7e08c8f
Author: Daniele Forsi <address@hidden>
Date:   Sat Apr 10 22:56:11 2010 +0200

    Do not emit RRULE twice for GN_CALNOTE_BIRTHDAY
    
    Avoid this:
    RRULE:FREQ=YEARLY;BYMONTH=4
    RRULE:FREQ=YEARLY

diff --git a/common/vcal.c b/common/vcal.c
index fc6968a..4901450 100644
--- a/common/vcal.c
+++ b/common/vcal.c
@@ -179,11 +179,6 @@ GNOKII_API char *gn_calnote2icalstr(gn_calnote *calnote)
        case GN_CALNOTE_BIRTHDAY:
                icalcomponent_add_property(vevent, 
icalproperty_new_categories("ANNIVERSARY"));
                icalcomponent_add_property(vevent, 
icalproperty_new_summary(calnote->text));
-               do {
-                       char rrule[64];
-                       snprintf(rrule, sizeof(rrule), 
"FREQ=YEARLY;INTERVAL=1;BYMONTH=%d", stime.month);
-                       icalcomponent_add_property(vevent, 
icalproperty_new_rrule(icalrecurrencetype_from_string(rrule)));
-               } while (0);
                stime.is_date = 1;
                calnote->recurrence = GN_CALNOTE_YEARLY;
                break;
@@ -222,7 +217,9 @@ GNOKII_API char *gn_calnote2icalstr(gn_calnote *calnote)
                        interval = calnote->recurrence;
                        break;
                }
-               if (calnote->occurrences == 0)
+               if (calnote->type == GN_CALNOTE_BIRTHDAY)
+                       snprintf(rrule, sizeof(rrule), 
"FREQ=YEARLY;INTERVAL=1;BYMONTH=%d", stime.month);
+               else if (calnote->occurrences == 0)
                        snprintf(rrule, sizeof(rrule), "FREQ=%s;INTERVAL=%d", 
freq, interval);
                else
                        snprintf(rrule, sizeof(rrule), 
"FREQ=%s;COUNT=%d;INTERVAL=%d", freq, calnote->occurrences, interval);

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

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


hooks/post-receive
-- 
libgnokii and core programs