From: Colin Leroy <colin@colino.net>
Date: Thu, 25 Sep 2008 14:53:37 +0000 (+0000)
Subject: 2008-09-25 [colin]	3.5.0cvs131
X-Git-Tag: rel_3_6_0~17
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=89f2ee5e88e12300fd54c624affa673dccb2c5aa

2008-09-25 [colin]	3.5.0cvs131

	* src/main.c
		Fix bug 1725, 'useless lines in clawsrc'
	* src/plugins/smime/mypgpcore.def
		Add a missing symbol
---

diff --git a/ChangeLog b/ChangeLog
index 7619f2e51..918ae2763 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-09-25 [colin]	3.5.0cvs131
+
+	* src/main.c
+		Fix bug 1725, 'useless lines in clawsrc'
+	* src/plugins/smime/mypgpcore.def
+		Add a missing symbol
+
 2008-09-25 [paul]	3.5.0cvs130
 
 	* src/plugins/smime/mypgpcore.def
diff --git a/PATCHSETS b/PATCHSETS
index 28d385c8d..52488a432 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3542,3 +3542,4 @@
 ( cvs diff -u -r 1.65.2.61 -r 1.65.2.62 src/codeconv.c;  ) > 3.5.0cvs128.patchset
 ( cvs diff -u -r 1.115.2.207 -r 1.115.2.208 src/main.c;  ) > 3.5.0cvs129.patchset
 ( diff -u /dev/null src/plugins/smime/mypgpcore.def;  diff -u /dev/null src/plugins/smime/plugin.def;  diff -u /dev/null src/plugins/smime/version.rc;  ) > 3.5.0cvs130.patchset
+( cvs diff -u -r 1.115.2.208 -r 1.115.2.209 src/main.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/smime/mypgpcore.def;  ) > 3.5.0cvs131.patchset
diff --git a/configure.ac b/configure.ac
index 2a7ee6fd0..b8f503752 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=130
+EXTRA_VERSION=131
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/main.c b/src/main.c
index f3ad3dfa5..e24ecaf5b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1053,7 +1053,7 @@ int main(int argc, char *argv[])
 	gboolean start_done = TRUE;
 	GtkUIManager *gui_manager = NULL;
 	GSList *plug_list = NULL;
-	gboolean never_ran = TRUE;
+	gboolean never_ran = FALSE;
 
 	START_TIMING("startup");
 
@@ -1543,9 +1543,10 @@ int main(int argc, char *argv[])
 		g_slist_free(plug_list);
 	}
 
-	if (never_ran)
+	if (never_ran) {
+		prefs_common_write_config();
 	 	plugin_load_standard_plugins ();
-      
+	}
 	/* if not crashed, show window now */
 	if (!claws_crashed()) {
 		/* apart if something told not to show */
diff --git a/src/plugins/smime/mypgpcore.def b/src/plugins/smime/mypgpcore.def
index 5243e420d..14e219fe0 100644
--- a/src/plugins/smime/mypgpcore.def
+++ b/src/plugins/smime/mypgpcore.def
@@ -6,6 +6,7 @@ prefs_gpg_enable_agent
 prefs_gpg_get_config
 prefs_gpg_remove_skip_encryption_warning
 prefs_gpg_should_skip_encryption_warning
+sgpgme_data_from_mimeinfo
 sgpgme_data_release_and_get_mem
 sgpgme_decrypt_verify
 sgpgme_get_encrypt_data