[brasero] Fix several warnings

[Philippe Rouquier <philippr src gnome org>]

commit ca6b287813f7a522870414bf52720ca3fa5bc452
Author: Philippe Rouquier <bonfire-app wanadoo fr>
Date:   Sun Jun 21 15:14:26 2009 +0200

    Fix several warnings

 libbrasero-burn/brasero-session.c |   13 ++++++-------
 libbrasero-burn/brasero-session.h |    2 +-
 src/brasero-project.c             |    6 ++++--
 3 files changed, 11 insertions(+), 10 deletions(-)
---
diff --git a/libbrasero-burn/brasero-session.c b/libbrasero-burn/brasero-session.c
index 78e67e8..45614ce 100644
--- a/libbrasero-burn/brasero-session.c
+++ b/libbrasero-burn/brasero-session.c
@@ -1369,25 +1369,22 @@ brasero_burn_session_push_tracks (BraseroBurnSession *self)
 	}
 }
 
-void
+BraseroBurnResult
 brasero_burn_session_pop_tracks (BraseroBurnSession *self)
 {
 	GSList *sources;
 	BraseroBurnSessionPrivate *priv;
 
-	g_return_if_fail (BRASERO_IS_BURN_SESSION (self));
+	g_return_val_if_fail (BRASERO_IS_BURN_SESSION (self), FALSE);
 
 	priv = BRASERO_BURN_SESSION_PRIVATE (self);
 
 	/* Don't go further if there is no list of tracks on the pile */
 	if (!priv->pile_tracks)
-		return;
+		return BRASERO_BURN_OK;
 
-	if (priv->tracks) {
+	if (priv->tracks)
 		brasero_burn_session_free_tracks (self);
-		if (!priv->pile_tracks)
-			return;
-	}
 
 	sources = priv->pile_tracks->data;
 	priv->pile_tracks = g_slist_remove (priv->pile_tracks, sources);
@@ -1403,6 +1400,8 @@ brasero_burn_session_pop_tracks (BraseroBurnSession *self)
 			       0,
 			       track);
 	}
+
+	return BRASERO_BURN_RETRY;
 }
 
 /**
diff --git a/libbrasero-burn/brasero-session.h b/libbrasero-burn/brasero-session.h
index f1687d6..e7e8fcc 100644
--- a/libbrasero-burn/brasero-session.h
+++ b/libbrasero-burn/brasero-session.h
@@ -217,7 +217,7 @@ brasero_burn_session_pop_settings (BraseroBurnSession *session);
 
 void
 brasero_burn_session_push_tracks (BraseroBurnSession *session);
-void
+BraseroBurnResult
 brasero_burn_session_pop_tracks (BraseroBurnSession *session);
 
 /**
diff --git a/src/brasero-project.c b/src/brasero-project.c
index 2c5090d..3fa44d1 100644
--- a/src/brasero-project.c
+++ b/src/brasero-project.c
@@ -1428,7 +1428,6 @@ brasero_project_image_properties (BraseroProject *project)
 	brasero_image_properties_set_session (BRASERO_IMAGE_PROPERTIES (dialog), project->priv->session);
 
 	/* launch the dialog */
-	gtk_widget_show (dialog);
 	answer = gtk_dialog_run (GTK_DIALOG (dialog));
 	gtk_widget_destroy (dialog);
 
@@ -1452,8 +1451,8 @@ brasero_project_burn (BraseroProject *project)
 	project->priv->is_burning = 1;
 
 	current_disc = project->priv->current;
-	project->priv->current = NULL;
 	brasero_disc_set_session_contents (current_disc, NULL);
+	project->priv->current = NULL;
 
 	brasero_project_setup_session (project, BRASERO_BURN_SESSION (project->priv->session));
 
@@ -1464,6 +1463,9 @@ brasero_project_burn (BraseroProject *project)
 	if (brasero_app_burn (brasero_app_get_default (), BRASERO_BURN_SESSION (project->priv->session)))
 		project->priv->burnt = TRUE;
 
+	/* empty the stack of temporary tracks */
+	while (brasero_burn_session_pop_tracks (BRASERO_BURN_SESSION (project->priv->session)) == BRASERO_BURN_RETRY);
+
 	project->priv->current = current_disc;
 	brasero_disc_set_session_contents (current_disc, BRASERO_BURN_SESSION (project->priv->session));