Fix compiler warnings.

Mostly dead assignments.

5 files changed, 0 insertions, 15 deletions

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");