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

diff --git a/ChangeLog b/ChangeLog
index 1fd7405c1457b9b37a37836c7224e5906f2b060c..d5e969243b4b658a4cb056d6e1dbcd61f7530112 100644 (file)
--- 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
index 2ba0b6430b25ac4f75ccc47c18ef24eb01a23253..ba40299bb78dc60861e0be3e17779ccfc5fc88db 100644 (file)
--- 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
index 89630bbfceb1c0889160c0dace25e591a31f0e67..7ffefce6afcca9f778490b17b081f220c587a394 100644 (file)
--- 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
index d7887d540c59fea646dad2d6ce83248e4949d45e..cb8004f832e4d69d16e7654f7c5f59736c4ecca7 100644 (file)
--- 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)