[SCM] libgnokii and core programs branch, master, updated. rel_0_6_29-118-g844a2c4

[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  844a2c4a9f8598c8c7d70374545e99667bf9e620 (commit)
      from  9c8449339866dda8f615ea9612da35fd083bb8ae (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=844a2c4a9f8598c8c7d70374545e99667bf9e620


commit 844a2c4a9f8598c8c7d70374545e99667bf9e620
Author: Daniele Forsi <address@hidden>
Date:   Wed Jan 26 18:47:42 2011 +0100

    Handle error response when reading todos from Series 40 3rd
    
    Also don't overwrite the error variable when NK6510_GetToDoLocations()
    failed.

diff --git a/common/phones/nk6510.c b/common/phones/nk6510.c
index 4cc514e..ce9a671 100644
--- a/common/phones/nk6510.c
+++ b/common/phones/nk6510.c
@@ -6168,6 +6168,9 @@ static gn_error NK6510_IncomingToDo(int messagetype, 
unsigned char *message, int
                }
                dprintf("\n");
                break;
+       case 0xf0:
+               error = GN_ERR_NOTSUPPORTED;
+               break;
        default:
                dprintf("Unknown subtype of type 0x01 (%d)\n", message[3]);
                error = GN_ERR_UNHANDLEDFRAME;
@@ -6212,11 +6215,13 @@ static gn_error NK6510_GetToDo(gn_data *data, struct 
gn_statemachine *state)
                error = GN_ERR_INVALIDLOCATION;
        } else {
                error = NK6510_GetToDoLocations(data, state);
-               if (!data->todo_list->number ||
-                   data->todo->location > data->todo_list->number) {
-                       error = GN_ERR_EMPTYLOCATION;
-               } else {
-                       return NK6510_GetToDo_Internal(data, state, 
data->todo_list->location[data->todo->location - 1]);
+               if (error == GN_ERR_NONE) {
+                       if (!data->todo_list->number ||
+                           data->todo->location > data->todo_list->number) {
+                               error = GN_ERR_EMPTYLOCATION;
+                       } else {
+                               return NK6510_GetToDo_Internal(data, state, 
data->todo_list->location[data->todo->location - 1]);
+                       }
                }
        }
        return error;

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

Summary of changes:
 common/phones/nk6510.c |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
libgnokii and core programs