[SCM] libgnokii and core programs branch, master, updated. rel_0_6_29-555-g268b351

[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  268b3514f7edbab1b21ffb3b23a932f843b60fac (commit)
      from  881fd48aadfa2e77ea332536063bcc145b864cb2 (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=268b3514f7edbab1b21ffb3b23a932f843b60fac


commit 268b3514f7edbab1b21ffb3b23a932f843b60fac
Author: Daniele Forsi <address@hidden>
Date:   Sat Jan 11 14:42:08 2014 +0100

    Drop support for model=pcsc (use model=APDU instead)
    
    It was deprecated in libgnokii 0.6.28 and renamed as model=APDU

diff --git a/ChangeLog b/ChangeLog
index b0ba28f..53333b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -96,6 +96,9 @@
  * build system updates
     o rename configure.in as configure.ac since the former name is
       deprecated                                    (Daniele Forsi)
+ * pcsc driver updates
+    o drop support for model=pcsc that was deprecated in libgnokii
+      0.6.28 and renamed as model=APDU              (Daniele Forsi)
 
 0.6.31
 ======
diff --git a/common/phones/pcsc.c b/common/phones/pcsc.c
index 80a5b13..1af72c2 100644
--- a/common/phones/pcsc.c
+++ b/common/phones/pcsc.c
@@ -77,7 +77,7 @@ gn_driver driver_pcsc = {
        pgen_incoming_default,
        /* Mobile phone information */
        {
-               "pcsc|APDU",           /* Supported models */
+               "APDU",                /* Supported models */
                5,                     /* Unused */ /* Max RF Level */
                0,                     /* Unused */ /* Min RF Level */
                GN_RF_Percentage,      /* Unused */ /* RF level units */
@@ -486,9 +486,6 @@ static gn_error Initialise(struct gn_statemachine *state)
 
        dprintf("Initializing...\n");
 
-       if (!strcmp("pcsc", state->config.model))
-               fprintf(stderr, "WARNING: %s=%s is deprecated and will soon be 
removed. Use %s=%s instead.\n", "model", state->config.model, "model", "APDU");
-
        /* Copy in the phone info */
        memcpy(&(state->driver), &driver_pcsc, sizeof(gn_driver));
 

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

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


hooks/post-receive
-- 
libgnokii and core programs