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 7619f2e51d79253a05b2c1ed3d041bca6cdb3ab3..918ae27630809e0447000e00dc03f21fdcd73296 100644 (file)
--- 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
 2008-09-25 [paul]      3.5.0cvs130
 
        * src/plugins/smime/mypgpcore.def

diff --git a/PATCHSETS b/PATCHSETS
index 28d385c8d7827c90bdd7fbec7e3cd63de470174b..52488a432537a3d88292391db772f33c832c4bdf 100644 (file)
--- 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.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 2a7ee6fd057e74bd9029cc6d21117fdc7e0b18a1..b8f5037526b60cbb630dda55ae651e51b26325e4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=130
+EXTRA_VERSION=131

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/main.c b/src/main.c
index f3ad3dfa59d84fd480ee8567c570f12ebc7b7a0f..e24ecaf5bb2990e2399110fde505429b07a81ac2 100644 (file)
--- 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 start_done = TRUE;
        GtkUIManager *gui_manager = NULL;
        GSList *plug_list = NULL;

-       gboolean never_ran = TRUE;
+       gboolean never_ran = FALSE;

 
        START_TIMING("startup");
 
 
        START_TIMING("startup");
 


@@ -1543,9 +1543,10 @@ int main(int argc, char *argv[])
                g_slist_free(plug_list);
        }
 
                g_slist_free(plug_list);
        }
 

-       if (never_ran)
+       if (never_ran) {
+               prefs_common_write_config();

                plugin_load_standard_plugins ();
                plugin_load_standard_plugins ();

-      
+       }

        /* if not crashed, show window now */
        if (!claws_crashed()) {
                /* apart if something told not to show */
        /* 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 5243e420da569c4b432947167f24c8a0bfdef053..14e219fe0bf70be10487253b6cbb1354a34526b7 100644 (file)
--- 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
 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
 sgpgme_data_release_and_get_mem
 sgpgme_decrypt_verify
 sgpgme_get_encrypt_data