[Commits] [SCM] claws branch, master, updated. 3.17.2-18-g23716ce

[ticho at claws-mail.org]

The branch, master has been updated
       via  23716ceb9f2a450193ac5f139ae2dca5acf2539e (commit)
       via  871204805a55779dff39e5f24cc4d0281eec0ae9 (commit)
      from  01179f2c11f78a72f59bb606a6ba5f73c22a7c09 (commit)

Summary of changes:
 src/imap.c         |    7 +++----
 src/inc.c          |    5 ++---
 src/news.c         |    5 ++---
 src/send_message.c |    5 ++---
 4 files changed, 9 insertions(+), 13 deletions(-)


- Log -----------------------------------------------------------------
commit 23716ceb9f2a450193ac5f139ae2dca5acf2539e
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Fri Dec 21 10:45:48 2018 +0100

    Fix a harmless compiler warning in imap_cmd_login().

diff --git a/src/imap.c b/src/imap.c
index 1ce9f39..264dd7d 100644
--- a/src/imap.c
+++ b/src/imap.c
@@ -4091,7 +4091,7 @@ static gint imap_cmd_login(IMAPSession *session,
 	gint ok;
 
 	if (!strcmp(type, "plaintext") && imap_has_capability(session, "LOGINDISABLED")) {
-		gint ok = MAILIMAP_ERROR_BAD_STATE;
+		ok = MAILIMAP_ERROR_BAD_STATE;
 		if (imap_has_capability(session, "STARTTLS")) {
 #ifdef USE_GNUTLS
 			log_warning(LOG_PROTOCOL, _("Server requires STARTTLS to log in.\n"));

commit 871204805a55779dff39e5f24cc4d0281eec0ae9
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Fri Dec 21 10:44:34 2018 +0100

    Fix outdated uses of alertpanel() in code paths for --disable-gnutls.

diff --git a/src/imap.c b/src/imap.c
index 7124d83..1ce9f39 100644
--- a/src/imap.c
+++ b/src/imap.c
@@ -1154,9 +1154,8 @@ static IMAPSession *imap_session_new(Folder * folder,
 			  "Do you want to continue connecting to this "
 			  "server? The communication would not be "
 			  "secure."),
-			  GTK_STOCK_CANCEL, _("Con_tinue connecting"), 
-			  NULL, FALSE, NULL, ALERT_WARNING,
-			  G_ALERTDEFAULT) != G_ALERTALTERNATE)
+			  GTK_STOCK_CANCEL, _("Con_tinue connecting"), NULL,
+				ALERTFOCUS_FIRST, FALSE, NULL, ALERT_WARNING) != G_ALERTALTERNATE)
 			return NULL;
 	}
 	port = account->set_imapport ? account->imapport
diff --git a/src/inc.c b/src/inc.c
index 0711f92..5a0bdff 100644
--- a/src/inc.c
+++ b/src/inc.c
@@ -877,9 +877,8 @@ static IncState inc_pop3_session_do(IncSession *session)
 			  "Do you want to continue connecting to this "
 			  "server? The communication would not be "
 			  "secure."),
-			  GTK_STOCK_CANCEL, _("Con_tinue connecting"), 
-			  NULL, FALSE, NULL, ALERT_WARNING,
-			  G_ALERTDEFAULT) != G_ALERTALTERNATE)
+			  GTK_STOCK_CANCEL, _("Con_tinue connecting"), NULL,
+				ALERTFOCUS_FIRST, FALSE, NULL, ALERT_WARNING) != G_ALERTALTERNATE)
 			return INC_CANCEL;
 	}
 #endif
diff --git a/src/news.c b/src/news.c
index 126db15..1cfb6f8 100644
--- a/src/news.c
+++ b/src/news.c
@@ -406,9 +406,8 @@ static Session *news_session_new_for_folder(Folder *folder)
 			  "Do you want to continue connecting to this "
 			  "server? The communication would not be "
 			  "secure."),
-			  GTK_STOCK_CANCEL, _("Con_tinue connecting"), 
-			  NULL, FALSE, NULL, ALERT_WARNING,
-			  G_ALERTDEFAULT) != G_ALERTALTERNATE)
+			  GTK_STOCK_CANCEL, _("Con_tinue connecting"), NULL,
+				ALERTFOCUS_FIRST, FALSE, NULL, ALERT_WARNING) != G_ALERTALTERNATE)
 			return NULL;
 	}
 	port = ac->set_nntpport ? ac->nntpport : NNTP_PORT;
diff --git a/src/send_message.c b/src/send_message.c
index 820b097..61f5e55 100644
--- a/src/send_message.c
+++ b/src/send_message.c
@@ -290,9 +290,8 @@ gint send_message_smtp_full(PrefsAccount *ac_prefs, GSList *to_list, FILE *fp, g
 				  "Do you want to continue connecting to this "
 				  "server? The communication would not be "
 				  "secure."),
-				  GTK_STOCK_CANCEL, _("Con_tinue connecting"),
-				  NULL, FALSE, NULL, ALERT_WARNING,
-				  G_ALERTDEFAULT) != G_ALERTALTERNATE) {
+				  GTK_STOCK_CANCEL, _("Con_tinue connecting"), NULL,
+					ALERTFOCUS_FIRST, FALSE, NULL, ALERT_WARNING) != G_ALERTALTERNATE) {
 				session_destroy(session);
 				return -1;
 			}

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail