2006-06-07 [paul] 2.2.2cvs2
authorPaul Mangan <paul@claws-mail.org>
Wed, 7 Jun 2006 07:30:10 +0000 (07:30 +0000)
committerPaul Mangan <paul@claws-mail.org>
Wed, 7 Jun 2006 07:30:10 +0000 (07:30 +0000)
* src/exporthtml.c
* src/exportldif.c
* src/mh.c
* src/mutt.c
* src/pine.c
* src/common/utils.c
fix Debian bug #370257, 'sylpheed-claws-gtk2 does not
obey $HOME'
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=370257
Thanks to Colin

ChangeLog
PATCHSETS
configure.ac
src/common/utils.c
src/exporthtml.c
src/exportldif.c
src/mh.c
src/mutt.c
src/pine.c

index 999c291..e256c4c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2006-06-07 [paul]      2.2.2cvs2
+
+       * src/exporthtml.c
+       * src/exportldif.c
+       * src/mh.c
+       * src/mutt.c
+       * src/pine.c
+       * src/common/utils.c
+               fix Debian bug #370257, 'sylpheed-claws-gtk2 does not
+               obey $HOME'
+               http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=370257
+               Thanks to Colin
+
 2006-06-06 [paul]      2.2.2cvs1
 
        * configure.ac
index 076fc52..a60bc4f 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.75.2.24 -r 1.75.2.25 src/matcher.c;  ) > 2.2.1cvs5.patchset
 ( cvs diff -u -r 1.75.2.25 -r 1.75.2.26 src/matcher.c;  ) > 2.2.1cvs6.patchset
 ( cvs diff -u -r 1.654.2.1603 -r 1.654.2.1604 configure.ac;  ) > 2.2.2cvs1.patchset
+( cvs diff -u -r 1.5.2.12 -r 1.5.2.13 src/exporthtml.c;  cvs diff -u -r 1.1.4.10 -r 1.1.4.11 src/exportldif.c;  cvs diff -u -r 1.79.2.33 -r 1.79.2.34 src/mh.c;  cvs diff -u -r 1.6.10.7 -r 1.6.10.8 src/mutt.c;  cvs diff -u -r 1.6.2.6 -r 1.6.2.7 src/pine.c;  cvs diff -u -r 1.36.2.64 -r 1.36.2.65 src/common/utils.c;  ) > 2.2.2cvs2.patchset
index 42d6415..00592e8 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=2
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=1
+EXTRA_VERSION=2
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 15f1722..b2a83d2 100644 (file)
@@ -1999,7 +1999,17 @@ const gchar *get_home_dir(void)
        }
        return home_dir;
 #else
-       return g_get_home_dir();
+       const gchar *homeenv = NULL;
+
+       if (homeenv)
+               return homeenv;
+
+       if (!homeenv && g_getenv("HOME") != NULL)
+               homeenv = g_strdup(g_getenv("HOME"));
+       if (!homeenv)
+               homeenv = g_get_home_dir();
+
+       return homeenv;
 #endif
 }
 
index 6b41788..91273bd 100644 (file)
@@ -1143,7 +1143,7 @@ static void exporthtml_default_values( ExportHtmlCtl *ctl ) {
        gchar *str;
 
        str = g_strconcat(
-               g_get_home_dir(), G_DIR_SEPARATOR_S,
+               get_home_dir(), G_DIR_SEPARATOR_S,
                DFL_DIR_SYLPHEED_OUT, NULL );
 
        ctl->dirOutput = mgu_replace_string( ctl->dirOutput, str );
index 7b985a0..c7203c3 100644 (file)
@@ -620,7 +620,7 @@ static void exportldif_default_values( ExportLdifCtl *ctl ) {
        gchar *str;
 
        str = g_strconcat(
-               g_get_home_dir(), G_DIR_SEPARATOR_S,
+               get_home_dir(), G_DIR_SEPARATOR_S,
                DFL_DIR_SYLPHEED_OUT, NULL );
 
        ctl->dirOutput = mgu_replace_string( ctl->dirOutput, str );
index 7035cca..caa4675 100644 (file)
--- a/src/mh.c
+++ b/src/mh.c
@@ -1179,7 +1179,7 @@ static gchar *get_unseen_seq_name(void)
                gchar buf[BUFFSIZE];
                gchar *tmp;
                gchar *profile_path = g_strconcat(
-                       g_get_home_dir(), G_DIR_SEPARATOR_S,
+                       get_home_dir(), G_DIR_SEPARATOR_S,
                        ".mh_profile", NULL);
                FILE *fp = g_fopen(profile_path, "r");
                if (fp) {
index b263d26..00f392b 100644 (file)
@@ -568,7 +568,7 @@ gchar *mutt_find_file( void ) {
        gint len;
        FILE *fp;
 
-       homedir = g_get_home_dir();
+       homedir = get_home_dir();
        if( ! homedir ) return g_strdup( "" );
 
        strcpy( str, homedir );
index 9863c42..50b72c9 100644 (file)
@@ -664,7 +664,7 @@ gchar *pine_find_file( void ) {
        gint len;
        FILE *fp;
 
-       homedir = g_get_home_dir();
+       homedir = get_home_dir();
        if( ! homedir ) return g_strdup( "" );
 
        strcpy( str, homedir );