[SCM] libgnokii and core programs branch, master, updated. rel_0_6_29-299-g1996c03

[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  1996c0320c5922a3b4be3f4954d8e392d4f5ce3c (commit)
      from  aae8242ed8eb1644aefd97fd05446784d85683d9 (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=1996c0320c5922a3b4be3f4954d8e392d4f5ce3c


commit 1996c0320c5922a3b4be3f4954d8e392d4f5ce3c
Author: Daniele Forsi <address@hidden>
Date:   Sat Jul 23 22:48:48 2011 +0200

    Do not set drvinst->charset in case of error

diff --git a/common/phones/atgen.c b/common/phones/atgen.c
index 59a9a02..164015b 100644
--- a/common/phones/atgen.c
+++ b/common/phones/atgen.c
@@ -825,7 +825,8 @@ static gn_error AT_SetCharset(gn_data *data, struct 
gn_statemachine *state)
                if (error)
                        return error;
                error = sm_block_no_retry(GN_OP_Init, &tmpdata, state);
-               drvinst->charset = AT_CHAR_HEXGSM;
+               if (!error)
+                       drvinst->charset = AT_CHAR_HEXGSM;
        }
        if (drvinst->charset != AT_CHAR_UNKNOWN)
                return GN_ERR_NONE;
@@ -836,9 +837,9 @@ static gn_error AT_SetCharset(gn_data *data, struct 
gn_statemachine *state)
                if (error)
                        return error;
                error = sm_block_no_retry(GN_OP_Init, &tmpdata, state);
-               drvinst->charset = AT_CHAR_GSM;
+               if (!error)
+                       drvinst->charset = AT_CHAR_GSM;
        }
-
        if (drvinst->charset != AT_CHAR_UNKNOWN)
                return GN_ERR_NONE;
 

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

Summary of changes:
 common/phones/atgen.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
libgnokii and core programs