Fix compiler warnings.

8 files changed, 3 insertions, 10 deletions

diff --git a/mail/e-mail-attachment-bar.c b/mail/e-mail-attachment-bar.c
index f3567f2887..c07d0e8707 100644
--- a/mail/e-mail-attachment-bar.c
+++ b/mail/e-mail-attachment-bar.c
@@ -256,7 +256,6 @@ mail_attachment_bar_constructed (GObject *object)
 {
 	EMailAttachmentBarPrivate *priv;
 	GSettings *settings;
-	const gchar *key;
 
 	priv = E_MAIL_ATTACHMENT_BAR (object)->priv;
 
diff --git a/mail/e-mail-browser.c b/mail/e-mail-browser.c
index aaa12b1d14..1125510915 100644
--- a/mail/e-mail-browser.c
+++ b/mail/e-mail-browser.c
@@ -559,7 +559,6 @@ mail_browser_constructed (GObject *object)
 	GtkWidget *widget;
 	EWebView *web_view;
 	const gchar *domain;
-	const gchar *key;
 	const gchar *id;
 	guint merge_id;
 
diff --git a/mail/e-mail-label-list-store.c b/mail/e-mail-label-list-store.c
index 5ceacb02e7..ed8efb72b1 100644
--- a/mail/e-mail-label-list-store.c
+++ b/mail/e-mail-label-list-store.c
@@ -202,7 +202,9 @@ labels_model_changed_cb (GtkTreeModel *model,
 	}
 
 	g_ptr_array_add (array, NULL);
-	g_settings_set_strv (store->priv->mail_settings, "labels", array->pdata);
+	g_settings_set_strv (
+		store->priv->mail_settings, "labels",
+		(const gchar * const *) array->pdata);
 
 	g_ptr_array_free (array, TRUE);
 	g_signal_handlers_unblock_by_func (store->priv->mail_settings, labels_settings_changed_cb, store);
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c
index 0a48f3d455..22b1e0e7c6 100644
--- a/mail/e-mail-reader.c
+++ b/mail/e-mail-reader.c
@@ -3427,7 +3427,6 @@ e_mail_reader_init (EMailReader *reader,
 	GtkAction *action;
 	gboolean sensitive;
 	const gchar *action_name;
-	const gchar *key;
 
 #ifndef G_OS_WIN32
 	GSettings *settings;
diff --git a/mail/e-mail-session.c b/mail/e-mail-session.c
index f4fcbb26af..4f863af242 100644
--- a/mail/e-mail-session.c
+++ b/mail/e-mail-session.c
@@ -70,8 +70,6 @@
 	(G_TYPE_INSTANCE_GET_PRIVATE \
 	((obj), E_TYPE_MAIL_SESSION, EMailSessionPrivate))
 
-static guint session_check_junk_notify_id;
-
 typedef struct _AsyncContext AsyncContext;
 
 struct _EMailSessionPrivate {
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index 85fc96d751..e571e84f60 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -2792,7 +2792,6 @@ composer_set_body (EMsgComposer *composer,
 	GSettings *settings;
 	gboolean start_bottom, has_body_text = FALSE;
 	guint32 validity_found = 0;
-	const gchar *key;
 
 	settings = g_settings_new ("org.gnome.evolution.mail");
 
@@ -2839,7 +2838,6 @@ composer_set_body (EMsgComposer *composer,
 		GtkhtmlEditor *editor = GTKHTML_EDITOR (composer);
 		gboolean move_cursor_to_end;
 		gboolean top_signature;
-		const gchar *key;
 
 		/* If we are placing signature on top, then move cursor to the end,
 		 * otherwise try to find the signature place and place cursor just
diff --git a/mail/em-folder-properties.c b/mail/em-folder-properties.c
index 6c8b97aa32..310aa76740 100644
--- a/mail/em-folder-properties.c
+++ b/mail/em-folder-properties.c
@@ -254,7 +254,6 @@ emfp_dialog_run (AsyncContext *context)
 	gboolean hide_deleted;
 	GSettings *settings;
 	const gchar *name;
-	const gchar *key;
 
 	shell_view = context->shell_view;
 	shell_window = e_shell_view_get_shell_window (shell_view);
diff --git a/mail/message-list.c b/mail/message-list.c
index e9793355fb..1b8f0d16fd 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -5010,7 +5010,6 @@ mail_regen_list (MessageList *ml,
 {
 	struct _regen_list_msg *m;
 	GSettings *settings;
-	const gchar *key;
 	gboolean thread_subject;
 
 	/* report empty search as NULL, not as one/two-space string */