[SCM] libgnokii and core programs branch, master, updated. rel_0_6_28-194-g69d9289

[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  69d9289e4896d00a288c4c4056a361b2f19dace2 (commit)
      from  63b564b1f6de46f95bec9e39f71589548f2fd2c5 (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=69d9289e4896d00a288c4c4056a361b2f19dace2


commit 69d9289e4896d00a288c4c4056a361b2f19dace2
Author: Daniele Forsi <address@hidden>
Date:   Thu Apr 8 11:19:31 2010 +0200

    Fix typos in strings and comments

diff --git a/common/phones/nk6510.c b/common/phones/nk6510.c
index 28e38d4..51584d0 100644
--- a/common/phones/nk6510.c
+++ b/common/phones/nk6510.c
@@ -3800,7 +3800,7 @@ static gn_error NK6510_WriteCalendarNote2(gn_data *data, 
struct gn_statemachine
                                    0xff, 0xff, /* birth year */
                                    0x20, /* todo priority */
                                    0x00, /* todo completed */
-                                   0x00, 0x00, /* number of occurences */
+                                   0x00, 0x00, /* number of occurrences */
                                    0x00,
                                    0x00, /* text length */
                                    0x00, /* phone length/meeting location */
@@ -3886,7 +3886,7 @@ static gn_error NK6510_WriteCalendarNote2(gn_data *data, 
struct gn_statemachine
        if (calnote->alarm.enabled) {
                long seconds;
 
-               /* Alarm for birtday is special. We need to set for the same
+               /* Alarm for birthday is special. We need to set for the same
                 * year we set the start date. */
                if (calnote->type == GN_CALNOTE_BIRTHDAY)
                        calnote->time.year = calnote->alarm.timestamp.year;
diff --git a/common/vcal.c b/common/vcal.c
index c266039..90444ac 100644
--- a/common/vcal.c
+++ b/common/vcal.c
@@ -58,7 +58,7 @@ static char *ical_fgets(char *s, size_t size, void *d)
 
 /* This string is used so often that we keep it as long as the program is
  * running. Due to VERSION being defined in both libical and gnokii we need
- * to us a static string instead of a pre-compiler macro.
+ * to use a static string instead of a pre-processor macro.
  */
 static char vcal_prodid[64] = {0};
 static inline const char *get_prodid()
@@ -508,13 +508,13 @@ static int gn_ical2calnote_real(icalcomponent *comp, 
gn_calnote *calnote, int id
                        calnote->occurrences = recur.count;
                        switch (recur.freq) {
                        case ICAL_SECONDLY_RECURRENCE:
-                               dprintf("Not suppported recurrence type. 
Aproximating recurrence\n");
+                               dprintf("Not suppported recurrence type. 
Approximating recurrence\n");
                                calnote->recurrence = recur.interval / 3600;
                                if (!calnote->recurrence)
                                        calnote->recurrence = 1;
                                break;
                        case ICAL_MINUTELY_RECURRENCE:
-                               dprintf("Not suppported recurrence type. 
Aproximating recurrence\n");
+                               dprintf("Not suppported recurrence type. 
Approximating recurrence\n");
                                calnote->recurrence = recur.interval / 60;
                                if (!calnote->recurrence)
                                        calnote->recurrence = 1;

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

Summary of changes:
 common/phones/nk6510.c |    4 ++--
 common/vcal.c          |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
libgnokii and core programs