talons

commit e2770d273b65df12f1686082eedf75ca20646f80
parent 3dcebe96d604706c8c6cf95902553271fef47b27
Author: Colin Leroy <colin@colino.net>
Date:   Tue, 22 Apr 2008 06:41:24 +0000

2008-04-22 [colin]	3.4.0cvs5

	* src/etpan/imap-thread.c
		Use g_(un)setenv instead of (un)setenv which
		doesn't exist on IRIX 6.5

Diffstat:
M
ChangeLog
 | 
6
++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/etpan/imap-thread.c
 | 
25
++++---------------------

4 files changed, 12 insertions(+), 22 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-22 [colin]	3.4.0cvs5
+
+	* src/etpan/imap-thread.c
+		Use g_(un)setenv instead of (un)setenv which
+		doesn't exist on IRIX 6.5
+
 2008-04-22 [colin]	3.4.0cvs4
 
 	* src/inc.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3300,3 +3300,4 @@
 ( cvs diff -u -r 1.6.2.19 -r 1.6.2.20 src/common/log.c;  ) > 3.4.0cvs2.patchset
 ( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/tray_newmail.offline.xpm;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/tray_newmail.xpm;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/tray_newmarkedmail.offline.xpm;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/tray_newmarkedmail.xpm;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/tray_nomail.offline.xpm;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/tray_nomail.xpm;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/tray_unreadmail.offline.xpm;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/tray_unreadmail.xpm;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/tray_unreadmarkedmail.offline.xpm;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/tray_unreadmarkedmail.xpm;  ) > 3.4.0cvs3.patchset
 ( cvs diff -u -r 1.149.2.87 -r 1.149.2.88 src/inc.c;  cvs diff -u -r 1.204.2.164 -r 1.204.2.165 src/prefs_common.c;  cvs diff -u -r 1.17.2.45 -r 1.17.2.46 src/send_message.c;  ) > 3.4.0cvs4.patchset
+( cvs diff -u -r 1.1.4.99 -r 1.1.4.100 src/etpan/imap-thread.c;  ) > 3.4.0cvs5.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=4
+EXTRA_VERSION=5
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/etpan/imap-thread.c b/src/etpan/imap-thread.c
@@ -3105,37 +3105,20 @@ static void do_exec_command(int fd, const char * command,
 		exit(0);
 	}
   
-#ifdef SOLARIS
 	if (servername)
-		snprintf(env_buffer, ENV_BUFFER_SIZE,
-			 "ETPANSERVER=%s", servername);
+		g_setenv("ETPANSERVER", servername, TRUE);
 	else
-		snprintf(env_buffer, ENV_BUFFER_SIZE, "ETPANSERVER=");
-	putenv(env_buffer);
-#else
-	if (servername)
-		setenv("ETPANSERVER", servername, 1);
-	else
-		unsetenv("ETPANSERVER");
-#endif
+		g_unsetenv("ETPANSERVER");
   
-#ifdef SOLARIS
-	if (port)
-		snprintf(env_buffer, ENV_BUFFER_SIZE, "ETPANPORT=%d", port);
-	else
-		snprintf(env_buffer, ENV_BUFFER_SIZE, "ETPANPORT=");
-	putenv(env_buffer);
-#else
 	if (port) {
 		char porttext[20];
 		
 		snprintf(porttext, sizeof(porttext), "%d", port);
-		setenv("ETPANPORT", porttext, 1);
+		g_setenv("ETPANPORT", porttext, TRUE);
 	}
 	else {
-		unsetenv("ETPANPORT");
+		g_unsetenv("ETPANPORT");
 	}
-#endif
 		
 	/* Not a lot we can do if there's an error other than bail. */
 	if (dup2(fd, 0) == -1)