[Commits] [SCM] claws branch, master, updated. 3.18.0-5-gd64c625f5

[paul at claws-mail.org]

The branch, master has been updated
       via  d64c625f5a1e81a6abe287926818efebdbec7d15 (commit)
      from  cdae53b1c1fc63951644e5396f833ed65370af54 (commit)

Summary of changes:
 src/oauth2.c        | 6 +++---
 src/prefs_account.c | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)


- Log -----------------------------------------------------------------
commit d64c625f5a1e81a6abe287926818efebdbec7d15
Author: paul <paul at claws-mail.org>
Date:   Mon Jul 12 10:31:12 2021 +0100

    fix bug 4495, 'Improve text strings for OAuth2'
    
    based on patch by Marcel Pol

diff --git a/src/oauth2.c b/src/oauth2.c
index 8059b01ab..4fecd4d85 100644
--- a/src/oauth2.c
+++ b/src/oauth2.c
@@ -235,7 +235,7 @@ int oauth2_obtain_tokens (Oauth2Service provider, OAUTH2Data *OAUTH2Data, const
         token = oauth2_get_token_from_response(provider, authcode);
         debug_print("Auth token: %s\n", token);
         if (token == NULL) {
-                log_message(LOG_PROTOCOL, _("OAuth2 missing authentication code\n"));
+                log_message(LOG_PROTOCOL, _("OAuth2 missing authorization code\n"));
                 return (1);
         }
 
@@ -250,7 +250,7 @@ int oauth2_obtain_tokens (Oauth2Service provider, OAUTH2Data *OAUTH2Data, const
 	sock_set_io_timeout(10);
 	sock->gnutls_priority = "NORMAL:!VERS-SSL3.0:!VERS-TLS1.0:!VERS-TLS1.1";
         if (ssl_init_socket(sock) == FALSE) {
-                log_message(LOG_PROTOCOL, _("OAuth2 SSL connection error\n"));
+                log_message(LOG_PROTOCOL, _("OAuth2 SSL/TLS connection error\n"));
                 g_free(token);
                 return (1);
         }
@@ -535,7 +535,7 @@ gint oauth2_check_passwds (PrefsAccount *ac_prefs)
 	  OAUTH2Data->refresh_token = passwd_store_get_account(ac_prefs->account_id, PWS_ACCOUNT_OAUTH2_REFRESH);
 	  ret = oauth2_use_refresh_token (ac_prefs->oauth2_provider, OAUTH2Data);
 	}else if (passwd_store_has_password(PWS_ACCOUNT, uid, PWS_ACCOUNT_OAUTH2_AUTH)) {
-	  log_message(LOG_PROTOCOL, _("OAuth2 trying for fresh access token with auth code\n"));
+	  log_message(LOG_PROTOCOL, _("OAuth2 trying for fresh access token with authorization code\n"));
 	  ret = oauth2_obtain_tokens (ac_prefs->oauth2_provider, OAUTH2Data, 
 				      passwd_store_get_account(ac_prefs->account_id, PWS_ACCOUNT_OAUTH2_AUTH));
 	}else{
diff --git a/src/prefs_account.c b/src/prefs_account.c
index a587db2c0..ae6b10bbf 100644
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2015 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2021 the Claws Mail team and Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -2354,7 +2354,8 @@ static void oauth2_create_widget_func(PrefsPage * _page,
 	oauth2_authcode_entry = gtk_entry_new ();
 	gtk_widget_show (oauth2_authcode_entry);
 	gtk_widget_set_size_request (oauth2_authcode_entry, DEFAULT_ENTRY_WIDTH, -1);
-        gtk_widget_set_tooltip_text(oauth2_authcode_entry, _("Paste complete URL from browser or the provided auth token"));
+        gtk_widget_set_tooltip_text(oauth2_authcode_entry,
+		_("Paste complete URL from browser or the provided authorization token"));
 	gtk_box_pack_start (GTK_BOX (hbox), oauth2_authcode_entry, TRUE, TRUE, 0);
 
 	hbox = gtk_hbox_new (FALSE, 8);

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


hooks/post-receive
-- 
Claws Mail