[SCM] libgnokii and core programs branch, master, updated. rel_0_6_29-396-g9bf055d

[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  9bf055d6da0968e2e7129237df4ee7553d1a1165 (commit)
      from  fb033615ef125ae73d7cb52c2b6d6523276ab297 (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=9bf055d6da0968e2e7129237df4ee7553d1a1165


commit 9bf055d6da0968e2e7129237df4ee7553d1a1165
Author: Daniele Forsi <address@hidden>
Date:   Tue Mar 27 20:38:47 2012 +0200

    Use a proper define

diff --git a/common/phones/nk6510.c b/common/phones/nk6510.c
index f290c90..8d5e724 100644
--- a/common/phones/nk6510.c
+++ b/common/phones/nk6510.c
@@ -1661,15 +1661,13 @@ static gn_error NK6510_GetSMS_S40_30(gn_data *data, 
struct gn_statemachine *stat
 
        data->raw_sms->status = 
GetMessageStatus_S40_30(fl2.files[data->raw_sms->number - 1]->name);
 
-#define HEADER_LEN     0xb0    /* 176 */
-
        bin = fi.file;
 
-       offset = HEADER_LEN;
        /* content length */
        cont_len = (bin[4] << 24) + (bin[5] << 16) + (bin[6] << 8) + bin[7];
        /* total length */
        tota_len = (bin[8] << 24) + (bin[9] << 16) + (bin[10] << 8) + bin[11];
+       offset = NK6510_S40MSG_HEADER_LEN;
        error = gn_sms_pdu2raw(data->raw_sms, bin + offset, cont_len, 
GN_SMS_PDU_NOSMSC);
 
        offset += data->raw_sms->length;
diff --git a/include/phones/nk6510.h b/include/phones/nk6510.h
index 871a279..2bdab7c 100644
--- a/include/phones/nk6510.h
+++ b/include/phones/nk6510.h
@@ -185,6 +185,12 @@ typedef enum {
 #define NK6510_SUBSEC_ENABLE_EXTENDED_CMDS     0x64    /* Enable extended 
commands */
 #define NK6510_SUBSEC_NETMONITOR               0x7e    /* Netmonitor */
 
+/* Series 40 3rd Ed. SMS and MMS */
+
+#define NK6510_S40MSG_HEADER_LEN       0xb0    /* 176 */
+
+/* Misc defines */
+
 #define        NK6510_RINGTONE_USERDEF_LOCATION        231
 
 #define NK6510_FILE_ID_LENGTH 6

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

Summary of changes:
 common/phones/nk6510.c  |    4 +---
 include/phones/nk6510.h |    6 ++++++
 2 files changed, 7 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
libgnokii and core programs