5 files changed, 7 insertions, 12 deletions
diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.c b/calendar/gui/alarm-notify/alarm-notify-dialog.c
index 5ea58229e3..959f93b4ea 100644
--- a/calendar/gui/alarm-notify/alarm-notify-dialog.c
+++ b/calendar/gui/alarm-notify/alarm-notify-dialog.c
@@ -351,7 +351,8 @@ add_alarm_to_notified_alarms_dialog (AlarmNotificationsDialog *na, time_t trigge
 	AlarmFuncInfo *funcinfo = NULL;
 	gchar *to_display = NULL, *start, *end, *str_time;
 	icaltimezone *current_zone;
-	
+
+	/* Iter is not yet defined but still we return it in all the g_return_val_if_fail() calls? */
 	g_return_val_if_fail (trigger != -1, iter);
 
 	/* Only VEVENTs or VTODOs can have alarms */
diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
index c837a7d8f4..d97d49af96 100644
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ b/calendar/gui/alarm-notify/alarm-queue.c
@@ -290,8 +290,7 @@ remove_queued_alarm (CompQueuedAlarms *cqa, gpointer alarm_id,
 	if (!l)
 		return;
 
-	cqa->queued_alarms = g_slist_remove_link (cqa->queued_alarms, l);
-	g_slist_free_1 (l);
+	cqa->queued_alarms = g_slist_delete_link (cqa->queued_alarms, l);
 
 	if (remove_alarm) {
 		cqa->expecting_update = TRUE;
@@ -981,12 +980,9 @@ open_alarm_dialog (TrayIconData *tray_data)
 		if (alarm_notifications_dialog) {
 
 			GtkTreeSelection *selection = NULL;
-			GtkTreeModel *model = NULL;
 			
 			selection = gtk_tree_view_get_selection (
 				GTK_TREE_VIEW (alarm_notifications_dialog->treeview));
-			model = gtk_tree_view_get_model (
-				GTK_TREE_VIEW(alarm_notifications_dialog->treeview));
 		
 			tray_data->iter = add_alarm_to_notified_alarms_dialog (
 								   alarm_notifications_dialog,
diff --git a/calendar/gui/alarm-notify/alarm.c b/calendar/gui/alarm-notify/alarm.c
index d29ad3133a..1eb9d899b5 100644
--- a/calendar/gui/alarm-notify/alarm.c
+++ b/calendar/gui/alarm-notify/alarm.c
@@ -61,8 +61,7 @@ pop_alarm (void)
 	ar = alarms->data;
 
 	l = alarms;
-	alarms = g_list_remove_link (alarms, l);
-	g_list_free_1 (l);
+	alarms = g_list_delete_link (alarms, l);
 
 	g_free (ar);
 }
@@ -246,8 +245,7 @@ alarm_remove (gpointer alarm)
 		ar = &ar_copy;
 		pop_alarm (); /* This will free the original AlarmRecord; that's why we copy it */
 	} else {
-		alarms = g_list_remove_link (alarms, l);
-		g_list_free_1 (l);
+		alarms = g_list_delete_link (alarms, l);
 	}
 
 	/* Reset the timeout */
diff --git a/calendar/gui/alarm-notify/config-data.c b/calendar/gui/alarm-notify/config-data.c
index c8a35fada5..28b3730e9e 100644
--- a/calendar/gui/alarm-notify/config-data.c
+++ b/calendar/gui/alarm-notify/config-data.c
@@ -162,7 +162,7 @@ config_data_replace_string_list (const char *key,
 
 			g_free (tmp->data);
 			tmp->data = g_strdup ((gchar *) new);
-
+			/* Should this be checked somewhere? */
 			state = gconf_client_set_list (conf_client,
 					       key,
 					       GCONF_VALUE_STRING,
diff --git a/calendar/gui/alarm-notify/util.c b/calendar/gui/alarm-notify/util.c
index 900d20e67d..93e44c1336 100644
--- a/calendar/gui/alarm-notify/util.c
+++ b/calendar/gui/alarm-notify/util.c
@@ -55,7 +55,7 @@ calculate_time (time_t start, time_t end)
 	char *str;
 
 	if (difference < 60) {/* Can't be zero */
-		str = g_strdup_printf (_("(%d seconds)"), difference);
+		str = g_strdup_printf (_("(%ld seconds)"), difference);
 	} else if (difference > 60 && difference < 3600) { /* It will be x minutes y seconds*/
 		int minutes, seconds;
 		minutes = difference / 60;