[brasero/gnome-2-28] Wrong branch
- From: Philippe Rouquier <philippr src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [brasero/gnome-2-28] Wrong branch
- Date: Wed, 7 Oct 2009 20:19:15 +0000 (UTC)
commit f45d56d29f56d869c4e91e2db540a24ada4f1f44
Author: Philippe Rouquier <bonfire-app wanadoo fr>
Date: Wed Oct 7 22:17:10 2009 +0200
Wrong branch
Revert "Make some private functions public"
This reverts commit c0e317c1ff6940c1942bf2b490dc8bd54272619e.
libbrasero-burn/brasero-caps-session.c | 7 +++++++
libbrasero-burn/brasero-session-helper.h | 14 ++++++++++++--
libbrasero-burn/brasero-session.c | 4 ----
libbrasero-burn/brasero-session.h | 8 --------
libbrasero-media/brasero-drive.c | 2 --
libbrasero-media/brasero-drive.h | 4 ----
libbrasero-media/brasero-medium.c | 12 ++++++++++--
7 files changed, 29 insertions(+), 22 deletions(-)
---
diff --git a/libbrasero-burn/brasero-caps-session.c b/libbrasero-burn/brasero-caps-session.c
index 6cab60d..43fc99f 100644
--- a/libbrasero-burn/brasero-caps-session.c
+++ b/libbrasero-burn/brasero-caps-session.c
@@ -788,6 +788,13 @@ brasero_burn_session_output_supported (BraseroBurnSession *session,
return BRASERO_BURN_OK;
}
+/* This function is not public API yet because it was too
+ * late; so use it internally for now. It's mainly for
+ * convenience.*/
+gboolean
+brasero_drive_can_write_media (BraseroDrive *drive,
+ BraseroMedia media);
+
/**
* This is only to be used in case one wants to copy using the same drive.
* It determines the possible middle image type.
diff --git a/libbrasero-burn/brasero-session-helper.h b/libbrasero-burn/brasero-session-helper.h
index e930c51..8c3d0fb 100644
--- a/libbrasero-burn/brasero-session-helper.h
+++ b/libbrasero-burn/brasero-session-helper.h
@@ -40,14 +40,24 @@
G_BEGIN_DECLS
-
/**
- * Some convenience functions used internally
+ * Functions meant to become public API
*/
BraseroBurnResult
brasero_burn_session_set_image_output_format (BraseroBurnSession *self,
BraseroImageFormat format);
+BraseroBurnResult
+brasero_burn_session_tag_add_int (BraseroBurnSession *self,
+ const gchar *tag,
+ gint value);
+gint
+brasero_burn_session_tag_lookup_int (BraseroBurnSession *self,
+ const gchar *tag);
+
+/**
+ * Some convenience functions used internally
+ */
goffset
brasero_burn_session_get_available_medium_space (BraseroBurnSession *session);
diff --git a/libbrasero-burn/brasero-session.c b/libbrasero-burn/brasero-session.c
index 0c954f4..c76c633 100644
--- a/libbrasero-burn/brasero-session.c
+++ b/libbrasero-burn/brasero-session.c
@@ -1631,8 +1631,6 @@ brasero_burn_session_tag_add (BraseroBurnSession *self,
* for video discs, ...
* See brasero-tags.h for a list of knowns tags.
*
- * Since 2.29.0
- *
* Return value: a #BraseroBurnResult.
* BRASERO_BURN_OK if it was successful,
* BRASERO_BURN_ERR otherwise.
@@ -1707,8 +1705,6 @@ brasero_burn_session_tag_lookup (BraseroBurnSession *self,
* Retrieves an int value associated with @session through
* brasero_session_tag_add () and returns it.
*
- * Since 2.29.0
- *
* Return value: a #gint.
**/
diff --git a/libbrasero-burn/brasero-session.h b/libbrasero-burn/brasero-session.h
index d6f9e70..09c9f5c 100644
--- a/libbrasero-burn/brasero-session.h
+++ b/libbrasero-burn/brasero-session.h
@@ -146,14 +146,6 @@ BraseroBurnResult
brasero_burn_session_tag_remove (BraseroBurnSession *session,
const gchar *tag);
-BraseroBurnResult
-brasero_burn_session_tag_add_int (BraseroBurnSession *self,
- const gchar *tag,
- gint value);
-gint
-brasero_burn_session_tag_lookup_int (BraseroBurnSession *self,
- const gchar *tag);
-
/**
* Destination
*/
diff --git a/libbrasero-media/brasero-drive.c b/libbrasero-media/brasero-drive.c
index ac6b1bf..f5094ab 100644
--- a/libbrasero-media/brasero-drive.c
+++ b/libbrasero-media/brasero-drive.c
@@ -698,8 +698,6 @@ brasero_drive_get_caps (BraseroDrive *drive)
*
* Returns whether the disc can burn a specific media type.
*
- * Since 2.29.0
- *
* Return value: a #gboolean. TRUE if the drive can write this type of media and FALSE otherwise
**/
gboolean
diff --git a/libbrasero-media/brasero-drive.h b/libbrasero-media/brasero-drive.h
index 15ecde8..34ed811 100644
--- a/libbrasero-media/brasero-drive.h
+++ b/libbrasero-media/brasero-drive.h
@@ -112,10 +112,6 @@ BraseroDriveCaps
brasero_drive_get_caps (BraseroDrive *drive);
gboolean
-brasero_drive_can_write_media (BraseroDrive *drive,
- BraseroMedia media);
-
-gboolean
brasero_drive_can_write (BraseroDrive *drive);
gboolean
diff --git a/libbrasero-media/brasero-medium.c b/libbrasero-media/brasero-medium.c
index 08e0eeb..7e1c62e 100644
--- a/libbrasero-media/brasero-medium.c
+++ b/libbrasero-media/brasero-medium.c
@@ -3251,6 +3251,14 @@ brasero_medium_class_init (BraseroMediumClass *klass)
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
}
+
+/* This function is not public API yet because it was too
+ * late; so use it internally for now. It's mainly for
+ * convenience.*/
+gboolean
+brasero_drive_can_write_media (BraseroDrive *drive,
+ BraseroMedia media);
+
/**
* brasero_medium_can_be_written:
* @medium: #BraseroMedium
@@ -3317,7 +3325,7 @@ brasero_medium_can_be_rewritten (BraseroMedium *medium)
*
* Gets whether the medium supports SAO.
*
- * Since 2.29
+ * Since 2.30
*
* Return value: a #gboolean. TRUE if the medium can use SAO write mode , FALSE otherwise.
*
@@ -3339,7 +3347,7 @@ brasero_medium_can_use_sao (BraseroMedium *medium)
*
* Gets whether the medium supports TAO.
*
- * Since 2.29
+ * Since 2.30
*
* Return value: a #gboolean. TRUE if the medium can use TAO write mode, FALSE otherwise.
*
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]