[brasero: 6/18] Some more fixes

[Philippe Rouquier <philippr src gnome org>]

commit 88da0d6cfe4a4b969f619a16eb32e8178fa276d0
Author: Philippe Rouquier <bonfire-app wanadoo fr>
Date:   Wed Apr 29 21:30:14 2009 +0200

    Some more fixes
---
 libbrasero-burn/brasero-data-tree-model.c |    7 -------
 libbrasero-burn/brasero-filtered-uri.c    |    2 +-
 libbrasero-burn/brasero-track-data.c      |   10 ++++++----
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/libbrasero-burn/brasero-data-tree-model.c b/libbrasero-burn/brasero-data-tree-model.c
index ce7cc14..6343625 100644
--- a/libbrasero-burn/brasero-data-tree-model.c
+++ b/libbrasero-burn/brasero-data-tree-model.c
@@ -33,13 +33,6 @@
 #endif
 
 #include <glib.h>
-#include <glib/gi18n-lib.h>
-
-#include <gtk/gtk.h>
-
-#include "burn-basics.h"
-
-#include "brasero-misc.h"
 
 #include "libbrasero-marshal.h"
 #include "brasero-data-tree-model.h"
diff --git a/libbrasero-burn/brasero-filtered-uri.c b/libbrasero-burn/brasero-filtered-uri.c
index 40e5a27..b92a612 100644
--- a/libbrasero-burn/brasero-filtered-uri.c
+++ b/libbrasero-burn/brasero-filtered-uri.c
@@ -119,7 +119,7 @@ brasero_filtered_uri_filter (BraseroFilteredUri *filtered,
 			    BRASERO_FILTERED_STOCK_ID_COL, fatal ? GTK_STOCK_CANCEL:NULL,
 			    BRASERO_FILTERED_URI_COL, uri,
 			    BRASERO_FILTERED_STATUS_COL, labels [status - 1],
-			    BRASERO_FILTERED_FATAL_ERROR_COL, fatal,
+			    BRASERO_FILTERED_FATAL_ERROR_COL, fatal == FALSE,
 			    -1);
 }
 
diff --git a/libbrasero-burn/brasero-track-data.c b/libbrasero-burn/brasero-track-data.c
index 149d3b3..1ee5332 100644
--- a/libbrasero-burn/brasero-track-data.c
+++ b/libbrasero-burn/brasero-track-data.c
@@ -117,7 +117,7 @@ brasero_track_data_set_source (BraseroTrackData *track,
 
 	g_return_val_if_fail (BRASERO_IS_TRACK_DATA (track), BRASERO_BURN_ERR);
 
-	klass = BRASERO_TRACK_DATA_CLASS (track);
+	klass = BRASERO_TRACK_DATA_GET_CLASS (track);
 	return klass->set_source (track, grafts, unreadable);
 }
 
@@ -198,7 +198,7 @@ brasero_track_data_get_fs (BraseroTrackData *track)
 
 	g_return_val_if_fail (BRASERO_IS_TRACK_DATA (track), BRASERO_IMAGE_FS_NONE);
 
-	klass = BRASERO_TRACK_DATA_CLASS (track);
+	klass = BRASERO_TRACK_DATA_GET_CLASS (track);
 	return klass->get_fs (track);
 }
 
@@ -218,7 +218,7 @@ brasero_track_data_get_grafts (BraseroTrackData *track)
 
 	g_return_val_if_fail (BRASERO_IS_TRACK_DATA (track), NULL);
 
-	klass = BRASERO_TRACK_DATA_CLASS (track);
+	klass = BRASERO_TRACK_DATA_GET_CLASS (track);
 	return klass->get_grafts (track);
 }
 
@@ -242,7 +242,7 @@ brasero_track_data_get_excluded (BraseroTrackData *track,
 
 	g_return_val_if_fail (BRASERO_IS_TRACK_DATA (track), NULL);
 
-	klass = BRASERO_TRACK_DATA_CLASS (track);
+	klass = BRASERO_TRACK_DATA_GET_CLASS (track);
 	excluded = klass->get_excluded (track);
 	if (!copy)
 		return excluded;
@@ -282,8 +282,10 @@ brasero_track_data_get_paths (BraseroTrackData *track,
 
 	g_return_val_if_fail (BRASERO_IS_TRACK_DATA (track), BRASERO_BURN_NOT_SUPPORTED);
 
+	klass = BRASERO_TRACK_DATA_GET_CLASS (track);
 	grafts = klass->get_grafts (track);
 	excluded = klass->get_excluded (track);
+
 	result = brasero_mkisofs_base_write_to_files (grafts,
 						      excluded,
 						      use_joliet,