[brasero] Build fixes



commit 5af0b204b4d9a14125a336a116c50d958ca2e501
Author: Philippe Rouquier <bonfire-app wanadoo fr>
Date:   Mon May 18 17:30:16 2009 +0200

    Build fixes
---
 libbrasero-burn/brasero-track-data-cfg.c |   20 ++++++++++----------
 libbrasero-burn/brasero-track-data.c     |    2 --
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/libbrasero-burn/brasero-track-data-cfg.c b/libbrasero-burn/brasero-track-data-cfg.c
index 7096361..3f2b647 100644
--- a/libbrasero-burn/brasero-track-data-cfg.c
+++ b/libbrasero-burn/brasero-track-data-cfg.c
@@ -52,8 +52,8 @@
 typedef struct _BraseroTrackDataCfgPrivate BraseroTrackDataCfgPrivate;
 struct _BraseroTrackDataCfgPrivate
 {
-	BraseroImageFS *forced_fs;
-	BraseroImageFS *banned_fs;
+	BraseroImageFS forced_fs;
+	BraseroImageFS banned_fs;
 
 	BraseroDataTreeModel *tree;
 	guint stamp;
@@ -1835,8 +1835,8 @@ brasero_track_data_cfg_add_fs (BraseroTrackData *track,
 	BraseroTrackDataCfgPrivate *priv;
 
 	priv = BRASERO_TRACK_DATA_CFG_PRIVATE (track);
-	priv->forced |= fstype;
-	priv->banned &= ~(fstype);
+	priv->forced_fs |= fstype;
+	priv->banned_fs &= ~(fstype);
 	return BRASERO_BURN_OK;
 }
 
@@ -1847,8 +1847,8 @@ brasero_track_data_cfg_rm_fs (BraseroTrackData *track,
 	BraseroTrackDataCfgPrivate *priv;
 
 	priv = BRASERO_TRACK_DATA_CFG_PRIVATE (track);
-	priv->banned |= fstype;
-	priv->forced &= ~(fstype);
+	priv->banned_fs |= fstype;
+	priv->forced_fs &= ~(fstype);
 	return BRASERO_BURN_OK;
 }
 
@@ -1866,7 +1866,7 @@ brasero_track_data_cfg_get_fs (BraseroTrackData *track)
 	stats = BRASERO_FILE_NODE_STATS (root);
 
 	fs_type = BRASERO_IMAGE_FS_ISO;
-	fs_type |= priv->forced;
+	fs_type |= priv->forced_fs;
 
 	if (brasero_data_project_has_symlinks (BRASERO_DATA_PROJECT (priv->tree)))
 		fs_type |= BRASERO_IMAGE_FS_SYMLINK;
@@ -1888,7 +1888,7 @@ brasero_track_data_cfg_get_fs (BraseroTrackData *track)
 	if (stats->num_deep != 0)
 		fs_type |= BRASERO_IMAGE_ISO_FS_DEEP_DIRECTORY;
 
-	fs_type &= ~(priv->banned);
+	fs_type &= ~(priv->banned_fs);
 	return fs_type;
 }
 
@@ -2495,8 +2495,8 @@ brasero_track_data_cfg_class_init (BraseroTrackDataCfgClass *klass)
 	track_class->get_status = brasero_track_data_cfg_get_status;
 
 	parent_class->set_source = brasero_track_data_cfg_set_source;
-	parent_class->set_source = brasero_track_data_cfg_add_fs;
-	parent_class->set_source = brasero_track_data_cfg_rm_fs;
+	parent_class->add_fs = brasero_track_data_cfg_add_fs;
+	parent_class->rm_fs = brasero_track_data_cfg_rm_fs;
 
 	parent_class->get_fs = brasero_track_data_cfg_get_fs;
 	parent_class->get_grafts = brasero_track_data_cfg_get_grafts;
diff --git a/libbrasero-burn/brasero-track-data.c b/libbrasero-burn/brasero-track-data.c
index 87e7bce..4cfb0c3 100644
--- a/libbrasero-burn/brasero-track-data.c
+++ b/libbrasero-burn/brasero-track-data.c
@@ -178,8 +178,6 @@ brasero_track_data_rm_fs (BraseroTrackData *track,
 
 	g_return_val_if_fail (BRASERO_IS_TRACK_DATA (track), BRASERO_BURN_NOT_SUPPORTED);
 
-	priv = BRASERO_TRACK_DATA_PRIVATE (track);
-
 	fs_before = brasero_track_data_get_fs (track);
 	klass = BRASERO_TRACK_DATA_GET_CLASS (track);
 	if (!klass->rm_fs);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]