gnokii-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: Pawel Kot
Subject: [SCM] libgnokii and core programs branch, master, updated. rel_0_6_29-214-gb2d201a
Date: Fri, 22 Apr 2011 20:52:14 +0000

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  b2d201a6ae09cfb52b7a402a54856299548e69b9 (commit)
      from  9914511ca7744c6c094b0b6a74af7b9f16f117cb (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=b2d201a6ae09cfb52b7a402a54856299548e69b9


commit b2d201a6ae09cfb52b7a402a54856299548e69b9
Author: Pawel Kot <address@hidden>
Date:   Fri Apr 22 22:47:33 2011 +0200

    config: change the order of the config file lookup
    
    If $XDG_CONFIG_DIRS/gnokii/config was found $HOME/.gnokiirc was ignored.
    Even though this location is deprecated, it is very confusing to users.
    Current lookup order will be:
     1. $XDG_CONFIG_HOME/gnokii/config
     2. $HOME/.gnokiirc
     3. $XDG_CONFIG_DIRS/gnokii/config
     4. /etc/gnokiirc
    
    Related user report:
    http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=623694

diff --git a/ChangeLog b/ChangeLog
index cff81da..126f75a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,9 @@
       creating multipart messages                       (Paweł Kot)
     o add possibility to disable setting serial port speed and
       DTR and RTS bits                                  (Paweł Kot)
+    o change the order of lookup for the config file
+      (http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=623694)
+                                                        (Paweł Kot)
  * nk6510 driver updates
     o fix calendar handling issues (few off-by-ones)    (Paweł Kot)
     o implement deletecalendarnote for series40 3rd+ Ed (Paweł Kot)
diff --git a/Docs/man/gnokii.1 b/Docs/man/gnokii.1
index c2e495b..a0f572f 100644
--- a/Docs/man/gnokii.1
+++ b/Docs/man/gnokii.1
@@ -38,10 +38,9 @@ incompatible. DO NOT use \fImodel = 6110\fP or \fImodel = 
3110\fP setting for th
 reads configuration from \fIfilename\fR instead of trying default locations.
 Normally gnokii looks for config file in
 \fI$XDG_CONFIG_HOME/gnokii/config\fR (which is usually
-\fI$HOME/.config/gnokii/config\fR),
+\fI$HOME/.config/gnokii/config\fR), \fI$HOME/.gnokiirc\fR (legacy),
 \fI$XDG_CONFIG_DIRS/gnokii/config\fR (which is usually
-\fI/etc/xdg/gnokii/config\fR),
-\fI$HOME/.gnokiirc\fR (legacy) and \fI/etc/gnokiirc\fR (legacy).
+\fI/etc/xdg/gnokii/config\fR) and \fI/etc/gnokiirc\fR (legacy).
 .TP 
 .BR "\-\-phone \fIname\fP"
 usees parameters from the given phone section of your config file. A phone 
section named 'foo' starts with [phone_foo] and is used as \-\-phone foo
diff --git a/common/cfgreader.c b/common/cfgreader.c
index 626f3d6..b882edd 100644
--- a/common/cfgreader.c
+++ b/common/cfgreader.c
@@ -1122,7 +1122,13 @@ static char **get_locations(int *retval)
        config_file_locations = calloc(size, sizeof(char *));
        config_file_locations[(*retval)++] = strdup(path);
 
-       /* 2. $XDG_CONFIG_DIRS/gnokii/config (/etc/xdg) */
+       /* old gnokii behaviour */
+       /* 2. $HOME/.gnokiirc */
+       snprintf(path, MAX_PATH_LEN, "%s/.gnokiirc", home);
+       config_file_locations[(*retval)++] = strdup(path);
+       CHECK_SIZE();
+
+       /* 3. $XDG_CONFIG_DIRS/gnokii/config (/etc/xdg) */
        for (j = 0; j < i; j++) {
                snprintf(path, MAX_PATH_LEN, "%s/gnokii/config", 
xdg_config_dir[j]);
                config_file_locations[(*retval)++] = strdup(path);
@@ -1132,12 +1138,6 @@ static char **get_locations(int *retval)
        free(xdg_config_dir);
 
        /* old gnokii behaviour */
-
-       /* 3. $HOME/.gnokiirc */
-       snprintf(path, MAX_PATH_LEN, "%s/.gnokiirc", home);
-       config_file_locations[(*retval)++] = strdup(path);
-       CHECK_SIZE();
-
        /* 4. /etc/gnokiirc */
        snprintf(path, MAX_PATH_LEN, "/etc/gnokiirc");
        config_file_locations[(*retval)++] = strdup(path);

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

Summary of changes:
 ChangeLog          |    3 +++
 Docs/man/gnokii.1  |    5 ++---
 common/cfgreader.c |   14 +++++++-------
 3 files changed, 12 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
libgnokii and core programs



reply via email to

[Prev in Thread] Current Thread [Next in Thread]