[SCM] libgnokii and core programs branch, master, updated. rel_0_6_28-170-g0976b9a

[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  0976b9a18e7892453a7f376ec8c168fd28cda72a (commit)
      from  c248f30e8a9ce9060d6fd9336d1db283cbc676d1 (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=0976b9a18e7892453a7f376ec8c168fd28cda72a


commit 0976b9a18e7892453a7f376ec8c168fd28cda72a
Author: Daniele Forsi <address@hidden>
Date:   Fri Feb 12 00:16:32 2010 +0100

    Fix compiling the new code to find config file under Windows and Mac OS X
    
    Fixes this compiler errors:
    cfgreader.c: In function ‘get_locations’:
    cfgreader.c:958: warning: return from incompatible pointer type
    cfgreader.c: At top level:
    cfgreader.c:965: error: redefinition of ‘get_locations’
    cfgreader.c:936: error: previous definition of ‘get_locations’ was here
    gmake[2]: *** [libgnokii_la-cfgreader.lo] Error 1

diff --git a/common/cfgreader.c b/common/cfgreader.c
index 17b3144..8b34b05 100644
--- a/common/cfgreader.c
+++ b/common/cfgreader.c
@@ -927,7 +927,7 @@ static char **get_locations(int *retval)
        snprintf(path, MAX_PATH_LEN, "%s\\gnokiirc", systemroot);
        config_file_locations[2] = strdup(path);
 
-       return retval;
+       return config_file_locations;
 }
 #else /* WIN32 */
 #  ifdef __MACH__
@@ -955,9 +955,9 @@ static char **get_locations(int *retval)
        snprintf(path, MAX_PATH_LEN, "/etc/gnokiirc");
        config_file_locations[2] = strdup(path);
 
-       return retval;
+       return config_file_locations;
 }
-#  endif /* __darwin__ */
+#  else /* !__MACH__ */
 /* freedesktop.org compliancy: 
http://standards.freedesktop.org/basedir-spec/latest/ar01s03.html */
 #define XDG_CONFIG_HOME        "/.config"      /* $HOME/.config */
 #define XDG_CONFIG_DIRS "/etc/xdg"
@@ -1033,7 +1033,8 @@ static char **get_locations(int *retval)
 
        return config_file_locations;
 }
-#endif /* !WIN32 && !__darwin__ */
+#  endif /* !__MACH__ */
+#endif /* !WIN32 */
 
 GNOKII_API gn_error gn_cfg_read_default()
 {

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

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


hooks/post-receive
-- 
libgnokii and core programs