[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-19
|
From: |
Pawel Kot |
|
Subject: |
[SCM] libgnokii and core programs branch, master, updated. rel_0_6_28-191-g65da771 |
|
Date: |
Wed, 07 Apr 2010 10:57:24 +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 65da7713d0d2c6079286c283d66a4ba8bd501ad0 (commit)
via b31d96c775cbf18a72cec8d92bb90d751a287a76 (commit)
via b2574f50e627f42f442a67cf121c7ba0627a622b (commit)
via 8b78be5537079d3704087b41b87d7d641a4595c6 (commit)
via cb78a0ed531402384732c085ca795830c344838b (commit)
from fd3cbde10ba49588e83b6cee108ab6e40c83153e (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=65da7713d0d2c6079286c283d66a4ba8bd501ad0
commit 65da7713d0d2c6079286c283d66a4ba8bd501ad0
Author: Pawel Kot <address@hidden>
Date: Wed Apr 7 12:56:43 2010 +0200
Support caller groups in Series40 3rd Ed and later.
diff --git a/common/nokia-decoding.c b/common/nokia-decoding.c
index 075849e..ca3ff6a 100644
--- a/common/nokia-decoding.c
+++ b/common/nokia-decoding.c
@@ -290,8 +290,17 @@ gn_error phonebook_decode(unsigned char *blockstart, int
length, gn_data *data,
data->bitmap->number = blockstart[5] - 1;
dprintf(" Group: %d\n", blockstart[5] - 1);
break;
- case GN_PHONEBOOK_ENTRY_ExtGroup: /* Extended caller group
number: in Series40 3rd Ed and later groups are defined by users */
- dprintf(" ExtGroup: %d\n", blockstart[7]);
+ case GN_PHONEBOOK_ENTRY_ExtGroup: /* Extended caller group
number: in Series40 3rd Ed and later groups are defined by users */
+ if (!subentry) {
+ dprintf("ERROR!!!");
+ break;
+ }
+ subentry->entry_type = blockstart[0];
+ subentry->number_type = 0;
+ subentry->id = blockstart[4];
+ subentry->data.id = blockstart[7];
+ subblock_count++;
+ data->phonebook_entry->subentries_count++;
break;
case GN_PHONEBOOK_ENTRY_RingtoneAdv: /* Newer ringtones */
switch(blockstart[15]) {
diff --git a/gnokii/gnokii-phonebook.c b/gnokii/gnokii-phonebook.c
index 520c9e1..0b17b27 100644
--- a/gnokii/gnokii-phonebook.c
+++ b/gnokii/gnokii-phonebook.c
@@ -175,7 +175,7 @@ gn_error getphonebook(int argc, char *argv[], gn_data
*data, struct gn_statemach
case 2: {
char *s;
- s = gn_phonebook2vcardstr (&entry);
+ s = gn_phonebook2vcardstr(&entry);
fprintf (stdout, "%s", s);
free (s);
}
@@ -225,6 +225,9 @@ gn_error getphonebook(int argc, char *argv[], gn_data
*data, struct gn_statemach
for (i = 0; i < entry.subentries_count; i++) {
fprintf(stdout, "%s: ",
gn_subentrytype2string(entry.subentries[i].entry_type,
entry.subentries[i].number_type));
switch (entry.subentries[i].entry_type)
{
+ case GN_PHONEBOOK_ENTRY_ExtGroup:
+ fprintf(stdout, "%d",
entry.subentries[i].data.id);
+ break;
case GN_PHONEBOOK_ENTRY_Birthday:
case GN_PHONEBOOK_ENTRY_Date:
fprintf(stdout,
_("%04u.%02u.%02u %02u:%02u:%02u"), entry.subentries[i].data.date.year,
entry.subentries[i].data.date.month, entry.subentries[i].data.date.day,
entry.subentries[i].data.date.hour, entry.subentries[i].data.date.minute,
entry.subentries[i].data.date.second);
http://git.savannah.gnu.org/cgit/gnokii.git/commit/?id=b31d96c775cbf18a72cec8d92bb90d751a287a76
commit 65da7713d0d2c6079286c283d66a4ba8bd501ad0
Author: Pawel Kot <address@hidden>
Date: Wed Apr 7 12:56:43 2010 +0200
Support caller groups in Series40 3rd Ed and later.
diff --git a/common/nokia-decoding.c b/common/nokia-decoding.c
index 075849e..ca3ff6a 100644
--- a/common/nokia-decoding.c
+++ b/common/nokia-decoding.c
@@ -290,8 +290,17 @@ gn_error phonebook_decode(unsigned char *blockstart, int
length, gn_data *data,
data->bitmap->number = blockstart[5] - 1;
dprintf(" Group: %d\n", blockstart[5] - 1);
break;
- case GN_PHONEBOOK_ENTRY_ExtGroup: /* Extended caller group
number: in Series40 3rd Ed and later groups are defined by users */
- dprintf(" ExtGroup: %d\n", blockstart[7]);
+ case GN_PHONEBOOK_ENTRY_ExtGroup: /* Extended caller group
number: in Series40 3rd Ed and later groups are defined by users */
+ if (!subentry) {
+ dprintf("ERROR!!!");
+ break;
+ }
+ subentry->entry_type = blockstart[0];
+ subentry->number_type = 0;
+ subentry->id = blockstart[4];
+ subentry->data.id = blockstart[7];
+ subblock_count++;
+ data->phonebook_entry->subentries_count++;
break;
case GN_PHONEBOOK_ENTRY_RingtoneAdv: /* Newer ringtones */
switch(blockstart[15]) {
diff --git a/gnokii/gnokii-phonebook.c b/gnokii/gnokii-phonebook.c
index 520c9e1..0b17b27 100644
--- a/gnokii/gnokii-phonebook.c
+++ b/gnokii/gnokii-phonebook.c
@@ -175,7 +175,7 @@ gn_error getphonebook(int argc, char *argv[], gn_data
*data, struct gn_statemach
case 2: {
char *s;
- s = gn_phonebook2vcardstr (&entry);
+ s = gn_phonebook2vcardstr(&entry);
fprintf (stdout, "%s", s);
free (s);
}
@@ -225,6 +225,9 @@ gn_error getphonebook(int argc, char *argv[], gn_data
*data, struct gn_statemach
for (i = 0; i < entry.subentries_count; i++) {
fprintf(stdout, "%s: ",
gn_subentrytype2string(entry.subentries[i].entry_type,
entry.subentries[i].number_type));
switch (entry.subentries[i].entry_type)
{
+ case GN_PHONEBOOK_ENTRY_ExtGroup:
+ fprintf(stdout, "%d",
entry.subentries[i].data.id);
+ break;
case GN_PHONEBOOK_ENTRY_Birthday:
case GN_PHONEBOOK_ENTRY_Date:
fprintf(stdout,
_("%04u.%02u.%02u %02u:%02u:%02u"), entry.subentries[i].data.date.year,
entry.subentries[i].data.date.month, entry.subentries[i].data.date.day,
entry.subentries[i].data.date.hour, entry.subentries[i].data.date.minute,
entry.subentries[i].data.date.second);
http://git.savannah.gnu.org/cgit/gnokii.git/commit/?id=b2574f50e627f42f442a67cf121c7ba0627a622b
commit 65da7713d0d2c6079286c283d66a4ba8bd501ad0
Author: Pawel Kot <address@hidden>
Date: Wed Apr 7 12:56:43 2010 +0200
Support caller groups in Series40 3rd Ed and later.
diff --git a/common/nokia-decoding.c b/common/nokia-decoding.c
index 075849e..ca3ff6a 100644
--- a/common/nokia-decoding.c
+++ b/common/nokia-decoding.c
@@ -290,8 +290,17 @@ gn_error phonebook_decode(unsigned char *blockstart, int
length, gn_data *data,
data->bitmap->number = blockstart[5] - 1;
dprintf(" Group: %d\n", blockstart[5] - 1);
break;
- case GN_PHONEBOOK_ENTRY_ExtGroup: /* Extended caller group
number: in Series40 3rd Ed and later groups are defined by users */
- dprintf(" ExtGroup: %d\n", blockstart[7]);
+ case GN_PHONEBOOK_ENTRY_ExtGroup: /* Extended caller group
number: in Series40 3rd Ed and later groups are defined by users */
+ if (!subentry) {
+ dprintf("ERROR!!!");
+ break;
+ }
+ subentry->entry_type = blockstart[0];
+ subentry->number_type = 0;
+ subentry->id = blockstart[4];
+ subentry->data.id = blockstart[7];
+ subblock_count++;
+ data->phonebook_entry->subentries_count++;
break;
case GN_PHONEBOOK_ENTRY_RingtoneAdv: /* Newer ringtones */
switch(blockstart[15]) {
diff --git a/gnokii/gnokii-phonebook.c b/gnokii/gnokii-phonebook.c
index 520c9e1..0b17b27 100644
--- a/gnokii/gnokii-phonebook.c
+++ b/gnokii/gnokii-phonebook.c
@@ -175,7 +175,7 @@ gn_error getphonebook(int argc, char *argv[], gn_data
*data, struct gn_statemach
case 2: {
char *s;
- s = gn_phonebook2vcardstr (&entry);
+ s = gn_phonebook2vcardstr(&entry);
fprintf (stdout, "%s", s);
free (s);
}
@@ -225,6 +225,9 @@ gn_error getphonebook(int argc, char *argv[], gn_data
*data, struct gn_statemach
for (i = 0; i < entry.subentries_count; i++) {
fprintf(stdout, "%s: ",
gn_subentrytype2string(entry.subentries[i].entry_type,
entry.subentries[i].number_type));
switch (entry.subentries[i].entry_type)
{
+ case GN_PHONEBOOK_ENTRY_ExtGroup:
+ fprintf(stdout, "%d",
entry.subentries[i].data.id);
+ break;
case GN_PHONEBOOK_ENTRY_Birthday:
case GN_PHONEBOOK_ENTRY_Date:
fprintf(stdout,
_("%04u.%02u.%02u %02u:%02u:%02u"), entry.subentries[i].data.date.year,
entry.subentries[i].data.date.month, entry.subentries[i].data.date.day,
entry.subentries[i].data.date.hour, entry.subentries[i].data.date.minute,
entry.subentries[i].data.date.second);
http://git.savannah.gnu.org/cgit/gnokii.git/commit/?id=8b78be5537079d3704087b41b87d7d641a4595c6
commit 65da7713d0d2c6079286c283d66a4ba8bd501ad0
Author: Pawel Kot <address@hidden>
Date: Wed Apr 7 12:56:43 2010 +0200
Support caller groups in Series40 3rd Ed and later.
diff --git a/common/nokia-decoding.c b/common/nokia-decoding.c
index 075849e..ca3ff6a 100644
--- a/common/nokia-decoding.c
+++ b/common/nokia-decoding.c
@@ -290,8 +290,17 @@ gn_error phonebook_decode(unsigned char *blockstart, int
length, gn_data *data,
data->bitmap->number = blockstart[5] - 1;
dprintf(" Group: %d\n", blockstart[5] - 1);
break;
- case GN_PHONEBOOK_ENTRY_ExtGroup: /* Extended caller group
number: in Series40 3rd Ed and later groups are defined by users */
- dprintf(" ExtGroup: %d\n", blockstart[7]);
+ case GN_PHONEBOOK_ENTRY_ExtGroup: /* Extended caller group
number: in Series40 3rd Ed and later groups are defined by users */
+ if (!subentry) {
+ dprintf("ERROR!!!");
+ break;
+ }
+ subentry->entry_type = blockstart[0];
+ subentry->number_type = 0;
+ subentry->id = blockstart[4];
+ subentry->data.id = blockstart[7];
+ subblock_count++;
+ data->phonebook_entry->subentries_count++;
break;
case GN_PHONEBOOK_ENTRY_RingtoneAdv: /* Newer ringtones */
switch(blockstart[15]) {
diff --git a/gnokii/gnokii-phonebook.c b/gnokii/gnokii-phonebook.c
index 520c9e1..0b17b27 100644
--- a/gnokii/gnokii-phonebook.c
+++ b/gnokii/gnokii-phonebook.c
@@ -175,7 +175,7 @@ gn_error getphonebook(int argc, char *argv[], gn_data
*data, struct gn_statemach
case 2: {
char *s;
- s = gn_phonebook2vcardstr (&entry);
+ s = gn_phonebook2vcardstr(&entry);
fprintf (stdout, "%s", s);
free (s);
}
@@ -225,6 +225,9 @@ gn_error getphonebook(int argc, char *argv[], gn_data
*data, struct gn_statemach
for (i = 0; i < entry.subentries_count; i++) {
fprintf(stdout, "%s: ",
gn_subentrytype2string(entry.subentries[i].entry_type,
entry.subentries[i].number_type));
switch (entry.subentries[i].entry_type)
{
+ case GN_PHONEBOOK_ENTRY_ExtGroup:
+ fprintf(stdout, "%d",
entry.subentries[i].data.id);
+ break;
case GN_PHONEBOOK_ENTRY_Birthday:
case GN_PHONEBOOK_ENTRY_Date:
fprintf(stdout,
_("%04u.%02u.%02u %02u:%02u:%02u"), entry.subentries[i].data.date.year,
entry.subentries[i].data.date.month, entry.subentries[i].data.date.day,
entry.subentries[i].data.date.hour, entry.subentries[i].data.date.minute,
entry.subentries[i].data.date.second);
http://git.savannah.gnu.org/cgit/gnokii.git/commit/?id=cb78a0ed531402384732c085ca795830c344838b
commit 65da7713d0d2c6079286c283d66a4ba8bd501ad0
Author: Pawel Kot <address@hidden>
Date: Wed Apr 7 12:56:43 2010 +0200
Support caller groups in Series40 3rd Ed and later.
diff --git a/common/nokia-decoding.c b/common/nokia-decoding.c
index 075849e..ca3ff6a 100644
--- a/common/nokia-decoding.c
+++ b/common/nokia-decoding.c
@@ -290,8 +290,17 @@ gn_error phonebook_decode(unsigned char *blockstart, int
length, gn_data *data,
data->bitmap->number = blockstart[5] - 1;
dprintf(" Group: %d\n", blockstart[5] - 1);
break;
- case GN_PHONEBOOK_ENTRY_ExtGroup: /* Extended caller group
number: in Series40 3rd Ed and later groups are defined by users */
- dprintf(" ExtGroup: %d\n", blockstart[7]);
+ case GN_PHONEBOOK_ENTRY_ExtGroup: /* Extended caller group
number: in Series40 3rd Ed and later groups are defined by users */
+ if (!subentry) {
+ dprintf("ERROR!!!");
+ break;
+ }
+ subentry->entry_type = blockstart[0];
+ subentry->number_type = 0;
+ subentry->id = blockstart[4];
+ subentry->data.id = blockstart[7];
+ subblock_count++;
+ data->phonebook_entry->subentries_count++;
break;
case GN_PHONEBOOK_ENTRY_RingtoneAdv: /* Newer ringtones */
switch(blockstart[15]) {
diff --git a/gnokii/gnokii-phonebook.c b/gnokii/gnokii-phonebook.c
index 520c9e1..0b17b27 100644
--- a/gnokii/gnokii-phonebook.c
+++ b/gnokii/gnokii-phonebook.c
@@ -175,7 +175,7 @@ gn_error getphonebook(int argc, char *argv[], gn_data
*data, struct gn_statemach
case 2: {
char *s;
- s = gn_phonebook2vcardstr (&entry);
+ s = gn_phonebook2vcardstr(&entry);
fprintf (stdout, "%s", s);
free (s);
}
@@ -225,6 +225,9 @@ gn_error getphonebook(int argc, char *argv[], gn_data
*data, struct gn_statemach
for (i = 0; i < entry.subentries_count; i++) {
fprintf(stdout, "%s: ",
gn_subentrytype2string(entry.subentries[i].entry_type,
entry.subentries[i].number_type));
switch (entry.subentries[i].entry_type)
{
+ case GN_PHONEBOOK_ENTRY_ExtGroup:
+ fprintf(stdout, "%d",
entry.subentries[i].data.id);
+ break;
case GN_PHONEBOOK_ENTRY_Birthday:
case GN_PHONEBOOK_ENTRY_Date:
fprintf(stdout,
_("%04u.%02u.%02u %02u:%02u:%02u"), entry.subentries[i].data.date.year,
entry.subentries[i].data.date.month, entry.subentries[i].data.date.day,
entry.subentries[i].data.date.hour, entry.subentries[i].data.date.minute,
entry.subentries[i].data.date.second);
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 11 ++++++
common/gsm-common.c | 2 +
common/gsm-filetypes.c | 10 +++++
common/misc.c | 6 ++--
common/nokia-decoding.c | 18 +++++++++
common/phones/nk6510.c | 86 +++++++++++++++++++++++++++++++++++++-------
common/vcard.c | 78 +++++++++++++++++++++++++---------------
gnokii/gnokii-phonebook.c | 5 ++-
include/gnokii/common.h | 4 ++
include/misc.h | 1 +
10 files changed, 174 insertions(+), 47 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-191-g65da771,
Pawel Kot <=