[Commits] [SCM] claws branch, master, updated. 3.13.2-35-gf2c16c5

[Colin]

The branch, master has been updated
       via  f2c16c568e087c313883c5e5356e06a2f594e3cc (commit)
       via  476dc684ebb1cae602bb5658e139706fd9b76ded (commit)
       via  667a3121702bd86d385ccd706e054422b126dd26 (commit)
      from  483f9b039ebac3c95313b596df060571f5f00840 (commit)

Summary of changes:
 src/account.c   |    3 +++
 src/prefs_gtk.c |    6 ++++--
 2 files changed, 7 insertions(+), 2 deletions(-)


- Log -----------------------------------------------------------------
commit f2c16c568e087c313883c5e5356e06a2f594e3cc
Author: Colin Leroy <colin at colino.net>
Date:   Thu Feb 11 10:33:10 2016 +0100

    Fix another g_log warning

diff --git a/src/account.c b/src/account.c
index bc3e5b4..58dfab9 100644
--- a/src/account.c
+++ b/src/account.c
@@ -375,6 +375,9 @@ GList *account_get_list(void)
 
 void account_edit_focus(void)
 {
+	if (edit_account.window == NULL) {
+		return;
+	}
 	manage_window_set_transient(GTK_WINDOW(edit_account.window));
 	gtk_widget_grab_focus(edit_account.close_btn);
 	gtk_widget_show(edit_account.window);

commit 476dc684ebb1cae602bb5658e139706fd9b76ded
Author: Colin Leroy <colin at colino.net>
Date:   Thu Feb 11 10:27:36 2016 +0100

    Fix indentation, sorry

diff --git a/src/prefs_gtk.c b/src/prefs_gtk.c
index f6cd077..f04a5e5 100644
--- a/src/prefs_gtk.c
+++ b/src/prefs_gtk.c
@@ -687,10 +687,10 @@ void prefs_set_entry(PrefParam *pparam)
 		break;
 	case P_PASSWORD:
 		str = (gchar **)pparam->data;
-        decrypted_pass = password_decrypt(*str, NULL);
+		decrypted_pass = password_decrypt(*str, NULL);
 		gtk_entry_set_text(GTK_ENTRY(*pparam->widget),
-				(decrypted_pass != NULL ? decrypted_pass : ""));
-        g_free(decrypted_pass);
+			(decrypted_pass != NULL ? decrypted_pass : ""));
+		g_free(decrypted_pass);
 		break;
 	default:
 		g_warning("Invalid PrefType for GtkEntry widget: %d",

commit 667a3121702bd86d385ccd706e054422b126dd26
Author: Colin Leroy <colin at colino.net>
Date:   Thu Feb 11 10:25:06 2016 +0100

    Fix a leak and g_log() in case of null passwords

diff --git a/src/prefs_gtk.c b/src/prefs_gtk.c
index 68840bf..f6cd077 100644
--- a/src/prefs_gtk.c
+++ b/src/prefs_gtk.c
@@ -668,7 +668,7 @@ void prefs_set_escaped_data_from_entry(PrefParam *pparam)
 void prefs_set_entry(PrefParam *pparam)
 {
 	gchar **str;
-
+    char *decrypted_pass = NULL;
 	cm_return_if_fail(*pparam->widget != NULL);
 
 	switch (pparam->type) {
@@ -687,8 +687,10 @@ void prefs_set_entry(PrefParam *pparam)
 		break;
 	case P_PASSWORD:
 		str = (gchar **)pparam->data;
+        decrypted_pass = password_decrypt(*str, NULL);
 		gtk_entry_set_text(GTK_ENTRY(*pparam->widget),
-				password_decrypt(*str, NULL));
+				(decrypted_pass != NULL ? decrypted_pass : ""));
+        g_free(decrypted_pass);
 		break;
 	default:
 		g_warning("Invalid PrefType for GtkEntry widget: %d",

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


hooks/post-receive
-- 
Claws Mail