Fix compiler warnings.

Mostly dead assignments.

12 files changed, 1 insertions, 42 deletions

diff --git a/e-util/e-account-utils.c b/e-util/e-account-utils.c
index 636dea7426..fd3b6ee653 100644
--- a/e-util/e-account-utils.c
+++ b/e-util/e-account-utils.c
@@ -345,10 +345,7 @@ e_get_subscribable_accounts (CamelSession *session)
 
 		if (account->enabled) {
 			CamelService *service;
-			const gchar *url;
 
-			url = e_account_get_string (
-				account, E_ACCOUNT_SOURCE_URL);
 			service = camel_session_get_service (
 				session, account->uid);
 			if (CAMEL_IS_STORE (service))
diff --git a/mail/e-mail-folder-pane.c b/mail/e-mail-folder-pane.c
index 1527b14771..1c5f8e3032 100644
--- a/mail/e-mail-folder-pane.c
+++ b/mail/e-mail-folder-pane.c
@@ -71,7 +71,6 @@ mail_paned_view_open_selected_mail (EMailPanedView *view)
 	gint i;
 	GtkWindow *window;
 	CamelFolder *folder;
-	const gchar *folder_uri;
 	GPtrArray *views;
 	guint n_views, ii;
 
@@ -89,7 +88,6 @@ mail_paned_view_open_selected_mail (EMailPanedView *view)
 	}
 
 	folder = e_mail_reader_get_folder (reader);
-	folder_uri = e_mail_reader_get_folder_uri (reader);
 	if (em_utils_folder_is_drafts (folder) ||
 		em_utils_folder_is_outbox (folder) ||
 		em_utils_folder_is_templates (folder)) {
@@ -103,7 +101,6 @@ mail_paned_view_open_selected_mail (EMailPanedView *view)
 		const gchar *uid = uids->pdata[ii];
 		CamelFolder *real_folder;
 		CamelMessageInfo *info;
-		const gchar *real_folder_uri;
 		gchar *real_uid;
 
 		if (!CAMEL_IS_VEE_FOLDER (folder)) {
@@ -118,7 +115,6 @@ mail_paned_view_open_selected_mail (EMailPanedView *view)
 		real_folder = camel_vee_folder_get_location (
 			CAMEL_VEE_FOLDER (folder),
 			(CamelVeeMessageInfo *) info, &real_uid);
-		real_folder_uri = camel_folder_get_uri (real_folder);
 
 		if (em_utils_folder_is_drafts (real_folder) ||
 			em_utils_folder_is_outbox (real_folder)) {
diff --git a/mail/e-mail-notebook-view.c b/mail/e-mail-notebook-view.c
index d5a7965bab..0a73508cbf 100644
--- a/mail/e-mail-notebook-view.c
+++ b/mail/e-mail-notebook-view.c
@@ -890,7 +890,6 @@ mail_netbook_view_open_mail (EMailView *view,
 {
 	EMailNotebookViewPrivate *priv;
 	EShellView *shell_view;
-	const gchar *folder_uri;
 	CamelFolder *folder;
 	EMailView *pane;
 	gint page;
@@ -922,7 +921,6 @@ mail_netbook_view_open_mail (EMailView *view,
 	gtk_widget_show (GTK_WIDGET (pane));
 
 	folder = e_mail_reader_get_folder (E_MAIL_READER (view));
-	folder_uri = e_mail_reader_get_folder_uri (E_MAIL_READER (view));
 
 	info = camel_folder_get_message_info (folder, uid);
 
diff --git a/mail/e-mail-reader-utils.c b/mail/e-mail-reader-utils.c
index cccc728cd3..5953f64006 100644
--- a/mail/e-mail-reader-utils.c
+++ b/mail/e-mail-reader-utils.c
@@ -222,14 +222,12 @@ e_mail_reader_open_selected (EMailReader *reader)
 	GtkWindow *window;
 	GPtrArray *views;
 	GPtrArray *uids;
-	const gchar *folder_uri;
 	guint ii;
 
 	g_return_val_if_fail (E_IS_MAIL_READER (reader), 0);
 
 	backend = e_mail_reader_get_backend (reader);
 	folder = e_mail_reader_get_folder (reader);
-	folder_uri = e_mail_reader_get_folder_uri (reader);
 	uids = e_mail_reader_get_selected_uids (reader);
 	window = e_mail_reader_get_window (reader);
 
@@ -255,7 +253,6 @@ e_mail_reader_open_selected (EMailReader *reader)
 		const gchar *uid = uids->pdata[ii];
 		CamelFolder *real_folder;
 		CamelMessageInfo *info;
-		const gchar *real_folder_uri;
 		gchar *real_uid;
 
 		if (!CAMEL_IS_VEE_FOLDER (folder)) {
@@ -270,7 +267,6 @@ e_mail_reader_open_selected (EMailReader *reader)
 		real_folder = camel_vee_folder_get_location (
 			CAMEL_VEE_FOLDER (folder),
 			(CamelVeeMessageInfo *) info, &real_uid);
-		real_folder_uri = camel_folder_get_uri (real_folder);
 
 		if (em_utils_folder_is_drafts (real_folder) ||
 			em_utils_folder_is_outbox (real_folder)) {
@@ -535,7 +531,6 @@ e_mail_reader_create_filter_from_selected (EMailReader *reader,
 	EMailSession *session;
 	CamelFolder *folder;
 	const gchar *filter_source;
-	const gchar *folder_uri;
 	GPtrArray *uids;
 
 	struct {
@@ -546,12 +541,10 @@ e_mail_reader_create_filter_from_selected (EMailReader *reader,
 
 	g_return_if_fail (E_IS_MAIL_READER (reader));
 
+	folder = e_mail_reader_get_folder (reader);
 	backend = e_mail_reader_get_backend (reader);
 	session = e_mail_backend_get_session (backend);
 
-	folder = e_mail_reader_get_folder (reader);
-	folder_uri = e_mail_reader_get_folder_uri (reader);
-
 	if (em_utils_folder_is_sent (folder))
 		filter_source = E_FILTER_SOURCE_OUTGOING;
 	else if (em_utils_folder_is_outbox (folder))
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c
index e0ef3940c0..3cf8d1f1ef 100644
--- a/mail/e-mail-reader.c
+++ b/mail/e-mail-reader.c
@@ -912,13 +912,11 @@ action_mail_message_edit_cb (GtkAction *action,
 	EMailBackend *backend;
 	EShellBackend *shell_backend;
 	CamelFolder *folder;
-	const gchar *folder_uri;
 	GPtrArray *uids;
 	gboolean replace;
 
 	backend = e_mail_reader_get_backend (reader);
 	folder = e_mail_reader_get_folder (reader);
-	folder_uri = e_mail_reader_get_folder_uri (reader);
 	uids = e_mail_reader_get_selected_uids (reader);
 
 	shell_backend = E_SHELL_BACKEND (backend);
@@ -3772,7 +3770,6 @@ e_mail_reader_check_state (EMailReader *reader)
 	GPtrArray *uids;
 	CamelFolder *folder;
 	CamelStore *store = NULL;
-	const gchar *folder_uri;
 	const gchar *tag;
 	gboolean can_clear_flags = FALSE;
 	gboolean can_flag_completed = FALSE;
@@ -3796,7 +3793,6 @@ e_mail_reader_check_state (EMailReader *reader)
 	g_return_val_if_fail (E_IS_MAIL_READER (reader), 0);
 
 	folder = e_mail_reader_get_folder (reader);
-	folder_uri = e_mail_reader_get_folder_uri (reader);
 	uids = e_mail_reader_get_selected_uids (reader);
 
 	if (folder != NULL) {
diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c
index e720fb81ed..5147b65635 100644
--- a/mail/em-account-editor.c
+++ b/mail/em-account-editor.c
@@ -1997,7 +1997,6 @@ emae_check_authtype (GtkWidget *w,
 	EMailSession *session;
 	EAccount *account;
 	GtkWidget *editor;
-	const gchar *uri;
 	gchar *uid;
 
 	account = em_account_editor_get_modified_account (emae);
@@ -2005,8 +2004,6 @@ emae_check_authtype (GtkWidget *w,
 
 	session = em_account_editor_get_session (emae);
 
-	/* TODO: do we need to remove the auth mechanism from the uri? */
-	uri = e_account_get_string (account, emae_service_info[service->type].account_uri_key);
 	g_object_ref (emae);
 
 	service->check_dialog = e_alert_dialog_new_for_args (editor ? (GtkWindow *)gtk_widget_get_toplevel (editor) : (GtkWindow *)gtk_widget_get_toplevel (w),
diff --git a/modules/addressbook/e-book-shell-content.c b/modules/addressbook/e-book-shell-content.c
index 35167e330a..0f46a221c7 100644
--- a/modules/addressbook/e-book-shell-content.c
+++ b/modules/addressbook/e-book-shell-content.c
@@ -214,7 +214,6 @@ static void
 book_shell_content_constructed (GObject *object)
 {
 	EBookShellContentPrivate *priv;
-	EShell *shell;
 	EShellView *shell_view;
 	EShellWindow *shell_window;
 	EShellContent *shell_content;
@@ -231,7 +230,6 @@ book_shell_content_constructed (GObject *object)
 	shell_view = e_shell_content_get_shell_view (shell_content);
 	shell_window = e_shell_view_get_shell_window (shell_view);
 	shell_taskbar = e_shell_view_get_shell_taskbar (shell_view);
-	shell = e_shell_window_get_shell (shell_window);
 
 	container = GTK_WIDGET (object);
 
diff --git a/modules/calendar/e-memo-shell-content.c b/modules/calendar/e-memo-shell-content.c
index 9e280e36ff..f9224b1462 100644
--- a/modules/calendar/e-memo-shell-content.c
+++ b/modules/calendar/e-memo-shell-content.c
@@ -411,9 +411,7 @@ static void
 memo_shell_content_constructed (GObject *object)
 {
 	EMemoShellContentPrivate *priv;
-	EShell *shell;
 	EShellView *shell_view;
-	EShellBackend *shell_backend;
 	EShellContent *shell_content;
 	EShellTaskbar *shell_taskbar;
 	EShellWindow *shell_window;
@@ -431,10 +429,8 @@ memo_shell_content_constructed (GObject *object)
 
 	shell_content = E_SHELL_CONTENT (object);
 	shell_view = e_shell_content_get_shell_view (shell_content);
-	shell_backend = e_shell_view_get_shell_backend (shell_view);
 	shell_taskbar = e_shell_view_get_shell_taskbar (shell_view);
 	shell_window = e_shell_view_get_shell_window (shell_view);
-	shell = e_shell_backend_get_shell (shell_backend);
 
 	priv->memo_model = e_cal_model_memos_new ();
 
diff --git a/modules/calendar/e-task-shell-content.c b/modules/calendar/e-task-shell-content.c
index dbfa5fb7fc..b7937fb8f6 100644
--- a/modules/calendar/e-task-shell-content.c
+++ b/modules/calendar/e-task-shell-content.c
@@ -409,7 +409,6 @@ static void
 task_shell_content_constructed (GObject *object)
 {
 	ETaskShellContentPrivate *priv;
-	EShell *shell;
 	EShellContent *shell_content;
 	EShellTaskbar *shell_taskbar;
 	EShellWindow *shell_window;
@@ -430,7 +429,6 @@ task_shell_content_constructed (GObject *object)
 	shell_view = e_shell_content_get_shell_view (shell_content);
 	shell_taskbar = e_shell_view_get_shell_taskbar (shell_view);
 	shell_window = e_shell_view_get_shell_window (shell_view);
-	shell = e_shell_window_get_shell (shell_window);
 
 	priv->task_model = e_cal_model_tasks_new ();
 
diff --git a/modules/mail/e-mail-shell-view-private.c b/modules/mail/e-mail-shell-view-private.c
index c6a034bf40..2faecab695 100644
--- a/modules/mail/e-mail-shell-view-private.c
+++ b/modules/mail/e-mail-shell-view-private.c
@@ -952,7 +952,6 @@ e_mail_shell_view_create_filter_from_selected (EMailShellView *mail_shell_view,
 	EMailView *mail_view;
 	CamelFolder *folder;
 	const gchar *filter_source;
-	const gchar *folder_uri;
 	GPtrArray *uids;
 
 	struct {
@@ -974,7 +973,6 @@ e_mail_shell_view_create_filter_from_selected (EMailShellView *mail_shell_view,
 
 	reader = E_MAIL_READER (mail_view);
 	folder = e_mail_reader_get_folder (reader);
-	folder_uri = e_mail_reader_get_folder_uri (reader);
 	uids = e_mail_reader_get_selected_uids (reader);
 
 	if (em_utils_folder_is_sent (folder))
@@ -1089,7 +1087,6 @@ e_mail_shell_view_update_sidebar (EMailShellView *mail_shell_view)
 	GString *buffer;
 	const gchar *display_name;
 	const gchar *folder_name;
-	const gchar *folder_uri;
 	gchar *title;
 	guint32 num_deleted;
 	guint32 num_junked;
@@ -1107,7 +1104,6 @@ e_mail_shell_view_update_sidebar (EMailShellView *mail_shell_view)
 
 	reader = E_MAIL_READER (mail_view);
 	folder = e_mail_reader_get_folder (reader);
-	folder_uri = e_mail_reader_get_folder_uri (reader);
 
 	local_store = e_mail_local_get_store ();
 
diff --git a/modules/mail/e-mail-shell-view.c b/modules/mail/e-mail-shell-view.c
index 1c1a86785e..ea707d0086 100644
--- a/modules/mail/e-mail-shell-view.c
+++ b/modules/mail/e-mail-shell-view.c
@@ -233,7 +233,6 @@ mail_shell_view_execute_search (EShellView *shell_view)
 	GList *list, *iter;
 	GSList *search_strings = NULL;
 	const gchar *folder_uri;
-	const gchar *data_dir;
 	const gchar *text;
 	gboolean valid;
 	gchar *query;
@@ -267,8 +266,6 @@ mail_shell_view_execute_search (EShellView *shell_view)
 	folder_uri = e_mail_reader_get_folder_uri (reader);
 	message_list = e_mail_reader_get_message_list (reader);
 
-	data_dir = e_shell_backend_get_data_dir (shell_backend);
-
 	/* This returns a new object reference. */
 	model = e_shell_settings_get_object (
 		shell_settings, "mail-label-list-store");
diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c
index 96dadab0ea..d93f2f5384 100644
--- a/plugins/itip-formatter/itip-formatter.c
+++ b/plugins/itip-formatter/itip-formatter.c
@@ -2260,7 +2260,6 @@ in_proper_folder (CamelFolder *folder)
 	EMailBackend *backend;
 	EMailSession *session;
 	MailFolderCache *folder_cache;
-	const gchar *folder_uri;
 	gboolean res = TRUE;
 	gint flags = 0;
 
@@ -2273,8 +2272,6 @@ in_proper_folder (CamelFolder *folder)
 	session = e_mail_backend_get_session (backend);
 	folder_cache = e_mail_session_get_folder_cache (session);
 
-	folder_uri = camel_folder_get_uri (folder);
-
 	if (mail_folder_cache_get_folder_info_flags (folder_cache, folder, &flags)) {
 		/* it should be neither trash nor junk folder, */
 		res = ((flags & CAMEL_FOLDER_TYPE_TRASH) !=  CAMEL_FOLDER_TYPE_TRASH &&