Some build fixes

5 files changed, 8 insertions, 12 deletions

diff --git a/e-util/e-signature-list.c b/e-util/e-signature-list.c
index 7027682529..7223178d24 100644
--- a/e-util/e-signature-list.c
+++ b/e-util/e-signature-list.c
@@ -281,8 +281,6 @@ e_signature_list_new (void)
 {
 	ESignatureList *signature_list;
 
-	g_return_val_if_fail (GCONF_IS_CLIENT (gconf), NULL);
-
 	signature_list = g_object_new (E_TYPE_SIGNATURE_LIST, NULL);
 	e_signature_list_construct (signature_list, gconf_client_get_default ());
 
diff --git a/e-util/e-signature-list.h b/e-util/e-signature-list.h
index 6ea2934b76..866bc73b65 100644
--- a/e-util/e-signature-list.h
+++ b/e-util/e-signature-list.h
@@ -24,6 +24,7 @@
 #ifndef E_SIGNATURE_LIST_H
 #define E_SIGNATURE_LIST_H
 
+#include <gconf/gconf-client.h>
 #include <libedataserver/e-list.h>
 #include <e-util/e-signature.h>
 
diff --git a/mail/e-mail-label-list-store.c b/mail/e-mail-label-list-store.c
index e9f9c4b509..5ceacb02e7 100644
--- a/mail/e-mail-label-list-store.c
+++ b/mail/e-mail-label-list-store.c
@@ -179,8 +179,8 @@ labels_model_changed_cb (GtkTreeModel *model,
 			 gpointer user_data)
 {
 	EMailLabelListStore *store;
-	GtkTreeIter iter;
 	GPtrArray *array;
+	GtkTreeIter tmp_iter;
 	gboolean res;
 
 	store = E_MAIL_LABEL_LIST_STORE (user_data);
@@ -190,15 +190,15 @@ labels_model_changed_cb (GtkTreeModel *model,
 
 	/* Build list to store in GSettings */
 	array = g_ptr_array_new ();
-	res = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter);
+	res = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &tmp_iter);
 	while (res) {
 		gchar *string;
 
-		gtk_tree_model_get (GTK_TREE_MODEL (store), &iter,
+		gtk_tree_model_get (GTK_TREE_MODEL (store), &tmp_iter,
 				    0, &string, -1);
 		g_ptr_array_add (array, string);
 
-		res = gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter);
+		res = gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &tmp_iter);
 	}
 
 	g_ptr_array_add (array, NULL);
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c
index 2fbd04c5c6..0a48f3d455 100644
--- a/mail/e-mail-reader.c
+++ b/mail/e-mail-reader.c
@@ -1192,7 +1192,7 @@ action_mail_reply_all_check (CamelFolder *folder,
 			GSettings *settings;
 
 			settings = g_settings_new ("org.gnome.evolution.mail");
-			g_settings_set_boolean (settings, "prompt-on-reply-many-recips");
+			g_settings_set_boolean (settings, "prompt-on-reply-many-recips", FALSE);
 			g_object_unref (settings);
 		}
 
@@ -1308,7 +1308,6 @@ action_mail_reply_sender_check (CamelFolder *folder,
 	CamelMimeMessage *message;
 	EMailReplyType type = E_MAIL_REPLY_TO_SENDER;
 	GSettings *settings;
-	const gchar *key;
 	gboolean ask_ignore_list_reply_to;
 	gboolean ask_list_reply_to;
 	gboolean munged_list_message;
@@ -1418,7 +1417,7 @@ action_mail_reply_sender_check (CamelFolder *folder,
 		active = gtk_toggle_button_get_active (
 			GTK_TOGGLE_BUTTON (check_again));
 		if (active) {
-			g_settings_set_boolean (settings, "prompt-on-list-reply-to");
+			g_settings_set_boolean (settings, "prompt-on-list-reply-to", FALSE);
 		}
 
 		active = gtk_toggle_button_get_active (
@@ -1460,7 +1459,6 @@ action_mail_reply_sender_cb (GtkAction *action,
 	gboolean ask_list_reply_to;
 	gboolean ask_private_list_reply;
 	gboolean ask;
-	const gchar *key;
 	guint32 state;
 
 	state = e_mail_reader_check_state (reader);
@@ -3426,7 +3424,6 @@ e_mail_reader_init (EMailReader *reader,
 	EWebView *web_view;
 	GtkActionGroup *action_group;
 	GtkWidget *message_list;
-	GSettings *settings;
 	GtkAction *action;
 	gboolean sensitive;
 	const gchar *action_name;
diff --git a/mail/message-list.c b/mail/message-list.c
index cca1c44de1..e9793355fb 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -2868,7 +2868,7 @@ message_list_construct (MessageList *message_list)
 		E_TREE_MEMORY (message_list->model),
 		g_settings_get_boolean (settings, "thread-expand"));
 	message_list->priv->thread_latest =
-		g_settings_get_boolean (settings, "thread-latest"));
+		g_settings_get_boolean (settings, "thread-latest");
 	g_object_unref (settings);
 
 	/*