[brasero] 2009-04-19 Philippe Rouquier <bonfire-app wanadoo fr>

[Philippe Rouquier <philippr src gnome org>]

commit acc379086dd3a6ba006b63d2b3b898c2d1825a6e
Author: Philippe Rouquier <bonfire-app wanadoo fr>
Date:   Sun Apr 19 20:37:52 2009 +0200

    2009-04-19  Philippe Rouquier  <bonfire-app wanadoo fr>
    
    	Move some helper functions out of public header
    
    	* libbrasero-burn/Makefile.am:
    	* libbrasero-burn/brasero-burn-dialog.c:
    	* libbrasero-burn/brasero-burn-options.c:
    	* libbrasero-burn/brasero-burn.c:
    	* libbrasero-burn/brasero-caps-burn.c:
    	* libbrasero-burn/brasero-caps-session.c:
    	* libbrasero-burn/brasero-dest-selection.c:
    	* libbrasero-burn/brasero-disc-option-dialog.c:
    	* libbrasero-burn/brasero-medium-properties.c:
    	* libbrasero-burn/brasero-session-cfg.c:
    	* libbrasero-burn/brasero-session.h:
    	* libbrasero-burn/burn-job.c:
---
 ChangeLog                                    |   17 ++++++++++++
 libbrasero-burn/Makefile.am                  |    3 +-
 libbrasero-burn/brasero-burn-dialog.c        |    1 +
 libbrasero-burn/brasero-burn-options.c       |    1 +
 libbrasero-burn/brasero-burn.c               |    1 +
 libbrasero-burn/brasero-caps-burn.c          |    1 +
 libbrasero-burn/brasero-caps-session.c       |    1 +
 libbrasero-burn/brasero-dest-selection.c     |    1 +
 libbrasero-burn/brasero-disc-option-dialog.c |    1 +
 libbrasero-burn/brasero-medium-properties.c  |    1 +
 libbrasero-burn/brasero-session-cfg.c        |    1 +
 libbrasero-burn/brasero-session.h            |   36 --------------------------
 libbrasero-burn/burn-job.c                   |    2 +-
 13 files changed, 29 insertions(+), 38 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 938bb2c..b6115fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,22 @@
 2009-04-19  Philippe Rouquier  <bonfire-app wanadoo fr>
 
+	Move some helper functions out of public header
+
+	* libbrasero-burn/Makefile.am:
+	* libbrasero-burn/brasero-burn-dialog.c:
+	* libbrasero-burn/brasero-burn-options.c:
+	* libbrasero-burn/brasero-burn.c:
+	* libbrasero-burn/brasero-caps-burn.c:
+	* libbrasero-burn/brasero-caps-session.c:
+	* libbrasero-burn/brasero-dest-selection.c:
+	* libbrasero-burn/brasero-disc-option-dialog.c:
+	* libbrasero-burn/brasero-medium-properties.c:
+	* libbrasero-burn/brasero-session-cfg.c:
+	* libbrasero-burn/brasero-session.h:
+	* libbrasero-burn/burn-job.c:
+
+2009-04-19  Philippe Rouquier  <bonfire-app wanadoo fr>
+
 	Change one function return value
 
 	* libbrasero-burn/brasero-burn-options.c
diff --git a/libbrasero-burn/Makefile.am b/libbrasero-burn/Makefile.am
index 9d0a23e..57e84c2 100644
--- a/libbrasero-burn/Makefile.am
+++ b/libbrasero-burn/Makefile.am
@@ -171,7 +171,8 @@ libbrasero_burn_la_SOURCES = 		\
 	brasero-status.c                 \
 	brasero-status.h                 \
 	brasero-status-dialog.c                 \
-	brasero-status-dialog.h
+	brasero-status-dialog.h                 \
+	brasero-session-helper.h
 
 EXTRA_DIST =			\
 	libbrasero-marshal.list
diff --git a/libbrasero-burn/brasero-burn-dialog.c b/libbrasero-burn/brasero-burn-dialog.c
index 18379d0..bcbcfeb 100644
--- a/libbrasero-burn/brasero-burn-dialog.c
+++ b/libbrasero-burn/brasero-burn-dialog.c
@@ -47,6 +47,7 @@
 #include "brasero-tray.h"
 #include "brasero-burn-dialog.h"
 #include "brasero-session-cfg.h"
+#include "brasero-session-helper.h"
 
 #include "burn-basics.h"
 #include "burn-debug.h"
diff --git a/libbrasero-burn/brasero-burn-options.c b/libbrasero-burn/brasero-burn-options.c
index 69205ea..5c458a7 100644
--- a/libbrasero-burn/brasero-burn-options.c
+++ b/libbrasero-burn/brasero-burn-options.c
@@ -44,6 +44,7 @@
 #include "brasero-medium-selection-priv.h"
 
 #include "brasero-session.h"
+#include "brasero-session-helper.h"
 #include "brasero-burn-options.h"
 #include "brasero-disc-copy-dialog.h"
 #include "brasero-image-option-dialog.h"
diff --git a/libbrasero-burn/brasero-burn.c b/libbrasero-burn/brasero-burn.c
index 04605c2..becb788 100644
--- a/libbrasero-burn/brasero-burn.c
+++ b/libbrasero-burn/brasero-burn.c
@@ -63,6 +63,7 @@
 #include "brasero-session.h"
 #include "brasero-track-image.h"
 #include "brasero-track-disc.h"
+#include "brasero-session-helper.h"
 
 G_DEFINE_TYPE (BraseroBurn, brasero_burn, G_TYPE_OBJECT);
 
diff --git a/libbrasero-burn/brasero-caps-burn.c b/libbrasero-burn/brasero-caps-burn.c
index 983aa2d..f4f4b08 100644
--- a/libbrasero-burn/brasero-caps-burn.c
+++ b/libbrasero-burn/brasero-caps-burn.c
@@ -42,6 +42,7 @@
 #include "burn-debug.h"
 #include "brasero-plugin-information.h"
 #include "burn-task.h"
+#include "brasero-session-helper.h"
 
 /**
  * This macro is used to determine whether or not blanking could change anything
diff --git a/libbrasero-burn/brasero-caps-session.c b/libbrasero-burn/brasero-caps-session.c
index 82df536..61fbe5f 100644
--- a/libbrasero-burn/brasero-caps-session.c
+++ b/libbrasero-burn/brasero-caps-session.c
@@ -41,6 +41,7 @@
 #include "burn-debug.h"
 #include "brasero-plugin.h"
 #include "brasero-plugin-information.h"
+#include "brasero-session-helper.h"
 
 #define BRASERO_BURN_CAPS_SHOULD_BLANK(media_MACRO, flags_MACRO)		\
 	((media_MACRO & BRASERO_MEDIUM_UNFORMATTED) ||				\
diff --git a/libbrasero-burn/brasero-dest-selection.c b/libbrasero-burn/brasero-dest-selection.c
index a05fb9a..aae7b60 100644
--- a/libbrasero-burn/brasero-dest-selection.c
+++ b/libbrasero-burn/brasero-dest-selection.c
@@ -53,6 +53,7 @@
 
 #include "brasero-dest-selection.h"
 #include "brasero-session-cfg.h"
+#include "brasero-session-helper.h"
 
 typedef struct _BraseroDestSelectionPrivate BraseroDestSelectionPrivate;
 struct _BraseroDestSelectionPrivate
diff --git a/libbrasero-burn/brasero-disc-option-dialog.c b/libbrasero-burn/brasero-disc-option-dialog.c
index 035db08..1be50e6 100644
--- a/libbrasero-burn/brasero-disc-option-dialog.c
+++ b/libbrasero-burn/brasero-disc-option-dialog.c
@@ -53,6 +53,7 @@
 #include "brasero-disc-option-dialog.h"
 #include "brasero-dest-selection.h"
 #include "brasero-session-cfg.h"
+#include "brasero-session-helper.h"
 #include "brasero-burn-options.h"
 #include "brasero-burn-options-private.h"
 
diff --git a/libbrasero-burn/brasero-medium-properties.c b/libbrasero-burn/brasero-medium-properties.c
index 7b98d33..3171873 100644
--- a/libbrasero-burn/brasero-medium-properties.c
+++ b/libbrasero-burn/brasero-medium-properties.c
@@ -44,6 +44,7 @@
 #include "brasero-drive-properties.h"
 #include "brasero-image-properties.h"
 #include "brasero-session-cfg.h"
+#include "brasero-session-helper.h"
 
 #include "burn-basics.h"
 #include "brasero-track.h"
diff --git a/libbrasero-burn/brasero-session-cfg.c b/libbrasero-burn/brasero-session-cfg.c
index ced61c9..1d60b89 100644
--- a/libbrasero-burn/brasero-session-cfg.c
+++ b/libbrasero-burn/brasero-session-cfg.c
@@ -51,6 +51,7 @@
 #include "brasero-track-image.h"
 #include "brasero-session-cfg.h"
 #include "brasero-burn-lib.h"
+#include "brasero-session-helper.h"
 
 typedef struct _BraseroSessionCfgPrivate BraseroSessionCfgPrivate;
 struct _BraseroSessionCfgPrivate
diff --git a/libbrasero-burn/brasero-session.h b/libbrasero-burn/brasero-session.h
index d91d050..be628ef 100644
--- a/libbrasero-burn/brasero-session.h
+++ b/libbrasero-burn/brasero-session.h
@@ -248,42 +248,6 @@ BraseroImageFormat
 brasero_burn_session_get_default_output_format (BraseroBurnSession *session);
 
 /**
- * Some convenience functions
- * FIXME: maybe they should be put into a brasero burn session helper file?
- */
-
-BraseroMedia
-brasero_burn_session_get_dest_media (BraseroBurnSession *session);
-
-BraseroDrive *
-brasero_burn_session_get_src_drive (BraseroBurnSession *session);
-
-BraseroMedium *
-brasero_burn_session_get_src_medium (BraseroBurnSession *session);
-
-gboolean
-brasero_burn_session_is_dest_file (BraseroBurnSession *session);
-
-gboolean
-brasero_burn_session_same_src_dest_drive (BraseroBurnSession *session);
-
-#define BRASERO_BURN_SESSION_EJECT(session)					\
-(brasero_burn_session_get_flags ((session)) & BRASERO_BURN_FLAG_EJECT)
-
-#define BRASERO_BURN_SESSION_CHECK_SIZE(session)				\
-(brasero_burn_session_get_flags ((session)) & BRASERO_BURN_FLAG_CHECK_SIZE)
-
-#define BRASERO_BURN_SESSION_NO_TMP_FILE(session)				\
-(brasero_burn_session_get_flags ((session)) & BRASERO_BURN_FLAG_NO_TMP_FILES)
-
-#define BRASERO_BURN_SESSION_OVERBURN(session)					\
-(brasero_burn_session_get_flags ((session)) & BRASERO_BURN_FLAG_OVERBURN)
-
-#define BRASERO_BURN_SESSION_APPEND(session)					\
-(brasero_burn_session_get_flags ((session)) & (BRASERO_BURN_FLAG_APPEND|BRASERO_BURN_FLAG_MERGE))
-
-
-/**
  * This is to log a session
  */
 
diff --git a/libbrasero-burn/burn-job.c b/libbrasero-burn/burn-job.c
index ef62454..aca7aee 100644
--- a/libbrasero-burn/burn-job.c
+++ b/libbrasero-burn/burn-job.c
@@ -51,8 +51,8 @@
 #include "burn-basics.h"
 #include "burn-debug.h"
 #include "brasero-session.h"
+#include "brasero-session-helper.h"
 #include "brasero-plugin-information.h"
-#include "burn-mkisofs-base.h"
 #include "burn-job.h"
 #include "burn-task-ctx.h"
 #include "burn-task-item.h"