talons

commit 3d00d863235ddd9f91682d0fe4e61e009fae84a9
parent 94ec9cac487444dc672e26aff5cdf3e90f1f6e4b
Author: Paweł Pękala <c0rn@gazeta.pl>
Date:   Mon, 21 Nov 2011 22:58:21 +0000

2011-11-21 [pawel]	3.7.10cvs98

	* src/prefs_account.c
		Fix bug #2116 'Rip spaces off server names in account
		configuration'
		g_strstrip() domain names to be sure they are valid

Diffstat:
M
ChangeLog
 | 
7
+++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/prefs_account.c
 | 
10
+++++++++-

4 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+2011-11-21 [pawel]	3.7.10cvs98
+
+	* src/prefs_account.c
+		Fix bug #2116 'Rip spaces off server names in account
+		configuration'
+		g_strstrip() domain names to be sure they are valid
+
 2011-11-21 [pawel]	3.7.10cvs97
 
 	* src/account.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4301,3 +4301,4 @@
 ( cvs diff -u -r 1.60.2.75 -r 1.60.2.76 src/prefs_actions.c;  cvs diff -u -r 1.59.2.84 -r 1.59.2.85 src/prefs_filtering.c;  cvs diff -u -r 1.12.2.79 -r 1.12.2.80 src/prefs_template.c;  ) > 3.7.10cvs95.patchset
 ( cvs diff -u -r 1.60.2.58 -r 1.60.2.59 src/filtering.c;  cvs diff -u -r 1.21.2.19 -r 1.21.2.20 src/filtering.h;  cvs diff -u -r 1.60.2.76 -r 1.60.2.77 src/prefs_actions.c;  ) > 3.7.10cvs96.patchset
 ( cvs diff -u -r 1.61.2.101 -r 1.61.2.102 src/account.c;  cvs diff -u -r 1.59.2.85 -r 1.59.2.86 src/prefs_filtering.c;  cvs diff -u -r 1.6.2.10 -r 1.6.2.11 src/prefs_filtering.h;  ) > 3.7.10cvs97.patchset
+( cvs diff -u -r 1.105.2.170 -r 1.105.2.171 src/prefs_account.c;  ) > 3.7.10cvs98.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=97
+EXTRA_VERSION=98
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/prefs_account.c b/src/prefs_account.c
@@ -3698,8 +3698,16 @@ PrefsAccount *prefs_account_open(PrefsAccount *ac_prefs, gboolean *dirty)
 	if (cancelled && new_account) {
 		prefs_account_free(ac_prefs);
 		return NULL;
-	} else 
+	} else {
+		if (ac_prefs->recv_server)
+			g_strstrip(ac_prefs->recv_server);
+		if (ac_prefs->smtp_server)
+			g_strstrip(ac_prefs->smtp_server);
+		if (ac_prefs->nntp_server)
+			g_strstrip(ac_prefs->nntp_server);
+
 		return ac_prefs;
+	}
 }
 
 #if !GTK_CHECK_VERSION(3, 0, 0)