[Commits] [SCM] claws branch, master, updated. 3.9.3-115-g59e554f

wwp at claws-mail.org wwp at claws-mail.org
Mon Apr 28 16:49:19 CEST 2014


The branch master of project "claws" (Claws Mail) has been updated
       via  59e554fb4ddcb27d6fe4f2132d26ede355562fa5 (commit)
      from  e58f813baf41ff49f104ada1240028d8c8184ede (commit)


- Log -----------------------------------------------------------------
commit 59e554fb4ddcb27d6fe4f2132d26ede355562fa5
Author: wwp <wwp at free.fr>
Date:   Mon Apr 28 16:45:33 2014 +0200

    Fix possible crash when making use of proxy_checkbox before initiliazing it.

diff --git a/src/plugins/fancy/fancy_prefs.c b/src/plugins/fancy/fancy_prefs.c
index 372cbaf..eae11c6 100644
--- a/src/plugins/fancy/fancy_prefs.c
+++ b/src/plugins/fancy/fancy_prefs.c
@@ -202,8 +202,6 @@ static void create_fancy_prefs_page(PrefsPage *page, GtkWindow *window,
 	gnome_proxy_checkbox = gtk_check_button_new_with_label(_("Use GNOME's proxy settings"));	
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gnome_proxy_checkbox),
 				     fancy_prefs.enable_gnome_proxy);
-	if (fancy_prefs.enable_gnome_proxy)
-		gtk_widget_set_sensitive(proxy_checkbox, FALSE);
 	gtk_box_pack_start(GTK_BOX(vbox_proxy), gnome_proxy_checkbox, FALSE, FALSE, 0);
 	gtk_widget_show(gnome_proxy_checkbox);
 	g_signal_connect(G_OBJECT(gnome_proxy_checkbox), "toggled",
@@ -211,6 +209,10 @@ static void create_fancy_prefs_page(PrefsPage *page, GtkWindow *window,
 #endif
 	proxy_checkbox = gtk_check_button_new_with_label(_("Use proxy:"));
 	proxy_str = gtk_entry_new();
+#ifdef HAVE_LIBSOUP_GNOME
+	if (fancy_prefs.enable_gnome_proxy)
+		gtk_widget_set_sensitive(proxy_checkbox, FALSE);
+#endif
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(proxy_checkbox),
 				     fancy_prefs.enable_proxy);
 	prefs_set_proxy_entry_sens(proxy_checkbox, GTK_ENTRY(proxy_str));

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

Summary of changes:
 src/plugins/fancy/fancy_prefs.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Claws Mail


More information about the Commits mailing list