[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] libgnokii and core programs branch, master, updated. rel_0_6_28-14
|
From: |
Daniele Forsi |
|
Subject: |
[SCM] libgnokii and core programs branch, master, updated. rel_0_6_28-147-gd4f0bc9 |
|
Date: |
Sat, 19 Dec 2009 17:43:06 +0000 |
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 d4f0bc9534b3bf1d5212dba9eff420eea6d60bf7 (commit)
from b34584acf1eb229c026d8ad94d8e15496500be15 (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=d4f0bc9534b3bf1d5212dba9eff420eea6d60bf7
commit d4f0bc9534b3bf1d5212dba9eff420eea6d60bf7
Author: Daniele Forsi <address@hidden>
Date: Sat Dec 19 18:38:30 2009 +0100
Consistently use GN_SMS_MT_StatusReport to indicate delivery notifications
Fixes http://savannah.nongnu.org/bugs/?28216
diff --git a/ChangeLog b/ChangeLog
index bc88d42..9a530a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -69,6 +69,15 @@
(Jari Turkia)
o MS Visual Studio has setenv() (Jari Turkia)
o rename win32 dir to Windows (it's also win64) (PaweÅ Kot)
+ * nk6100 driver updates
+ o use GN_SMS_MT_StatusReport to indicate delivery notifications
+ (Daniele Forsi)
+ * nk6510 driver updates
+ o use GN_SMS_MT_StatusReport to indicate delivery notifications
+ (Daniele Forsi)
+ * nk7110 driver updates
+ o use GN_SMS_MT_StatusReport to indicate delivery notifications
+ (Daniele Forsi)
0.6.28
======
diff --git a/common/gsm-sms.c b/common/gsm-sms.c
index 8b438b2..4ebb526 100644
--- a/common/gsm-sms.c
+++ b/common/gsm-sms.c
@@ -634,7 +634,7 @@ static gn_error sms_header_decode(gn_sms_raw *rawsms,
gn_sms *sms, gn_sms_udh *u
dprintf("\tSMS center number: %s\n", sms->smsc.number);
/* Delivery time */
- if (sms->type == GN_SMS_MT_DeliveryReport) {
+ if (sms->type == GN_SMS_MT_StatusReport) {
sms_timestamp_unpack(rawsms->time, &(sms->time));
dprintf("\tDelivery date: %s\n",
sms_timestamp_print(rawsms->time));
}
diff --git a/common/phones/nk6100.c b/common/phones/nk6100.c
index 751c722..bc0a098 100644
--- a/common/phones/nk6100.c
+++ b/common/phones/nk6100.c
@@ -1724,10 +1724,10 @@ static gn_error IncomingSMS(int messagetype, unsigned
char *message, int length,
memset(data->raw_sms, 0, sizeof(gn_sms_raw));
-#define getdata(d,dr,s) (message[(data->raw_sms->type ==
GN_SMS_MT_Deliver) ? (d) : ((data->raw_sms->type == GN_SMS_MT_DeliveryReport) ?
(dr) : (s))])
+#define getdata(d,dr,s) (message[(data->raw_sms->type ==
GN_SMS_MT_Deliver) ? (d) : ((data->raw_sms->type == GN_SMS_MT_StatusReport) ?
(dr) : (s))])
switch (message[7]) {
case 0x00: data->raw_sms->type = GN_SMS_MT_Deliver; break;
- case 0x01: data->raw_sms->type = GN_SMS_MT_DeliveryReport;
break;
+ case 0x01: data->raw_sms->type = GN_SMS_MT_StatusReport; break;
case 0x02: data->raw_sms->type = GN_SMS_MT_Submit; break;
default: return GN_ERR_UNHANDLEDFRAME;
}
@@ -1743,7 +1743,7 @@ static gn_error IncomingSMS(int messagetype, unsigned
char *message, int length,
data->raw_sms->user_data_length -= message[getdata(24,
23, 25)] + 1;
memcpy(data->raw_sms->user_data, &getdata(43, 22, 44),
data->raw_sms->length);
- if (data->raw_sms->type == GN_SMS_MT_DeliveryReport) {
+ if (data->raw_sms->type == GN_SMS_MT_StatusReport) {
data->raw_sms->reply_via_same_smsc = message[11];
memcpy(data->raw_sms->time, message + 42, 7);
data->raw_sms->report_status = message[22];
diff --git a/common/phones/nk6510.c b/common/phones/nk6510.c
index 33f80af..bac2e4e 100644
--- a/common/phones/nk6510.c
+++ b/common/phones/nk6510.c
@@ -818,9 +818,9 @@ static void ParseLayout(unsigned char *message, gn_data
*data)
block = message + 16;
memcpy(data->raw_sms->smsc_time, message + 6, 7);
break;
- case 0x01: /* delivery report */
- dprintf("Type: Delivery Report\n");
- data->raw_sms->type = GN_SMS_MT_DeliveryReport;
+ case 0x01: /* status report */
+ dprintf("Type: Status Report\n");
+ data->raw_sms->type = GN_SMS_MT_StatusReport;
dprintf("Reference id: %d\n", data->raw_sms->reference);
block = message + 20;
memcpy(data->raw_sms->smsc_time, message + 6, 7);
diff --git a/common/phones/nk7110.c b/common/phones/nk7110.c
index 973382e..6427e49 100644
--- a/common/phones/nk7110.c
+++ b/common/phones/nk7110.c
@@ -1011,7 +1011,7 @@ static inline unsigned int get_data(gn_sms_message_type
t, unsigned int a,
switch (t) {
case GN_SMS_MT_Deliver: return a;
case GN_SMS_MT_Submit: return b;
- case GN_SMS_MT_DeliveryReport: return c;
+ case GN_SMS_MT_StatusReport: return c;
case GN_SMS_MT_Picture: return d;
default: return 0;
}
@@ -1088,7 +1088,7 @@ static gn_error NK7110_IncomingFolder(int messagetype,
unsigned char *message, i
memcpy(data->raw_sms->message_center, message + 9, 12);
memcpy(data->raw_sms->remote_number, message +
get_data(T, 25, 26, 24, 22), 12);
}
- if (T == GN_SMS_MT_DeliveryReport)
+ if (T == GN_SMS_MT_StatusReport)
memcpy(data->raw_sms->time, message + 43, 7);
data->raw_sms->dcs = message[23];
diff --git a/gnokii/gnokii-sms.c b/gnokii/gnokii-sms.c
index 4e1edb1..d3f148b 100644
--- a/gnokii/gnokii-sms.c
+++ b/gnokii/gnokii-sms.c
@@ -752,7 +752,7 @@ parsefile:
message_text = NULL;
fprintf(stdout, _("%d. %s (%s)\n"), message.number,
gn_sms_message_type2str(message.type),
gn_sms_message_status2str(message.status));
switch (message.type) {
- case GN_SMS_MT_DeliveryReport:
+ case GN_SMS_MT_StatusReport:
fprintf(stdout, _("Sending date/time:
%02d/%02d/%04d %02d:%02d:%02d "), \
message.smsc_time.day,
message.smsc_time.month, message.smsc_time.year, \
message.smsc_time.hour,
message.smsc_time.minute, message.smsc_time.second);
diff --git a/smsd/smsd.c b/smsd/smsd.c
index 07023f7..35b5a6d 100644
--- a/smsd/smsd.c
+++ b/smsd/smsd.c
@@ -433,7 +433,7 @@ static void ReadSMS (gpointer d, gpointer userData)
PhoneEvent *e;
gint error;
- if (data->type == GN_SMS_MT_Deliver || data->type ==
GN_SMS_MT_DeliveryReport)
+ if (data->type == GN_SMS_MT_Deliver || data->type == GN_SMS_MT_StatusReport)
{
gn_log_xdebug ("%d. %s ", data->number, data->remote.number);
gn_log_xdebug ("%02d-%02d-%02d %02d:%02d:%02d+%02d %s\n",
data->smsc_time.year,
diff --git a/xgnokii/xgnokii_sms.c b/xgnokii/xgnokii_sms.c
index 779798f..86653d3 100644
--- a/xgnokii/xgnokii_sms.c
+++ b/xgnokii/xgnokii_sms.c
@@ -221,7 +221,7 @@ static int IsValidSMSforFolder(gpointer d, gpointer
userData)
return 1;
} else {
if ((data->type == GN_SMS_MT_Deliver && !SMS.currentBox) ||
- (data->type == GN_SMS_MT_DeliveryReport && !SMS.currentBox)
||
+ (data->type == GN_SMS_MT_StatusReport && !SMS.currentBox) ||
(data->type == GN_SMS_MT_Submit && SMS.currentBox))
return 1;
}
@@ -296,7 +296,7 @@ static void InsertFolderElement(gpointer d, gpointer
userData)
*/
gchar *row[4];
switch (data->type) {
- case GN_SMS_MT_DeliveryReport:
+ case GN_SMS_MT_StatusReport:
switch (data->status) {
case GN_SMS_Read:
row[0] = g_strdup(_("read report"));
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 9 +++++++++
common/gsm-sms.c | 2 +-
common/phones/nk6100.c | 6 +++---
common/phones/nk6510.c | 6 +++---
common/phones/nk7110.c | 4 ++--
gnokii/gnokii-sms.c | 2 +-
smsd/smsd.c | 2 +-
xgnokii/xgnokii_sms.c | 4 ++--
8 files changed, 22 insertions(+), 13 deletions(-)
hooks/post-receive
--
libgnokii and core programs
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] libgnokii and core programs branch, master, updated. rel_0_6_28-147-gd4f0bc9,
Daniele Forsi <=