[SCM] libgnokii and core programs branch, master, updated. rel_0_6_29-88-g3aa947c

[Pawel Kot]

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  3aa947ca8969af818d2c42913a529f884b560595 (commit)
      from  5362cf8999f6ad611edb051f5cec444d44506968 (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=3aa947ca8969af818d2c42913a529f884b560595


commit 3aa947ca8969af818d2c42913a529f884b560595
Author: Pawel Kot <address@hidden>
Date:   Sat Jan 8 15:56:21 2011 +0100

    On Windows use gnokii.ini as the config name.

diff --git a/common/cfgreader.c b/common/cfgreader.c
index acdbb12..d665642 100644
--- a/common/cfgreader.c
+++ b/common/cfgreader.c
@@ -907,6 +907,7 @@ static char **get_locations(int *retval)
        char *appdata, *homedrive, *homepath, *systemroot; /* env variables */
        int size = 3; /* default size for config_file_locations */
        char path[MAX_PATH_LEN];
+       const char *fname = "gnokii.ini";
 
        *retval = size;
 
@@ -917,14 +918,14 @@ static char **get_locations(int *retval)
        homepath = getenv("HOMEPATH");
        systemroot = getenv("SYSTEMROOT");
        /* 1. %APPDATA%\gnokii\config */
-       snprintf(path, MAX_PATH_LEN, "%s\\gnokii\\config", appdata);
+       snprintf(path, MAX_PATH_LEN, "%s\\gnokii\\%s", appdata, fname);
        config_file_locations[0] = strdup(path);
        /* old gnokii behaviour */
        /* 2. %HOMEDRIVE%\%HOMEPATH%\_gnokiirc */
-       snprintf(path, MAX_PATH_LEN, "%s\\%s\\_gnokiirc", homedrive, homepath);
+       snprintf(path, MAX_PATH_LEN, "%s\\%s\\%s", homedrive, homepath, fname);
        config_file_locations[1] = strdup(path);
        /* 3. %SYSTEMROOT%\gnokiirc */
-       snprintf(path, MAX_PATH_LEN, "%s\\gnokiirc", systemroot);
+       snprintf(path, MAX_PATH_LEN, "%s\\%s", systemroot, fname);
        config_file_locations[2] = strdup(path);
 
        return config_file_locations;

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

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


hooks/post-receive
-- 
libgnokii and core programs