[SCM] libgnokii and core programs branch, master, updated. rel_0_6_28-164-g205936b

[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  205936b91e951651bb1588bc8c30b919702a91f2 (commit)
      from  d6f3113a19959e61d270096a4d5217570a11f0a7 (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=205936b91e951651bb1588bc8c30b919702a91f2


commit 205936b91e951651bb1588bc8c30b919702a91f2
Author: Daniele Forsi <address@hidden>
Date:   Mon Dec 28 18:27:18 2009 +0100

    No need to read spn if we're not going to use it

diff --git a/common/phones/pcsc.c b/common/phones/pcsc.c
index 9b6f9f0..d4a976c 100644
--- a/common/phones/pcsc.c
+++ b/common/phones/pcsc.c
@@ -563,9 +563,6 @@ static gn_error Identify(gn_data *data, struct 
gn_statemachine *state)
                dprintf("ICCID = %s\n", iccid);
        }
 
-       /* read Service Provider Name */
-       (void) get_spn(spn);
-
        /* read IMSI */
        error = get_imsi(imsi);
        if (error == GN_ERR_NONE) {
@@ -581,6 +578,8 @@ static gn_error Identify(gn_data *data, struct 
gn_statemachine *state)
                snprintf(net_code, sizeof(net_code), "%s %s", mcc, mnc);
                /* get operator and country names as strings from libgnokii */
                network_name = gn_network_name_get(net_code);
+               /* read Service Provider Name */
+               (void) get_spn(spn);
                if (*spn && strcmp(spn, network_name))
                        snprintf(data->manufacturer, 
GN_MANUFACTURER_MAX_LENGTH, "%s, %s (%s)", spn, network_name, 
gn_country_name_get(mcc));
                else

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

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


hooks/post-receive
-- 
libgnokii and core programs