Remove dead assignments found by clang.

15 files changed, 17 insertions, 61 deletions

diff --git a/plugins/backup-restore/backup.c b/plugins/backup-restore/backup.c
index ca7ab293ee..3da8755bf0 100644
--- a/plugins/backup-restore/backup.c
+++ b/plugins/backup-restore/backup.c
@@ -358,15 +358,13 @@ thread_start (gpointer data)
 static gboolean
 idle_cb(gpointer data)
 {
-	GThread *t;
-
 	if (gui_arg) {
 		/* Show progress dialog */
 		gtk_progress_bar_pulse ((GtkProgressBar *)pbar);
 		g_timeout_add (50, pbar_update, NULL);
 	}
 
-	t = g_thread_create (thread_start, NULL, FALSE, NULL);
+	g_thread_create (thread_start, NULL, FALSE, NULL);
 
 	return FALSE;
 }
diff --git a/plugins/bbdb/bbdb.c b/plugins/bbdb/bbdb.c
index a6bba6eec1..a9056b1d34 100644
--- a/plugins/bbdb/bbdb.c
+++ b/plugins/bbdb/bbdb.c
@@ -315,7 +315,6 @@ bbdb_do_it (EBook *book, const gchar *name, const gchar *email)
 	EBookQuery *query;
 	GList *contacts, *l;
 	EContact *contact;
-	gboolean status;
 	GError *error = NULL;
 
 	g_return_if_fail (book != NULL);
@@ -337,7 +336,7 @@ bbdb_do_it (EBook *book, const gchar *name, const gchar *email)
 	query = e_book_query_from_string (query_string);
 	g_free (query_string);
 
-	status = e_book_get_contacts (book, query, &contacts, NULL);
+	e_book_get_contacts (book, query, &contacts, NULL);
 	if (query)
 		e_book_query_unref (query);
 	if (contacts != NULL) {
@@ -366,7 +365,7 @@ bbdb_do_it (EBook *book, const gchar *name, const gchar *email)
 	query = e_book_query_from_string (query_string);
 	g_free (query_string);
 
-	status = e_book_get_contacts (book, query, &contacts, NULL);
+	e_book_get_contacts (book, query, &contacts, NULL);
 	if (query)
 		e_book_query_unref (query);
 	if (contacts != NULL) {
diff --git a/plugins/contacts-map/contacts-map.c b/plugins/contacts-map/contacts-map.c
index be3f9b1ff9..868930035d 100644
--- a/plugins/contacts-map/contacts-map.c
+++ b/plugins/contacts-map/contacts-map.c
@@ -41,8 +41,6 @@ void show_map_general (ESourceSelector *selector);
 gboolean
 addressbook_map_init (GtkUIManager *ui_manager, EShellView *shell_view)
 {
-	EShell *shell;
-	EShellSettings *shell_settings;
 	EShellWindow *shell_window;
 	GtkActionGroup *action_group;
 	GtkAction *action;
@@ -52,8 +50,6 @@ addressbook_map_init (GtkUIManager *ui_manager, EShellView *shell_view)
 	const gchar *label;
 
 	shell_window = e_shell_view_get_shell_window (shell_view);
-	shell = e_shell_window_get_shell (shell_window);
-	shell_settings = e_shell_get_shell_settings (shell);
 
 	name = "contacts-map";
 	label = _("Contacts map");
diff --git a/plugins/email-custom-header/email-custom-header.c b/plugins/email-custom-header/email-custom-header.c
index ad9310daa4..84452b28a9 100644
--- a/plugins/email-custom-header/email-custom-header.c
+++ b/plugins/email-custom-header/email-custom-header.c
@@ -92,21 +92,19 @@ epech_get_widgets_data (CustomHeaderOptionsDialog *mch)
 	EmailCustomHeaderOptionsDialogPrivate *priv;
 	HeaderValueComboBox *sub_combo_box_get;
 	gint selected_item;
-	gint index_row,index_column;
+	gint index_column;
 
 	priv = mch->priv;
 	priv->header_index_type = g_array_new (FALSE, FALSE, sizeof (gint));
 	priv->flag++;
 
-	for (index_row = 0,index_column = 0;
+	for (index_column = 0;
 		index_column < priv->email_custom_header_details->len; index_column++) {
 
 		sub_combo_box_get = &g_array_index(priv->combo_box_header_value, HeaderValueComboBox,index_column);
 		selected_item = gtk_combo_box_get_active((GtkComboBox *)sub_combo_box_get->header_value_combo_box);
 		g_array_append_val (priv->header_index_type, selected_item);
 	}
-
-	return;
 }
 
 static gboolean
@@ -134,12 +132,12 @@ epech_fill_widgets_with_data (CustomHeaderOptionsDialog *mch)
 {
 	EmailCustomHeaderOptionsDialogPrivate *priv;
 	HeaderValueComboBox *sub_combo_box_fill;
-	gint set_index_row,set_index_column;
+	gint set_index_column;
 
 	priv = mch->priv;
 	priv->help_section = g_strdup ("usage-mail");
 
-	for (set_index_row = 0,set_index_column = 0;
+	for (set_index_column = 0;
 		set_index_column < priv->email_custom_header_details->len;set_index_column++) {
 		sub_combo_box_fill = &g_array_index(priv->combo_box_header_value, HeaderValueComboBox,set_index_column);
 
@@ -312,7 +310,7 @@ epech_setup_widgets (CustomHeaderOptionsDialog *mch)
 	HeaderValueComboBox sub_combo_box = {NULL};
 	HeaderValueComboBox *sub_combo_box_ptr;
 	gint sub_index,row_combo,column_combo;
-	gint header_section_id,sub_type_index,row,column,label_row;
+	gint header_section_id,sub_type_index,row,column;
 	gint i;
 	gchar *str;
 	static const gchar *security_field = N_("Security:");
@@ -331,7 +329,7 @@ epech_setup_widgets (CustomHeaderOptionsDialog *mch)
 	priv = mch->priv;
 	priv->combo_box_header_value = g_array_new (TRUE, FALSE, sizeof (HeaderValueComboBox));
 
-	for (header_section_id = 0,label_row = 0,row = 0,column = 1;
+	for (header_section_id = 0,row = 0,column = 1;
 		header_section_id < priv->email_custom_header_details->len; header_section_id++,row++,column++) {
 
 		/* To create an empty label widget. Text will be added dynamically. */
@@ -458,14 +456,14 @@ epech_append_to_custom_header (CustomHeaderOptionsDialog *dialog, gint state, gp
 	EmailCustomHeaderOptionsDialogPrivate *priv;
 	EmailCustomHeaderDetails *temp_header_ptr;
 	CustomSubHeader *temp_header_value_ptr;
-	gint index, index_subtype,sub_type_index;
+	gint index_subtype,sub_type_index;
 
 	composer = (EMsgComposer *)data;
 	priv = dialog->priv;
 
 	if (state == GTK_RESPONSE_OK) {
 
-		for (index = 0,index_subtype = 0; index_subtype < priv->email_custom_header_details->len; index_subtype++) {
+		for (index_subtype = 0; index_subtype < priv->email_custom_header_details->len; index_subtype++) {
 
 			temp_header_ptr = &g_array_index(priv->email_custom_header_details, EmailCustomHeaderDetails,index_subtype);
 
diff --git a/plugins/groupwise-features/camel-gw-listener.c b/plugins/groupwise-features/camel-gw-listener.c
index a23e39ed00..b65ba9768f 100644
--- a/plugins/groupwise-features/camel-gw-listener.c
+++ b/plugins/groupwise-features/camel-gw-listener.c
@@ -213,7 +213,7 @@ add_esource (const gchar *conf_key, GwAccountInfo *info,  const gchar *source_na
 	source = e_source_new (source_name, relative_uri);
 	e_source_set_property (source, "auth", "1");
 	e_source_set_property (source, "username", url->user);
-	e_source_set_property (source, "port", camel_url_get_param (url, "soap_port"));
+	e_source_set_property (source, "port", soap_port);
 	e_source_set_property (source, "auth-domain", "Groupwise");
 	e_source_set_property (source, "use_ssl", use_ssl);
 
@@ -433,7 +433,6 @@ remove_calendar_tasks_sources (GwAccountInfo *info)
 {
 	CamelURL *url;
 	gchar *relative_uri;
-        const gchar *soap_port;
 	const gchar *poa_address;
 
 	url = camel_url_new (info->source_url, NULL);
@@ -442,10 +441,6 @@ remove_calendar_tasks_sources (GwAccountInfo *info)
 	if (!poa_address || strlen (poa_address) ==0)
 		return;
 
-	soap_port = camel_url_get_param (url, "soap_port");
-	if (!soap_port || strlen (soap_port) == 0)
-		soap_port = "7191";
-
 	relative_uri =  g_strdup_printf ("%s@%s/", url->user, poa_address);
 	remove_esource ("/apps/evolution/calendar/sources", info->name, _("Calendar"), relative_uri);
 	remove_esource ("/apps/evolution/tasks/sources", info->name,  _("Checklist"), relative_uri);
@@ -755,7 +750,6 @@ remove_addressbook_sources (GwAccountInfo *existing_account_info)
 	gboolean found_group;
 	CamelURL *url;
 	gchar *base_uri;
-	const gchar *soap_port;
 	GConfClient *client;
 	const gchar *poa_address;
 
@@ -768,9 +762,6 @@ remove_addressbook_sources (GwAccountInfo *existing_account_info)
 	if (!poa_address || strlen (poa_address) ==0)
 		return;
 
-	soap_port = camel_url_get_param (url, "soap_port");
-	if (!soap_port || strlen (soap_port) == 0)
-		soap_port = "7191";
 	base_uri =  g_strdup_printf ("groupwise://%s@%s", url->user,  poa_address);
 	client = gconf_client_get_default ();
 	list = e_source_list_new_for_gconf (client, "/apps/evolution/addressbook/sources" );
diff --git a/plugins/groupwise-features/share-folder.c b/plugins/groupwise-features/share-folder.c
index 24772a89bc..cae99e77d0 100644
--- a/plugins/groupwise-features/share-folder.c
+++ b/plugins/groupwise-features/share-folder.c
@@ -482,7 +482,6 @@ not_ok_clicked(GtkButton *button, ShareFolder *sf)
 	GtkTextIter *start, *end;
 	GtkTextBuffer *buffer;
 
-	buffer = gtk_text_buffer_new (NULL);
 	start = g_new0 (GtkTextIter, 1);
 	end = g_new0 (GtkTextIter, 1);
 	subj = g_strdup (gtk_entry_get_text (sf->subject));
diff --git a/plugins/groupwise-features/status-track.c b/plugins/groupwise-features/status-track.c
index 622fc3b6cd..f1b05ea477 100644
--- a/plugins/groupwise-features/status-track.c
+++ b/plugins/groupwise-features/status-track.c
@@ -177,7 +177,6 @@ gw_track_message_status_cb (GtkAction *action, EShellView *shell_view)
 	/* spacing */
 	widget = gtk_label_new ("");
 	gtk_table_attach (table, widget, 0, 1, row, row + 1, GTK_FILL, 0, 0, 0);
-	row++;
 
 	/* Table headers */
 	row = 0;
diff --git a/plugins/hula-account-setup/camel-hula-listener.c b/plugins/hula-account-setup/camel-hula-listener.c
index e6adef04fc..ca045f0533 100644
--- a/plugins/hula-account-setup/camel-hula-listener.c
+++ b/plugins/hula-account-setup/camel-hula-listener.c
@@ -408,7 +408,6 @@ account_added (EAccountList *account_listener, EAccount *account)
 
 	HulaAccountInfo *info;
 	EAccount *parent;
-	CamelURL *parent_url;
 
 	if (!is_hula_account (account) || !is_hula_caldav_account (account))
 		return;
@@ -423,7 +422,6 @@ account_added (EAccountList *account_listener, EAccount *account)
 		if (!parent)
 			return;
 
-		parent_url = camel_url_new (e_account_get_string(parent, E_ACCOUNT_SOURCE_URL), NULL);
 	} else
 		add_calendar_sources (info);
 
diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c
index 7f03570770..65f9b58b70 100644
--- a/plugins/itip-formatter/itip-formatter.c
+++ b/plugins/itip-formatter/itip-formatter.c
@@ -866,7 +866,6 @@ find_server (struct _itip_puri *pitip, ECalComponent *comp)
 	}
 
 	for (; l != NULL; l = l->next) {
-		ECal *ecal;
 		source = l->data;
 
 		if (!fd) {
@@ -896,7 +895,7 @@ find_server (struct _itip_puri *pitip, ECalComponent *comp)
 		if (current_source == source)
 			pitip->current_ecal = start_calendar_server (pitip, source, pitip->type, find_cal_opened_cb, fd);
 		else
-			ecal = start_calendar_server (pitip, source, pitip->type, find_cal_opened_cb, fd);
+			start_calendar_server (pitip, source, pitip->type, find_cal_opened_cb, fd);
 
 	}
 
@@ -2519,7 +2518,6 @@ puri_free (EMFormatPURI *puri)
 void
 format_itip (EPlugin *ep, EMFormatHookTarget *target)
 {
-	EMFormatHTMLPObject *pobj;
 	GConfClient *gconf;
 	gchar *classid;
 	struct _itip_puri *puri;
@@ -2535,7 +2533,7 @@ format_itip (EPlugin *ep, EMFormatHookTarget *target)
 
 	puri = (struct _itip_puri *)em_format_add_puri(target->format, sizeof(struct _itip_puri), classid, target->part, itip_attachment_frame);
 
-	pobj = em_format_html_add_pobject ((EMFormatHTML *) target->format, sizeof (EMFormatHTMLPObject), classid, target->part, format_itip_object);
+	em_format_html_add_pobject ((EMFormatHTML *) target->format, sizeof (EMFormatHTMLPObject), classid, target->part, format_itip_object);
 
 	gconf = gconf_client_get_default ();
 	puri->delete_message = gconf_client_get_bool (gconf, GCONF_KEY_DELETE, NULL);
diff --git a/plugins/itip-formatter/itip-view.c b/plugins/itip-formatter/itip-view.c
index 9b240f484a..0440513329 100644
--- a/plugins/itip-formatter/itip-view.c
+++ b/plugins/itip-formatter/itip-view.c
@@ -517,14 +517,13 @@ static void
 set_journal_sender_text (ItipView *view)
 {
 	ItipViewPrivate *priv;
-	const gchar *organizer, *attendee;
+	const gchar *organizer;
 	gchar *sender = NULL;
 	gchar *on_behalf_of = NULL;
 
 	priv = view->priv;
 
 	organizer = priv->organizer ? priv->organizer : _("An unknown person");
-	attendee = priv->attendee ? priv->attendee : _("An unknown person");
 
 	/* The current account ID (i.e. the delegatee) is receiving a copy of the request/response. Here we ask the delegatee to respond/accept on behalf of the delegator. */
 	if (priv->organizer && priv->proxy)
diff --git a/plugins/pst-import/pst-importer.c b/plugins/pst-import/pst-importer.c
index f89b2da5ad..9662caca1e 100644
--- a/plugins/pst-import/pst-importer.c
+++ b/plugins/pst-import/pst-importer.c
@@ -1472,10 +1472,9 @@ pst_process_task (PstImporter *m, pst_item *item)
 static void
 pst_process_journal (PstImporter *m, pst_item *item)
 {
-	struct pst_item_journal *j;
 	ECalComponent *ec;
 
-	j = item->journal;
+	/*j = item->journal;*/
 	ec = e_cal_component_new ();
 	e_cal_component_set_new_vtype (ec, E_CAL_COMPONENT_JOURNAL);
 
diff --git a/plugins/publish-calendar/publish-calendar.c b/plugins/publish-calendar/publish-calendar.c
index 69e42bb5fc..d30a9b15f2 100644
--- a/plugins/publish-calendar/publish-calendar.c
+++ b/plugins/publish-calendar/publish-calendar.c
@@ -601,7 +601,6 @@ url_list_enable_toggled (GtkCellRendererToggle *renderer,
                          const gchar            *path_string,
 			 PublishUIData         *ui)
 {
-	GtkTreeSelection *selection;
 	EPublishUri *url = NULL;
 	GtkTreeModel *model;
 	GtkTreePath *path;
@@ -609,7 +608,6 @@ url_list_enable_toggled (GtkCellRendererToggle *renderer,
 
 	path = gtk_tree_path_new_from_string (path_string);
 	model = gtk_tree_view_get_model (GTK_TREE_VIEW (ui->treeview));
-	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (ui->treeview));
 
 	if (gtk_tree_model_get_iter (model, &iter, path)) {
 		gtk_tree_model_get (model, &iter, URL_LIST_URL_COLUMN, &url, -1);
diff --git a/plugins/save-calendar/rdf-format.c b/plugins/save-calendar/rdf-format.c
index d28d2ef587..fd6a263287 100644
--- a/plugins/save-calendar/rdf-format.c
+++ b/plugins/save-calendar/rdf-format.c
@@ -207,7 +207,7 @@ do_save_calendar_rdf (FormatHandler *handler, ESourceSelector *selector, ECalSou
 	if (stream && e_cal_get_object_list_as_comp (source_client, "#t", &objects, NULL)) {
 		xmlBufferPtr buffer=xmlBufferCreate();
 		xmlDocPtr doc = xmlNewDoc((xmlChar *) "1.0");
-		xmlNodePtr fnode = doc->children;
+		xmlNodePtr fnode;
 
 		doc->children = xmlNewDocNode (doc, NULL, (const guchar *)"rdf:RDF", NULL);
 		xmlSetProp (doc->children, (const guchar *)"xmlns:rdf", (const guchar *)"http://www.w3.org/1999/02/22-rdf-syntax-ns#");
diff --git a/plugins/save-calendar/save-calendar.c b/plugins/save-calendar/save-calendar.c
index 212a439877..c8901b2d87 100644
--- a/plugins/save-calendar/save-calendar.c
+++ b/plugins/save-calendar/save-calendar.c
@@ -312,8 +312,6 @@ gboolean
 calendar_save_as_init (GtkUIManager *ui_manager,
                        EShellView *shell_view)
 {
-	EShell *shell;
-	EShellSettings *shell_settings;
 	EShellWindow *shell_window;
 	GtkActionGroup *action_group;
 	GtkAction *action;
@@ -322,8 +320,6 @@ calendar_save_as_init (GtkUIManager *ui_manager,
 	const gchar *name;
 
 	shell_window = e_shell_view_get_shell_window (shell_view);
-	shell = e_shell_window_get_shell (shell_window);
-	shell_settings = e_shell_get_shell_settings (shell);
 
 	name = "calendar-save-as";
 	tooltip = _("Save the selected calendar to disk");
@@ -347,8 +343,6 @@ gboolean
 memo_list_save_as_init (GtkUIManager *ui_manager,
                         EShellView *shell_view)
 {
-	EShell *shell;
-	EShellSettings *shell_settings;
 	EShellWindow *shell_window;
 	GtkActionGroup *action_group;
 	GtkAction *action;
@@ -357,8 +351,6 @@ memo_list_save_as_init (GtkUIManager *ui_manager,
 	const gchar *name;
 
 	shell_window = e_shell_view_get_shell_window (shell_view);
-	shell = e_shell_window_get_shell (shell_window);
-	shell_settings = e_shell_get_shell_settings (shell);
 
 	name = "memo-list-save-as";
 	tooltip = _("Save the selected memo list to disk");
@@ -382,8 +374,6 @@ gboolean
 task_list_save_as_init (GtkUIManager *ui_manager,
                         EShellView *shell_view)
 {
-	EShell *shell;
-	EShellSettings *shell_settings;
 	EShellWindow *shell_window;
 	GtkActionGroup *action_group;
 	GtkAction *action;
@@ -392,8 +382,6 @@ task_list_save_as_init (GtkUIManager *ui_manager,
 	const gchar *name;
 
 	shell_window = e_shell_view_get_shell_window (shell_view);
-	shell = e_shell_window_get_shell (shell_window);
-	shell_settings = e_shell_get_shell_settings (shell);
 
 	name = "task-list-save-as";
 	tooltip = _("Save the selected task list to disk");
diff --git a/plugins/tnef-attachments/tnef-plugin.c b/plugins/tnef-attachments/tnef-plugin.c
index 59b0d4f230..074ec635fb 100644
--- a/plugins/tnef-attachments/tnef-plugin.c
+++ b/plugins/tnef-attachments/tnef-plugin.c
@@ -924,7 +924,6 @@ void saveVCalendar(TNEFStruct *tnef, const gchar *tmpdir) {
 	       write them out. */
             if (filename->size > 1) {
                 charptr = filename->data-1;
-                charptr2=strstr(charptr+1, ";");
                 while (charptr != NULL) {
                     charptr++;
                     charptr2 = strstr(charptr, ";");
@@ -946,7 +945,6 @@ void saveVCalendar(TNEFStruct *tnef, const gchar *tmpdir) {
                     /* The list of optional participants */
                 if (filename->size > 1) {
                     charptr = filename->data-1;
-                    charptr2=strstr(charptr+1, ";");
                     while (charptr != NULL) {
                         charptr++;
                         charptr2 = strstr(charptr, ";");
@@ -967,7 +965,6 @@ void saveVCalendar(TNEFStruct *tnef, const gchar *tmpdir) {
                         PROP_TAG(PT_STRING8, 0x8238))) != MAPI_UNDEFINED) {
             if (filename->size > 1) {
                 charptr = filename->data-1;
-                charptr2=strstr(charptr+1, ";");
                 while (charptr != NULL) {
                     charptr++;
                     charptr2 = strstr(charptr, ";");
@@ -1139,7 +1136,6 @@ void saveVTask(TNEFStruct *tnef, const gchar *tmpdir) {
         }
         if ((filename != MAPI_UNDEFINED) && (filename->size > 1)) {
             charptr = filename->data-1;
-            charptr2=strstr(charptr+1, ";");
             while (charptr != NULL) {
                 charptr++;
                 charptr2 = strstr(charptr, ";");