[SCM] libgnokii and core programs branch, master, updated. rel_0_6_29-236-gc0dbbd5

[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  c0dbbd5c5aa37fff0d89692785d7bf8f73fb7d44 (commit)
      from  8d64f558ed0fb0ba0a3d292a60309815e903fe28 (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=c0dbbd5c5aa37fff0d89692785d7bf8f73fb7d44


commit c0dbbd5c5aa37fff0d89692785d7bf8f73fb7d44
Author: Daniele Forsi <address@hidden>
Date:   Mon Jun 6 15:14:31 2011 +0200

    Revert "Fix smsd segfaulting after sending failure"
    
    This reverts commit 5f1cef62327a4d8e5e1406c9822e6381c8490bde.

diff --git a/common/gsm-sms.c b/common/gsm-sms.c
index 847dce6..7c6aa02 100644
--- a/common/gsm-sms.c
+++ b/common/gsm-sms.c
@@ -1702,8 +1702,6 @@ static gn_error sms_send_single(gn_data *data, struct 
gn_statemachine *state)
 
        dprintf("Sending\n");
        error = gn_sm_functions(GN_OP_SendSMS, data, state);
-       if (error != GN_ERR_NONE)
-               return error;
 
        /* We send SMS parts from the first part to last. */
        if (!data->sms->reference)
@@ -1713,7 +1711,7 @@ static gn_error sms_send_single(gn_data *data, struct 
gn_statemachine *state)
                i++;
        data->sms->reference[i] = data->raw_sms->reference;
 
-       return GN_ERR_NONE;
+       return error;
 }
 
 static gn_error sms_send_long(gn_data *data, struct gn_statemachine *state, 
int octets)

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

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


hooks/post-receive
-- 
libgnokii and core programs