[SCM] libgnokii and core programs branch, master, updated. rel_0_6_29-247-g760f9f0

[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  760f9f070991f0daeeee8120229ecb526f977471 (commit)
      from  9b7974c5334c01fa3291bcb6f10364a5173da6a4 (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=760f9f070991f0daeeee8120229ecb526f977471


commit 760f9f070991f0daeeee8120229ecb526f977471
Author: Daniele Forsi <address@hidden>
Date:   Sat Jun 18 18:53:11 2011 +0200

    Fix false positive "Misconfiguration in the phone table detected."
    
    The message was printed in the "new" function instead of the "old".

diff --git a/common/phones/nk6510.c b/common/phones/nk6510.c
index ab6673a..ff29d27 100644
--- a/common/phones/nk6510.c
+++ b/common/phones/nk6510.c
@@ -1237,9 +1237,6 @@ static gn_error NK6510_GetSMSFolders_S40_30(gn_data 
*data, struct gn_statemachin
        }
        data->sms_folder_list->number = j;
 
-       dprintf("Misconfiguration in the phone table detected.\nPlease report 
to gnokii ml (address@hidden).\n");
-       dprintf("Model %s (%s) is series40 3rd+ Edition.\n", 
DRVINSTANCE(state)->pm->product_name, DRVINSTANCE(state)->pm->model);
-       DRVINSTANCE(state)->pm->flags |= PM_DEFAULT_S40_3RD;
        return error;
 }
 
@@ -1264,6 +1261,11 @@ static gn_error NK6510_GetSMSFolders(gn_data *data, 
struct gn_statemachine *stat
                dprintf("NK6510_GetSMSFolders: before switch to S40_30\nerror: 
%s (%d)\n", gn_error_print(error), error);
                /* Try file approach */
                error = NK6510_GetSMSFolders_S40_30(data, state);
+               if (error == GN_ERR_NONE) {
+                       dprintf("Misconfiguration in the phone table 
detected.\nPlease report to gnokii ml (address@hidden).\n");
+                       dprintf("Model %s (%s) is series40 3rd+ Edition.\n", 
DRVINSTANCE(state)->pm->product_name, DRVINSTANCE(state)->pm->model);
+                       DRVINSTANCE(state)->pm->flags |= PM_DEFAULT_S40_3RD;
+               }
        }
        return error;
 }

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

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


hooks/post-receive
-- 
libgnokii and core programs