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

diff --git a/ChangeLog b/ChangeLog
index 999c2913d56c1c09fe01544002958a106d45f975..e256c4c4e711379e0e24e56b1e3b7bcaa2519b7d 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

diff --git a/PATCHSETS b/PATCHSETS
index 076fc52f3c6056b039be64dab5c903987eb0f5e9..a60bc4fd051a50cd384cd8785bf154253ed733db 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1559,3 +1559,4 @@
 ( 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

diff --git a/configure.ac b/configure.ac
index 42d6415ba5e6ba01007c5a75bfee9a54958016fb..00592e80085e1a616c7fa6d63a009caabc215dba 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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=
 

diff --git a/src/common/utils.c b/src/common/utils.c
index 15f172206cb2234b1fe365223d1ba942c986b96a..b2a83d216ea2dadb55e823eaab98a9bca16f11e8 100644 (file)
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -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
 }
 

diff --git a/src/exporthtml.c b/src/exporthtml.c
index 6b417882448ea93909d50aca1dadaa0c142386d9..91273bdd33b81eec457c2b2df30ee0d3e12dcd69 100644 (file)
--- a/src/exporthtml.c
+++ b/src/exporthtml.c
@@ -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 );

diff --git a/src/exportldif.c b/src/exportldif.c
index 7b985a0284c9a809da3aba2e031c6cae2444a71d..c7203c38b743a1ef3c6e745d330a6b4041bc041d 100644 (file)
--- a/src/exportldif.c
+++ b/src/exportldif.c
@@ -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 );

diff --git a/src/mh.c b/src/mh.c
index 7035ccaa43d5492da0eb60b41bb8c628297bf38e..caa4675ecf5d313b565ed0d89e9be0077cbd462c 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) {

diff --git a/src/mutt.c b/src/mutt.c
index b263d26393f7121d31984c3c63f33d68bd0a3ccc..00f392b34049523bf2f2375e0f73e0778a7cb373 100644 (file)
--- a/src/mutt.c
+++ b/src/mutt.c
@@ -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 );

diff --git a/src/pine.c b/src/pine.c
index 9863c4290217c902f51abcfdd88ab469fc136baf..50b72c9ca11690806463eb7cc150bbdcb2bae751 100644 (file)
--- a/src/pine.c
+++ b/src/pine.c
@@ -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 );