7 files changed, 12 insertions, 30 deletions

diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index 21384032d9..7e16d8924e 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -2516,12 +2516,6 @@ fill_widgets (CompEditor *editor)
 	view = E_ATTACHMENT_VIEW (editor->priv->attachment_view);
 	store = e_attachment_view_get_store (view);
 
-	view = E_ATTACHMENT_VIEW (editor->priv->attachment_view);
-	store = e_attachment_view_get_store (view);
-
-	view = E_ATTACHMENT_VIEW (editor->priv->attachment_view);
-	store = e_attachment_view_get_store (view);
-
 	priv = editor->priv;
 
 	/*Check if attachments are available here and set them*/
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index 61ebb081e8..35339de8e4 100644
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@ -1655,17 +1655,17 @@ edit_clicked_cb (GtkButton *btn, EventPage *epage)
 	EventPagePrivate *priv;
 	GtkTreePath *path = NULL;
 	GtkTreeViewColumn *focus_col;
-	gint row = 0;
 
 	priv = epage->priv;
 
-	gtk_tree_view_get_cursor (GTK_TREE_VIEW (priv->list_view), &path, NULL);
+	gtk_tree_view_get_cursor (
+		GTK_TREE_VIEW (priv->list_view), &path, NULL);
 	g_return_if_fail (path != NULL);
 
-	row = gtk_tree_path_get_indices (path)[0];
-
-	gtk_tree_view_get_cursor (GTK_TREE_VIEW (priv->list_view), &path, &focus_col);
-	gtk_tree_view_set_cursor (GTK_TREE_VIEW (priv->list_view), path, focus_col, TRUE);
+	gtk_tree_view_get_cursor (
+		GTK_TREE_VIEW (priv->list_view), &path, &focus_col);
+	gtk_tree_view_set_cursor (
+		GTK_TREE_VIEW (priv->list_view), path, focus_col, TRUE);
 	gtk_tree_path_free (path);
 }
 
@@ -2472,13 +2472,11 @@ start_timezone_changed_cb (GtkWidget *widget,
                            EventPage *epage)
 {
 	EventPagePrivate *priv = epage->priv;
-	icaltimezone *zone;
 
 	if (priv->sync_timezones) {
-		zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (priv->start_timezone));
 		comp_editor_page_set_updating (COMP_EDITOR_PAGE (epage), TRUE);
 		/*the earlier method caused an infinite recursion*/
-		priv->end_timezone=priv->start_timezone;
+		priv->end_timezone = priv->start_timezone;
 		gtk_widget_show_all (priv->end_timezone);
 		comp_editor_page_set_updating (COMP_EDITOR_PAGE (epage), FALSE);
 	}
diff --git a/calendar/gui/dialogs/memo-page.c b/calendar/gui/dialogs/memo-page.c
index 98b6545e18..949836a330 100644
--- a/calendar/gui/dialogs/memo-page.c
+++ b/calendar/gui/dialogs/memo-page.c
@@ -488,14 +488,12 @@ fill_comp_with_recipients (ENameSelector *name_selector, ECalComponent *comp)
 
 		for (l = list_dests; l; l = l->next) {
 			EDestination *dest = l->data;
-			const gchar *name, *attendee = NULL;
+			const gchar *attendee = NULL;
 
-			name = e_destination_get_name (dest);
-
-			/* If we couldn't get the attendee prior, get the email address as the default */
-			if (attendee == NULL || *attendee == '\0') {
+			/* If we couldn't get the attendee prior,
+			 * get the email address as the default. */
+			if (attendee == NULL || *attendee == '\0')
 				attendee = e_destination_get_email (dest);
-			}
 
 			if (attendee == NULL || *attendee == '\0')
 				continue;
diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c
index 448ba7546f..e71a3445ae 100644
--- a/calendar/gui/dialogs/recurrence-page.c
+++ b/calendar/gui/dialogs/recurrence-page.c
@@ -708,7 +708,7 @@ simple_recur_to_comp (RecurrencePage *rpage, ECalComponent *comp)
 			r.by_day[i++] = ICAL_FRIDAY_WEEKDAY;
 
 		if (day_mask & (1 << 6))
-			r.by_day[i++] = ICAL_SATURDAY_WEEKDAY;
+			r.by_day[i] = ICAL_SATURDAY_WEEKDAY;
 
 		break;
 	}
diff --git a/calendar/gui/dialogs/schedule-page.c b/calendar/gui/dialogs/schedule-page.c
index 4c2b5cf9d0..32b6dffab8 100644
--- a/calendar/gui/dialogs/schedule-page.c
+++ b/calendar/gui/dialogs/schedule-page.c
@@ -252,12 +252,10 @@ static gboolean
 schedule_page_fill_widgets (CompEditorPage *page, ECalComponent *comp)
 {
 	SchedulePage *spage;
-	SchedulePagePrivate *priv;
 	ECalComponentDateTime start_date, end_date;
 	gboolean validated = TRUE;
 
 	spage = SCHEDULE_PAGE (page);
-	priv = spage->priv;
 
 	/* Clean the screen */
 	clear_widgets (spage);
@@ -291,10 +289,8 @@ static void
 schedule_page_set_dates (CompEditorPage *page, CompEditorPageDates *dates)
 {
 	SchedulePage *spage;
-	SchedulePagePrivate *priv;
 
 	spage = SCHEDULE_PAGE (page);
-	priv = spage->priv;
 
 	comp_editor_page_set_updating (page, TRUE);
 	update_time (spage, dates->start, dates->end);
diff --git a/calendar/gui/dialogs/task-details-page.c b/calendar/gui/dialogs/task-details-page.c
index 96c2badf1a..4a5b5b094e 100644
--- a/calendar/gui/dialogs/task-details-page.c
+++ b/calendar/gui/dialogs/task-details-page.c
@@ -528,8 +528,6 @@ date_changed_cb (EDateEdit *dedit,
 	icalproperty_status status;
 	gboolean date_set;
 
-	priv = tdpage->priv;
-
 	if (comp_editor_page_get_updating (COMP_EDITOR_PAGE (tdpage)))
 		return;
 
diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c
index afc2368d2c..906e960c17 100644
--- a/calendar/gui/dialogs/task-page.c
+++ b/calendar/gui/dialogs/task-page.c
@@ -1425,8 +1425,6 @@ date_changed_cb (EDateEdit *dedit,
 	struct icaltimetype start_tt = icaltime_null_time();
 	struct icaltimetype due_tt = icaltime_null_time();
 
-	priv = tpage->priv;
-
 	if (comp_editor_page_get_updating (COMP_EDITOR_PAGE (tpage)))
 		return;