[brasero] Clean up inclusion of header files and fixed build warnings

[Philippe Rouquier <philippr src gnome org>]

commit 31ae04397b79d0729e66009922ef934acdc07f50
Author: Philippe Rouquier <bonfire-app wanadoo fr>
Date:   Sun Jul 26 15:59:46 2009 +0200

    Clean up inclusion of header files and fixed build warnings

 src/brasero-audio-disc.c       |   11 ++++++-----
 src/brasero-data-disc.c        |    2 --
 src/brasero-disc.h             |    1 -
 src/brasero-player-bacon.c     |    7 +++----
 src/brasero-player.c           |    7 +++++--
 src/brasero-playlist.c         |    2 ++
 src/brasero-project-manager.c  |    7 +++++--
 src/brasero-project.c          |   15 +++++++++------
 src/brasero-song-properties.c  |    2 ++
 src/brasero-song-properties.h  |    2 --
 src/brasero-split-dialog.c     |   10 ++++++----
 src/brasero-utils.h            |    2 --
 src/brasero-video-tree-model.c |    2 ++
 13 files changed, 40 insertions(+), 30 deletions(-)
---
diff --git a/src/brasero-audio-disc.c b/src/brasero-audio-disc.c
index ff8be03..f3cd55b 100644
--- a/src/brasero-audio-disc.c
+++ b/src/brasero-audio-disc.c
@@ -40,7 +40,12 @@
 #include <gtk/gtk.h>
 
 #include "brasero-misc.h"
-#include "burn-basics.h"
+#include "brasero-io.h"
+
+#include "brasero-tags.h"
+#include "brasero-track-stream-cfg.h"
+#include "brasero-session-cfg.h"
+
 #include "brasero-app.h"
 #include "brasero-disc.h"
 #include "brasero-audio-disc.h"
@@ -48,12 +53,8 @@
 #include "brasero-utils.h"
 #include "brasero-multi-song-props.h"
 #include "brasero-song-properties.h"
-#include "brasero-io.h"
 #include "brasero-split-dialog.h"
-#include "brasero-track-stream-cfg.h"
-#include "brasero-session-cfg.h"
 #include "brasero-video-tree-model.h"
-#include "brasero-tags.h"
 
 #include "eggtreemultidnd.h"
 
diff --git a/src/brasero-data-disc.c b/src/brasero-data-disc.c
index e57cdc3..480a77a 100644
--- a/src/brasero-data-disc.c
+++ b/src/brasero-data-disc.c
@@ -50,8 +50,6 @@
 #include "brasero-app.h"
 #include "brasero-project-manager.h"
 
-#include "burn-basics.h"
-
 #include "brasero-session-cfg.h"
 #include "brasero-tags.h"
 #include "brasero-track.h"
diff --git a/src/brasero-disc.h b/src/brasero-disc.h
index afcc8f1..1afc293 100644
--- a/src/brasero-disc.h
+++ b/src/brasero-disc.h
@@ -33,7 +33,6 @@
 #include <gtk/gtk.h>
 
 #include "brasero-project-parse.h"
-#include "burn-basics.h"
 #include "brasero-session.h"
 
 G_BEGIN_DECLS
diff --git a/src/brasero-player-bacon.c b/src/brasero-player-bacon.c
index c4aa955..6d91b03 100644
--- a/src/brasero-player-bacon.c
+++ b/src/brasero-player-bacon.c
@@ -43,7 +43,6 @@
 #include <gst/interfaces/xoverlay.h>
 
 #include "brasero-player-bacon.h"
-#include "burn-debug.h"
  
 static void brasero_player_bacon_class_init(BraseroPlayerBaconClass *klass);
 static void brasero_player_bacon_init(BraseroPlayerBacon *sp);
@@ -557,7 +556,7 @@ brasero_player_bacon_bus_messages (GstBus *bus,
 
 	case GST_MESSAGE_ERROR:
 		gst_message_parse_error (msg, &error, NULL);
-		BRASERO_BURN_LOG ("%s", error->message);
+		g_warning ("%s", error->message);
 
 		g_signal_emit (bacon,
 			       brasero_player_bacon_signals [STATE_CHANGED_SIGNAL],
@@ -682,7 +681,7 @@ brasero_player_bacon_setup_pipe (BraseroPlayerBacon *bacon)
 
 	bacon->priv->pipe = gst_element_factory_make ("playbin", NULL);
 	if (!bacon->priv->pipe) {
-		BRASERO_BURN_LOG ("Pipe creation error : can't create pipe.\n");
+		g_warning ("Pipe creation error : can't create pipe.\n");
 		return;
 	}
 
@@ -729,7 +728,7 @@ brasero_player_bacon_setup_pipe (BraseroPlayerBacon *bacon)
 	return;
 
 error:
-	BRASERO_BURN_LOG ("player creation error");
+	g_warning ("player creation error");
 	brasero_player_bacon_clear_pipe (bacon);
 	g_signal_emit (bacon,
 		       brasero_player_bacon_signals [STATE_CHANGED_SIGNAL],
diff --git a/src/brasero-player.c b/src/brasero-player.c
index ed8b6d9..f23c053 100644
--- a/src/brasero-player.c
+++ b/src/brasero-player.c
@@ -38,12 +38,15 @@
 #include <gconf/gconf-client.h>
 
 #include "brasero-misc.h"
+#include "brasero-metadata.h"
+#include "brasero-io.h"
+
+#include "brasero-units.h"
 
 #include "brasero-player.h"
 #include "brasero-player-bacon.h"
 #include "brasero-utils.h"
-#include "brasero-metadata.h"
-#include "brasero-io.h"
+
 
 G_DEFINE_TYPE (BraseroPlayer, brasero_player, GTK_TYPE_ALIGNMENT);
 
diff --git a/src/brasero-playlist.c b/src/brasero-playlist.c
index c1aa26a..848e614 100644
--- a/src/brasero-playlist.c
+++ b/src/brasero-playlist.c
@@ -49,6 +49,8 @@
 
 #include "brasero-misc.h"
 
+#include "brasero-units.h"
+
 #include "brasero-app.h"
 #include "brasero-playlist.h"
 #include "brasero-utils.h"
diff --git a/src/brasero-project-manager.c b/src/brasero-project-manager.c
index 41c7285..6fa7b3f 100644
--- a/src/brasero-project-manager.c
+++ b/src/brasero-project-manager.c
@@ -36,6 +36,11 @@
 
 #include <gtk/gtk.h>
 
+#include "brasero-io.h"
+
+#include "brasero-units.h"
+#include "brasero-medium-monitor.h"
+
 #include "brasero-app.h"
 #include "brasero-utils.h"
 #include "brasero-project.h"
@@ -44,8 +49,6 @@
 #include "brasero-file-chooser.h"
 #include "brasero-uri-container.h"
 #include "brasero-project-type-chooser.h"
-#include "brasero-io.h"
-#include "brasero-medium-monitor.h"
 
 #ifdef BUILD_SEARCH
 #include "brasero-search-beagle.h"
diff --git a/src/brasero-project.c b/src/brasero-project.c
index 6f324d0..433db78 100644
--- a/src/brasero-project.c
+++ b/src/brasero-project.c
@@ -52,6 +52,8 @@
 #include <totem-pl-parser.h>
 #endif
 
+#include "brasero-units.h"
+
 #include "brasero-misc.h"
 #include "brasero-jacket-edit.h"
 
@@ -64,13 +66,17 @@
 
 #include "brasero-track-data.h"
 #include "brasero-session-cfg.h"
-#include "brasero-burn-options.h"
-#include "brasero-cover.h"
 
+/* These includes are not in the exported *.h files by 
+ * libbrasero-burn. */
 #include "brasero-medium-selection-priv.h"
 #include "brasero-session-helper.h"
-#include "brasero-session-cfg.h"
 #include "brasero-dest-selection.h"
+#include "brasero-cover.h"
+#include "brasero-status-dialog.h"
+#include "brasero-video-options.h"
+#include "brasero-drive-properties.h"
+#include "brasero-image-properties.h"
 
 #include "brasero-project-type-chooser.h"
 #include "brasero-app.h"
@@ -85,11 +91,8 @@
 #include "brasero-file-chooser.h"
 #include "brasero-notify.h"
 #include "brasero-project-parse.h"
-#include "brasero-burn-options.h"
 #include "brasero-project-name.h"
 
-#include "brasero-image-properties.h"
-
 static void brasero_project_class_init (BraseroProjectClass *klass);
 static void brasero_project_init (BraseroProject *sp);
 static void brasero_project_iface_uri_container_init (BraseroURIContainerIFace *iface);
diff --git a/src/brasero-song-properties.c b/src/brasero-song-properties.c
index 7e35bd7..11acaff 100644
--- a/src/brasero-song-properties.c
+++ b/src/brasero-song-properties.c
@@ -36,6 +36,8 @@
 
 #include <gst/gst.h>
 
+#include "brasero-units.h"
+
 #include "brasero-song-properties.h"
 #include "brasero-time-button.h"
 
diff --git a/src/brasero-song-properties.h b/src/brasero-song-properties.h
index e7aa156..9a3b839 100644
--- a/src/brasero-song-properties.h
+++ b/src/brasero-song-properties.h
@@ -32,8 +32,6 @@
 
 #include <gtk/gtk.h>
 
-#include "burn-basics.h"
-
 G_BEGIN_DECLS
 
 #define BRASERO_TYPE_SONG_PROPS         (brasero_song_props_get_type ())
diff --git a/src/brasero-split-dialog.c b/src/brasero-split-dialog.c
index 4007c00..28ed679 100644
--- a/src/brasero-split-dialog.c
+++ b/src/brasero-split-dialog.c
@@ -29,16 +29,18 @@
 
 #include <gtk/gtk.h>
 
-#include "brasero-split-dialog.h"
-#include "brasero-player.h"
-#include "brasero-utils.h"
+#include "brasero-misc.h"
 #include "brasero-metadata.h"
 
-#include "brasero-misc.h"
+#include "brasero-units.h"
 
 #include "brasero-track.h"
 #include "brasero-track-stream.h"
 
+#include "brasero-split-dialog.h"
+#include "brasero-player.h"
+#include "brasero-utils.h"
+
 enum {
 	START_COL,
 	END_COL,
diff --git a/src/brasero-utils.h b/src/brasero-utils.h
index 71cde36..997f751 100644
--- a/src/brasero-utils.h
+++ b/src/brasero-utils.h
@@ -31,8 +31,6 @@
 #include <glib.h>
 #include <gtk/gtk.h>
 
-#include "burn-basics.h"
-
 #ifndef _UTILS_H
 #define _UTILS_H
 
diff --git a/src/brasero-video-tree-model.c b/src/brasero-video-tree-model.c
index 1f13af7..16f123c 100644
--- a/src/brasero-video-tree-model.c
+++ b/src/brasero-video-tree-model.c
@@ -29,6 +29,8 @@
 
 #include <gtk/gtk.h>
 
+#include "brasero-units.h"
+
 #include "brasero-session-cfg.h"
 #include "brasero-tags.h"
 #include "brasero-track-stream-cfg.h"