Remove dead assignments found by clang.

16 files changed, 7 insertions, 67 deletions

diff --git a/mail/e-mail-attachment-bar.c b/mail/e-mail-attachment-bar.c
index ae98aad926..6b50aac304 100644
--- a/mail/e-mail-attachment-bar.c
+++ b/mail/e-mail-attachment-bar.c
@@ -99,7 +99,6 @@ mail_attachment_bar_update_status (EMailAttachmentBar *bar)
 	EAttachmentView *view;
 	EAttachmentStore *store;
 	GtkActivatable *activatable;
-	GtkExpander *expander;
 	GtkAction *action;
 	GtkLabel *label;
 	gint num_attachments;
@@ -109,7 +108,6 @@ mail_attachment_bar_update_status (EMailAttachmentBar *bar)
 
 	view = E_ATTACHMENT_VIEW (bar);
 	store = e_attachment_view_get_store (view);
-	expander = GTK_EXPANDER (bar->priv->expander);
 	label = GTK_LABEL (bar->priv->status_label);
 
 	num_attachments = e_attachment_store_get_num_attachments (store);
diff --git a/mail/e-mail-label-list-store.c b/mail/e-mail-label-list-store.c
index ba9bf41694..ed0d4cdd6b 100644
--- a/mail/e-mail-label-list-store.c
+++ b/mail/e-mail-label-list-store.c
@@ -171,11 +171,9 @@ static void
 mail_label_list_store_constructed (GObject *object)
 {
 	EMailLabelListStore *store;
-	GtkTreeModel *model;
 	GConfBridge *bridge;
 	const gchar *key;
 
-	model = GTK_TREE_MODEL (object);
 	store = E_MAIL_LABEL_LIST_STORE (object);
 
 	bridge = gconf_bridge_get ();
diff --git a/mail/e-mail-migrate.c b/mail/e-mail-migrate.c
index f67ea38c5b..16cdead783 100644
--- a/mail/e-mail-migrate.c
+++ b/mail/e-mail-migrate.c
@@ -2918,7 +2918,6 @@ migrate_to_db (EShellBackend *shell_backend)
 	store = setup_local_store (shell_backend, session);
 	info = camel_store_get_folder_info (store, NULL, CAMEL_STORE_FOLDER_INFO_RECURSIVE|CAMEL_STORE_FOLDER_INFO_FAST|CAMEL_STORE_FOLDER_INFO_SUBSCRIBED, NULL);
 	if (info) {
-		GThread *thread;
 		struct migrate_folders_to_db_structure migrate_dbs;
 
 		if (g_str_has_suffix (((CamelService *)store)->url->path, ".evolution/mail/local"))
@@ -2931,7 +2930,7 @@ migrate_to_db (EShellBackend *shell_backend)
 		migrate_dbs.store = store;
 		migrate_dbs.done = FALSE;
 
-		thread = g_thread_create ((GThreadFunc) migrate_folders_to_db_thread, &migrate_dbs, TRUE, NULL);
+		g_thread_create ((GThreadFunc) migrate_folders_to_db_thread, &migrate_dbs, TRUE, NULL);
 		while (!migrate_dbs.done)
 			g_main_context_iteration (NULL, TRUE);
 	}
@@ -2959,7 +2958,6 @@ migrate_to_db (EShellBackend *shell_backend)
 			store = (CamelStore *) camel_session_get_service (CAMEL_SESSION (session), service->url, CAMEL_PROVIDER_STORE, &ex);
 			info = camel_store_get_folder_info (store, NULL, CAMEL_STORE_FOLDER_INFO_RECURSIVE|CAMEL_STORE_FOLDER_INFO_FAST|CAMEL_STORE_FOLDER_INFO_SUBSCRIBED, &ex);
 			if (info) {
-				GThread *thread;
 				struct migrate_folders_to_db_structure migrate_dbs;
 
 				migrate_dbs.ex = ex;
@@ -2968,7 +2966,7 @@ migrate_to_db (EShellBackend *shell_backend)
 				migrate_dbs.store = store;
 				migrate_dbs.done = FALSE;
 
-				thread = g_thread_create ((GThreadFunc) migrate_folders_to_db_thread, &migrate_dbs, TRUE, NULL);
+				g_thread_create ((GThreadFunc) migrate_folders_to_db_thread, &migrate_dbs, TRUE, NULL);
 				while (!migrate_dbs.done)
 					g_main_context_iteration (NULL, TRUE);
 			} else
diff --git a/mail/e-mail-reader-utils.c b/mail/e-mail-reader-utils.c
index 8249187057..b525345d4a 100644
--- a/mail/e-mail-reader-utils.c
+++ b/mail/e-mail-reader-utils.c
@@ -354,7 +354,6 @@ e_mail_reader_reply_to_message (EMailReader *reader,
 	CamelMimeMessage *new_message;
 	CamelMimeMessage *src_message;
 	CamelFolder *folder;
-	GtkWindow *window;
 	GtkHTML *html;
 	struct _camel_header_raw *header;
 	const gchar *uid;
@@ -372,7 +371,6 @@ e_mail_reader_reply_to_message (EMailReader *reader,
 
 	folder = e_mail_reader_get_folder (reader);
 	message_list = e_mail_reader_get_message_list (reader);
-	window = e_mail_reader_get_window (reader);
 
 	uid = MESSAGE_LIST (message_list)->cursor_uid;
 	g_return_if_fail (uid != NULL);
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c
index 5689a96ce0..c94749b5a5 100644
--- a/mail/e-mail-reader.c
+++ b/mail/e-mail-reader.c
@@ -328,12 +328,10 @@ action_mail_flag_for_followup_cb (GtkAction *action,
                                   EMailReader *reader)
 {
 	CamelFolder *folder;
-	GtkWindow *window;
 	GPtrArray *uids;
 
 	folder = e_mail_reader_get_folder (reader);
 	uids = e_mail_reader_get_selected_uids (reader);
-	window = e_mail_reader_get_window (reader);
 
 	em_utils_flag_for_followup (reader, folder, uids);
 }
@@ -515,12 +513,10 @@ action_mail_message_edit_cb (GtkAction *action,
                              EMailReader *reader)
 {
 	CamelFolder *folder;
-	GtkWindow *window;
 	GPtrArray *uids;
 
 	folder = e_mail_reader_get_folder (reader);
 	uids = e_mail_reader_get_selected_uids (reader);
-	window = e_mail_reader_get_window (reader);
 
 	em_utils_edit_messages (folder, uids, FALSE);
 }
@@ -743,12 +739,10 @@ action_mail_redirect_cb (GtkAction *action,
 {
 	GtkWidget *message_list;
 	CamelFolder *folder;
-	GtkWindow *window;
 	const gchar *uid;
 
 	folder = e_mail_reader_get_folder (reader);
 	message_list = e_mail_reader_get_message_list (reader);
-	window = e_mail_reader_get_window (reader);
 
 	uid = MESSAGE_LIST (message_list)->cursor_uid;
 	g_return_if_fail (uid != NULL);
@@ -2021,7 +2015,6 @@ mail_reader_update_actions (EMailReader *reader)
 	EShellBackend *shell_backend;
 	EShellSettings *shell_settings;
 	GtkAction *action;
-	GtkActionGroup *action_group;
 	const gchar *action_name;
 	gboolean sensitive;
 	guint32 state;
@@ -2045,7 +2038,6 @@ mail_reader_update_actions (EMailReader *reader)
 	gboolean selection_is_mailing_list;
 	gboolean single_message_selected;
 
-	action_group = e_mail_reader_get_action_group (reader);
 	state = e_mail_reader_check_state (reader);
 
 	shell_backend = e_mail_reader_get_shell_backend (reader);
diff --git a/mail/e-mail-sidebar.c b/mail/e-mail-sidebar.c
index bde8c010c6..1465f46393 100644
--- a/mail/e-mail-sidebar.c
+++ b/mail/e-mail-sidebar.c
@@ -52,7 +52,6 @@ static void
 mail_sidebar_restore_state (EMailSidebar *sidebar)
 {
 	EMFolderTree *folder_tree;
-	GtkTreeModel *tree_model;
 	GKeyFile *key_file;
 	gchar *selected;
 
@@ -63,7 +62,6 @@ mail_sidebar_restore_state (EMailSidebar *sidebar)
 		return;
 
 	folder_tree = EM_FOLDER_TREE (sidebar);
-	tree_model = gtk_tree_view_get_model (GTK_TREE_VIEW (sidebar));
 
 	/* Restore selected folder. */
 
diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c
index 7951240de0..6d25004f23 100644
--- a/mail/em-account-editor.c
+++ b/mail/em-account-editor.c
@@ -2413,7 +2413,6 @@ emae_option_options (EMAccountEditorService *service, CamelURL *url, const gchar
 	/* value and caption */
 	store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
 
-	p = values;
 	for (p = values, i = 0; p; i++) {
 		gchar *vl, *cp;
 
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index e998c42bf0..6dfd7cb05c 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -2031,7 +2031,7 @@ attribution_format (const gchar *format, CamelMimeMessage *message)
 
 	gmtime_r (&date, &tm);
 
-	start = inptr = format;
+	inptr = format;
 	while (*inptr != '\0') {
 		start = inptr;
 		while (*inptr && strncmp (inptr, "${", 2) != 0)
diff --git a/mail/em-filter-editor.c b/mail/em-filter-editor.c
index ecc1bbcb23..667ee085be 100644
--- a/mail/em-filter-editor.c
+++ b/mail/em-filter-editor.c
@@ -40,7 +40,7 @@ static gpointer parent_class;
 static EFilterRule *
 filter_editor_create_rule (ERuleEditor *rule_editor)
 {
-	EFilterRule *rule = e_filter_rule_new ();
+	EFilterRule *rule;
 	EFilterPart *part;
 
 	/* create a rule with 1 part & 1 action in it */
diff --git a/mail/em-folder-selection-button.c b/mail/em-folder-selection-button.c
index d90f9ce2ce..76c16769a2 100644
--- a/mail/em-folder-selection-button.c
+++ b/mail/em-folder-selection-button.c
@@ -190,17 +190,6 @@ folder_selection_button_finalize (GObject *object)
 }
 
 static void
-folder_selection_button_destroy (GtkObject *object)
-{
-	EMFolderSelectionButtonPrivate *priv;
-
-	priv = EM_FOLDER_SELECTION_BUTTON_GET_PRIVATE (object);
-
-	/* Chain up to parent's destroy() method. */
-	GTK_OBJECT_CLASS (parent_class)->destroy (object);
-}
-
-static void
 folder_selection_button_clicked (GtkButton *button)
 {
 	EMFolderSelectionButtonPrivate *priv;
@@ -269,7 +258,6 @@ static void
 folder_selection_button_class_init (EMFolderSelectionButtonClass *class)
 {
 	GObjectClass *object_class;
-	GtkObjectClass *gtk_object_class;
 	GtkButtonClass *button_class;
 
 	parent_class = g_type_class_peek_parent (class);
@@ -280,9 +268,6 @@ folder_selection_button_class_init (EMFolderSelectionButtonClass *class)
 	object_class->get_property = folder_selection_button_get_property;
 	object_class->finalize = folder_selection_button_finalize;
 
-	gtk_object_class = GTK_OBJECT_CLASS (class);
-	gtk_object_class->destroy = folder_selection_button_destroy;
-
 	button_class = GTK_BUTTON_CLASS (class);
 	button_class->clicked = folder_selection_button_clicked;
 
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index 7720ec9e1f..356a544fb7 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -248,7 +248,6 @@ folder_tree_get_folder_info__done (struct _EMFolderTreeGetFolderInfo *m)
 	gtk_tree_model_iter_children (model, &iter, &root);
 
 	/* Traverse to the last valid iter, or the "Loading..." node */
-	titer = iter;
 	do {
 		gboolean is_store_node = FALSE, is_folder_node = FALSE;
 
@@ -488,7 +487,6 @@ folder_tree_maybe_expand_row (EMFolderTreeModel *model,
 {
 	EMFolderTreePrivate *priv = folder_tree->priv;
 	struct _EMFolderTreeModelStoreInfo *si;
-	GtkTreeView *tree_view;
 	gboolean is_store;
 	CamelStore *store;
 	EAccount *account;
@@ -496,8 +494,6 @@ folder_tree_maybe_expand_row (EMFolderTreeModel *model,
 	gchar *key;
 	struct _selected_uri *u;
 
-	tree_view = GTK_TREE_VIEW (folder_tree);
-
 	gtk_tree_model_get ((GtkTreeModel *) model, iter,
 			    COL_STRING_FULL_NAME, &full_name,
 			    COL_POINTER_CAMEL_STORE, &store,
@@ -2029,7 +2025,6 @@ tree_drag_motion (GtkWidget *widget, GdkDragContext *context, gint x, gint y, gu
 void
 em_folder_tree_enable_drag_and_drop (EMFolderTree *folder_tree)
 {
-	EMFolderTreePrivate *priv;
 	GtkTreeView *tree_view;
 	static gint setup = 0;
 	gint i;
@@ -2038,7 +2033,6 @@ em_folder_tree_enable_drag_and_drop (EMFolderTree *folder_tree)
 
 	tree_view = GTK_TREE_VIEW (folder_tree);
 
-	priv = folder_tree->priv;
 	if (!setup) {
 		for (i=0; i<NUM_DRAG_TYPES; i++)
 			drag_atoms[i] = gdk_atom_intern(drag_types[i].target, FALSE);
diff --git a/mail/em-format-html.c b/mail/em-format-html.c
index b9db3d16e4..801bc8430b 100644
--- a/mail/em-format-html.c
+++ b/mail/em-format-html.c
@@ -1191,7 +1191,6 @@ em_format_html_file_part(EMFormatHTML *efh, const gchar *mime_type, const gchar
 	if (stream == NULL)
 		return NULL;
 
-	part = camel_mime_part_new();
 	dw = camel_data_wrapper_new();
 	camel_data_wrapper_construct_from_stream(dw, stream);
 	camel_object_unref(stream);
@@ -1741,11 +1740,8 @@ efh_text_enriched(EMFormatHTML *efh, CamelStream *stream, CamelMimePart *part, E
 {
 	CamelStreamFilter *filtered_stream;
 	CamelMimeFilter *enriched;
-	CamelDataWrapper *dw;
 	guint32 flags = 0;
 
-	dw = camel_medium_get_content_object((CamelMedium *)part);
-
 	if (!strcmp(info->mime_type, "text/richtext")) {
 		flags = CAMEL_MIME_FILTER_ENRICHED_IS_RICHTEXT;
 		camel_stream_write_string( stream, "\n<!-- text/richtext -->\n");
@@ -1799,8 +1795,6 @@ static void
 efh_text_html(EMFormatHTML *efh, CamelStream *stream, CamelMimePart *part, EMFormatHandler *info)
 {
 	const gchar *location;
-	/* This is set but never used for anything */
-	EMFormatPURI *puri;
 	gchar *cid = NULL;
 
 	camel_stream_printf (
@@ -1839,7 +1833,7 @@ efh_text_html(EMFormatHTML *efh, CamelStream *stream, CamelMimePart *part, EMFor
 		}
 	}
 
-	puri = em_format_add_puri((EMFormat *)efh, sizeof(EMFormatPURI), cid, part, efh_write_text_html);
+	em_format_add_puri((EMFormat *)efh, sizeof(EMFormatPURI), cid, part, efh_write_text_html);
 	d(printf("adding iframe, location %s\n", cid));
 	camel_stream_printf(stream,
 			    "<iframe src=\"%s\" frameborder=0 scrolling=no>could not get %s</iframe>\n"
diff --git a/mail/em-inline-filter.c b/mail/em-inline-filter.c
index 5daae1109b..1959b0b7f8 100644
--- a/mail/em-inline-filter.c
+++ b/mail/em-inline-filter.c
@@ -196,7 +196,7 @@ emif_scan(CamelMimeFilter *f, gchar *in, gsize len, gint final)
 	EMInlineFilter *emif = (EMInlineFilter *)f;
 	gchar *inptr = in, *inend = in+len;
 	gchar *data_start = in;
-	gchar *start = in;
+	gchar *start;
 
 	while (inptr < inend) {
 		start = inptr;
diff --git a/mail/em-subscribe-editor.c b/mail/em-subscribe-editor.c
index 76fec73616..4211fdac05 100644
--- a/mail/em-subscribe-editor.c
+++ b/mail/em-subscribe-editor.c
@@ -475,20 +475,9 @@ static void sub_do_changed(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *
 static void
 sub_selection_changed(GtkTreeSelection *selection, EMSubscribe *sub)
 {
-	gint dosub = TRUE, dounsub = TRUE;
-
 	sub->selected_count = 0;
 	sub->selected_subscribed_count = 0;
 	gtk_tree_selection_selected_foreach(selection, sub_do_changed, sub);
-
-	if (sub->selected_count == 0) {
-		dosub = FALSE;
-		dounsub = FALSE;
-	} else if (sub->selected_subscribed_count == sub->selected_count)
-		dosub = FALSE;
-	else if (sub->selected_subscribed_count == 0)
-		dounsub = FALSE;
-
 }
 
 /* double-clicking causes a node item to be evaluated directly */
diff --git a/mail/em-vfolder-editor.c b/mail/em-vfolder-editor.c
index 0522e4925c..1a928acf39 100644
--- a/mail/em-vfolder-editor.c
+++ b/mail/em-vfolder-editor.c
@@ -42,7 +42,7 @@ static gpointer parent_class;
 static EFilterRule *
 vfolder_editor_create_rule (ERuleEditor *rule_editor)
 {
-	EFilterRule *rule = e_filter_rule_new ();
+	EFilterRule *rule;
 	EFilterPart *part;
 
 	/* create a rule with 1 part in it */
diff --git a/mail/importers/pine-importer.c b/mail/importers/pine-importer.c
index c3d4b15bf8..873fc93c46 100644
--- a/mail/importers/pine-importer.c
+++ b/mail/importers/pine-importer.c
@@ -66,15 +66,12 @@ struct _pine_import_msg {
 static gboolean
 pine_supported(EImport *ei, EImportTarget *target, EImportImporter *im)
 {
-	EImportTargetHome *s;
 	gchar *maildir, *addrfile;
 	gboolean md_exists, addr_exists;
 
 	if (target->type != E_IMPORT_TARGET_HOME)
 		return FALSE;
 
-	s = (EImportTargetHome *)target;
-
 	maildir = g_build_filename(g_get_home_dir (), "mail", NULL);
 	md_exists = g_file_test(maildir, G_FILE_TEST_IS_DIR);
 	g_free(maildir);