[Commits] [SCM] claws branch, master, updated. 3.12.0-63-ge111f12

[mones at claws-mail.org]

The branch, master has been updated
       via  e111f1299dd471b9e7890c538e434bf2cbae49c9 (commit)
      from  6267b9b8a6a9cc348e5869461de8844c8b03deb4 (commit)

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


- Log -----------------------------------------------------------------
commit e111f1299dd471b9e7890c538e434bf2cbae49c9
Author: Ricardo Mones <ricardo at mones.org>
Date:   Thu Aug 27 09:48:39 2015 +0200

    Also fix #3209 on initial wizard
    
    And remove unused variables while at it.
    
    From original patches thanks to Christian Hesse!

diff --git a/src/prefs_account.c b/src/prefs_account.c
index d8ceb01..dfe4c17 100644
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -3815,7 +3815,6 @@ static void prefs_account_select_folder_cb(GtkWidget *widget, gpointer data)
 static void auto_configure_cb (GtkWidget *widget, gpointer data)
 {
 	gchar *address = NULL;
-	const gchar *domain = NULL;
 	AutoConfigureData *recv_data;
 	AutoConfigureData *send_data;
 	static GCancellable *recv_cancel = NULL;
diff --git a/src/wizard.c b/src/wizard.c
index c37c815..b856e89 100644
--- a/src/wizard.c
+++ b/src/wizard.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2013 Colin Leroy <colin at colino.net> 
+ * Copyright (C) 1999-2015 Colin Leroy <colin at colino.net>
  * and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
@@ -15,7 +15,6 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * 
  */
 
 #ifdef HAVE_CONFIG_H
@@ -1343,7 +1342,6 @@ static void wizard_protocol_changed(GtkComboBox *combo, gpointer data)
 static void auto_configure_cb (GtkWidget *widget, gpointer data)
 {
 	gchar *address = NULL;
-	const gchar *domain = NULL;
 	AutoConfigureData *recv_data;
 	AutoConfigureData *send_data;
 	static GCancellable *recv_cancel = NULL;
@@ -1380,6 +1378,7 @@ static void auto_configure_cb (GtkWidget *widget, gpointer data)
 		recv_data->configure_button = GTK_BUTTON(wizard->auto_configure_btn);
 		recv_data->cancel_button = GTK_BUTTON(wizard->auto_configure_cancel_btn);
 		recv_data->info_label = GTK_LABEL(wizard->auto_configure_lbl);
+		recv_data->uid_entry = GTK_ENTRY(wizard->recv_username);
 		recv_data->cancel = recv_cancel;
 		switch(protocol) {
 		case A_POP3:

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


hooks/post-receive
-- 
Claws Mail