From: Colin Leroy <colin@colino.net>
Date: Thu, 29 Jun 2006 17:01:39 +0000 (+0000)
Subject: 2006-06-29 [colin]	2.3.1cvs40
X-Git-Tag: rel_2_4_0~58
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=d2216b957f68d074c7b945e0fe38f4a02d376c27;hp=068cd797fd7b083cd214e8d2e27a13dedf26f593

2006-06-29 [colin]	2.3.1cvs40

	* src/main.c
		Fix transient setting on failing plugins
		Patch by Fabien
	* src/plugins/pgpcore/sgpgme.c
		Only warn for OpenPGP. Most people don't
		have CMS available.
---

diff --git a/ChangeLog b/ChangeLog
index 76bf20ce4..bc500858e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-06-29 [colin]	2.3.1cvs40
+
+	* src/main.c
+		Fix transient setting on failing plugins
+		Patch by Fabien
+	* src/plugins/pgpcore/sgpgme.c
+		Only warn for OpenPGP. Most people don't
+		have CMS available.
+
 2006-06-29 [colin]	2.3.1cvs39
 
 	* src/compose.c
diff --git a/PATCHSETS b/PATCHSETS
index 6b5feaa0a..190f8d4c8 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1640,3 +1640,4 @@
 ( cvs diff -u -r 1.60.2.33 -r 1.60.2.34 src/prefs_actions.c;  ) > 2.3.1cvs37.patchset
 ( cvs diff -u -r 1.274.2.119 -r 1.274.2.120 src/mainwindow.c;  ) > 2.3.1cvs38.patchset
 ( cvs diff -u -r 1.382.2.288 -r 1.382.2.289 src/compose.c;  cvs diff -u -r 1.1.2.20 -r 1.1.2.21 src/plugins/pgpcore/sgpgme.c;  ) > 2.3.1cvs39.patchset
+( cvs diff -u -r 1.115.2.92 -r 1.115.2.93 src/main.c;  cvs diff -u -r 1.1.2.21 -r 1.1.2.22 src/plugins/pgpcore/sgpgme.c;  ) > 2.3.1cvs40.patchset
diff --git a/configure.ac b/configure.ac
index 797c058c1..7e87aa69f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=3
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=39
+EXTRA_VERSION=40
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/main.c b/src/main.c
index 04d8d9ce9..1381e292d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -447,6 +447,7 @@ int main(int argc, char *argv[])
 		
 	mainwin = main_window_create
 		(prefs_common.sep_folder | prefs_common.sep_msg << 1);
+	manage_window_focus_in(mainwin->window, NULL, NULL);
 	folderview = mainwin->folderview;
 
 	gtk_clist_freeze(GTK_CLIST(mainwin->folderview->ctree));
@@ -535,14 +536,17 @@ int main(int argc, char *argv[])
 	}
 	
 	if (plugin_get_unloaded_list() != NULL) {
+		main_window_cursor_normal(mainwin);
 		alertpanel_warning(_("Some plugin(s) failed to load. "
 				     "Check the Plugins configuration "
 				     "for more information."));
+		main_window_cursor_wait(mainwin);
 	}
 
  	plugin_load_standard_plugins ();
        
 	if (!folder_have_mailbox()) {
+		main_window_cursor_normal(mainwin);
 		alertpanel_error(_("Sylpheed-Claws has detected a configured "
 				   "mailbox, but could not load it. It is "
 				   "probably provided by an out-of-date "
diff --git a/src/plugins/pgpcore/sgpgme.c b/src/plugins/pgpcore/sgpgme.c
index 37b5bd0d7..0d1ed252b 100644
--- a/src/plugins/pgpcore/sgpgme.c
+++ b/src/plugins/pgpcore/sgpgme.c
@@ -527,7 +527,8 @@ void sgpgme_init()
 					engineInfo->version ? engineInfo->version:"???",
 					engineInfo->req_version ? engineInfo->req_version:"???",
 					engineInfo->file_name ? engineInfo->file_name:"???");
-				if (gpgme_engine_check_version(engineInfo->protocol) != 
+				if (engineInfo->protocol == GPGME_PROTOCOL_OpenPGP
+				&&  gpgme_engine_check_version(engineInfo->protocol) != 
 					GPG_ERR_NO_ERROR) {
 					if (engineInfo->file_name && !engineInfo->version) {
 						alertpanel_error(_("Gpgme protocol '%s' is unusable: "