[SCM] libgnokii and core programs branch, master, updated. rel_0_6_29-154-g461f37d

[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  461f37df0c2dfc7d3e18a339368b4a7d0b73f233 (commit)
      from  7693ab59e577a093ac3da47ed21529723ed7f0b7 (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=461f37df0c2dfc7d3e18a339368b4a7d0b73f233


commit 461f37df0c2dfc7d3e18a339368b4a7d0b73f233
Author: Daniele Forsi <address@hidden>
Date:   Sun Jan 30 12:01:49 2011 +0100

    Print filenames it tried to open only if no config file could be used
    
    Previuolsy they were thought as informational messages but they could be
    confusing so print them only in case of fatal error.

diff --git a/ChangeLog b/ChangeLog
index 2d120fc..4189330 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,7 +6,9 @@
     o GSM number type is rather mask than define; use it as such
       when parsing the input                            (Paweł Kot)
     o avoid overruns in phonet                          (Paweł Kot)
- * nk6510 driver updates
+    o print names of config files it tried to open only if none
+      could be used                                 (Daniele Forsi)
+* nk6510 driver updates
     o fix calendar handling issues (few off-by-ones)    (Paweł Kot)
     o implement deletecalendarnote for series40 3rd+ Ed (Paweł Kot)
  * gnokii updates
diff --git a/common/cfgreader.c b/common/cfgreader.c
index ebeb212..1d252aa 100644
--- a/common/cfgreader.c
+++ b/common/cfgreader.c
@@ -1126,13 +1126,15 @@ GNOKII_API gn_error gn_cfg_read_default()
 
        config_file_locations = get_locations(&num);
 
+       for (i = 0; i < num && error != GN_ERR_NONE; i++) {
+               error = gn_cfg_file_read(config_file_locations[i]);
+       }
        for (i = 0; i < num; i++) {
-               if (error != GN_ERR_NONE)
-                       error = gn_cfg_file_read(config_file_locations[i]);
+               /* If it couldn't read any config show all filenames tried */
                if (error != GN_ERR_NONE)
                        fprintf(stderr, _("Couldn't read %s config file.\n"), 
config_file_locations[i]);
                free(config_file_locations[i]);
-       }               
+       }
        free(config_file_locations);
        return error;
 }

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

Summary of changes:
 ChangeLog          |    4 +++-
 common/cfgreader.c |    8 +++++---
 2 files changed, 8 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
libgnokii and core programs