2005-08-03 [colin] 1.9.13cvs12

	* src/prefs_account.c
		Fix bug #777 (Sylpheed crash in account configuration)

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 65acba73eb38f23942f653b1e20c1dc3fd719be9..e2f163d89a0be748ce3754758e73a7d543ea3d34 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,8 @@
+2005-08-03 [colin]     1.9.13cvs12
+
+       * src/prefs_account.c
+               Fix bug #777 (Sylpheed crash in account configuration)
+

 2005-08-03 [colin]     1.9.13cvs11
 
        * src/addressbook.c
 2005-08-03 [colin]     1.9.13cvs11
 
        * src/addressbook.c

diff --git a/PATCHSETS b/PATCHSETS
index 155996c8df39dac40a0aeb4b3f88afe6ebf7aea3..cf9cb094c931754435590865ad0e405a2c7d7842 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -697,3 +697,4 @@
 ( cvs diff -u -r 1.207.2.49 -r 1.207.2.50 src/folderview.c;  ) > 1.9.13cvs9.patchset
 ( cvs diff -u -r 1.27.2.11 -r 1.27.2.12 src/addr_compl.c;  cvs diff -u -r 1.382.2.144 -r 1.382.2.145 src/compose.c;  cvs diff -u -r 1.8.2.7 -r 1.8.2.8 src/headerview.c;  cvs diff -u -r 1.115.2.47 -r 1.115.2.48 src/main.c;  cvs diff -u -r 1.56.2.36 -r 1.56.2.37 src/pop.c;  cvs diff -u -r 1.105.2.28 -r 1.105.2.29 src/prefs_account.c;  cvs diff -u -r 1.49.2.51 -r 1.49.2.52 src/procmime.c;  cvs diff -u -r 1.150.2.32 -r 1.150.2.33 src/procmsg.c;  cvs diff -u -r 1.22.2.10 -r 1.22.2.11 src/quote_fmt_parse.y;  cvs diff -u -r 1.96.2.66 -r 1.96.2.67 src/textview.c;  cvs diff -u -r 1.3.2.2 -r 1.3.2.3 src/common/quoted-printable.c;  cvs diff -u -r 1.36.2.37 -r 1.36.2.38 src/common/utils.c;  cvs diff -u -r 1.20.2.19 -r 1.20.2.20 src/common/utils.h;  cvs diff -u -r 1.1.4.8 -r 1.1.4.9 src/common/xml.c;  cvs diff -u -r 1.4.2.14 -r 1.4.2.15 src/gtk/about.c;  ) > 1.9.13cvs10.patchset
 ( cvs diff -u -r 1.60.2.22 -r 1.60.2.23 src/addressbook.c;  cvs diff -u -r 1.14.2.6 -r 1.14.2.7 src/editaddress.c;  cvs diff -u -r 1.11.2.6 -r 1.11.2.7 src/editgroup.c;  cvs diff -u -r 1.96.2.67 -r 1.96.2.68 src/textview.c;  ) > 1.9.13cvs11.patchset
 ( cvs diff -u -r 1.207.2.49 -r 1.207.2.50 src/folderview.c;  ) > 1.9.13cvs9.patchset
 ( cvs diff -u -r 1.27.2.11 -r 1.27.2.12 src/addr_compl.c;  cvs diff -u -r 1.382.2.144 -r 1.382.2.145 src/compose.c;  cvs diff -u -r 1.8.2.7 -r 1.8.2.8 src/headerview.c;  cvs diff -u -r 1.115.2.47 -r 1.115.2.48 src/main.c;  cvs diff -u -r 1.56.2.36 -r 1.56.2.37 src/pop.c;  cvs diff -u -r 1.105.2.28 -r 1.105.2.29 src/prefs_account.c;  cvs diff -u -r 1.49.2.51 -r 1.49.2.52 src/procmime.c;  cvs diff -u -r 1.150.2.32 -r 1.150.2.33 src/procmsg.c;  cvs diff -u -r 1.22.2.10 -r 1.22.2.11 src/quote_fmt_parse.y;  cvs diff -u -r 1.96.2.66 -r 1.96.2.67 src/textview.c;  cvs diff -u -r 1.3.2.2 -r 1.3.2.3 src/common/quoted-printable.c;  cvs diff -u -r 1.36.2.37 -r 1.36.2.38 src/common/utils.c;  cvs diff -u -r 1.20.2.19 -r 1.20.2.20 src/common/utils.h;  cvs diff -u -r 1.1.4.8 -r 1.1.4.9 src/common/xml.c;  cvs diff -u -r 1.4.2.14 -r 1.4.2.15 src/gtk/about.c;  ) > 1.9.13cvs10.patchset
 ( cvs diff -u -r 1.60.2.22 -r 1.60.2.23 src/addressbook.c;  cvs diff -u -r 1.14.2.6 -r 1.14.2.7 src/editaddress.c;  cvs diff -u -r 1.11.2.6 -r 1.11.2.7 src/editgroup.c;  cvs diff -u -r 1.96.2.67 -r 1.96.2.68 src/textview.c;  ) > 1.9.13cvs11.patchset

+( cvs diff -u -r 1.105.2.29 -r 1.105.2.30 src/prefs_account.c;  ) > 1.9.13cvs12.patchset

diff --git a/configure.ac b/configure.ac
index b4da960a6270687c617336c3800e556ea1b27f8d..dfbad387eff0f1ab4f256e6bc77aa389233087d1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=13
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=13
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=11
+EXTRA_VERSION=12

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/prefs_account.c b/src/prefs_account.c
index 5ca9f0cf868514eb7be4802f7bd0878798637f41..b9cc961e16a7fdbeac204f646048647f75d1e398 100644 (file)
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -375,7 +375,7 @@ static PrefParam param[] = {
         prefs_account_enum_set_data_from_radiobtn,
         prefs_account_enum_set_radiobtn},
        {"signature_path", "~" G_DIR_SEPARATOR_S DEFAULT_SIGNATURE,
         prefs_account_enum_set_data_from_radiobtn,
         prefs_account_enum_set_radiobtn},
        {"signature_path", "~" G_DIR_SEPARATOR_S DEFAULT_SIGNATURE,

-        &tmp_ac_prefs.sig_path, P_STRING,
+        &tmp_ac_prefs.sig_path, P_STRING, &compose.entry_sigpath,

         prefs_set_data_from_entry, prefs_set_entry},
 
        {"auto_signature", "TRUE", &tmp_ac_prefs.auto_sig, P_BOOL,
         prefs_set_data_from_entry, prefs_set_entry},
 
        {"auto_signature", "TRUE", &tmp_ac_prefs.auto_sig, P_BOOL,