|
Denis Leroy |
9b44b2 |
--- brasero-0.5.1/src/burn-libisofs.c~ 2006-11-13 20:51:32.000000000 +0100
|
|
Denis Leroy |
9b44b2 |
+++ brasero-0.5.1/src/burn-libisofs.c 2007-01-17 01:00:02.000000000 +0100
|
|
Denis Leroy |
9b44b2 |
@@ -46,7 +46,7 @@
|
|
Denis Leroy |
9b44b2 |
|
|
Denis Leroy |
9b44b2 |
#ifdef HAVE_LIBBURN
|
|
Denis Leroy |
9b44b2 |
|
|
Denis Leroy |
9b44b2 |
-#include <libburn/libisofs.h>
|
|
Denis Leroy |
9b44b2 |
+#include <libisofs/libisofs.h>
|
|
Denis Leroy |
9b44b2 |
#include <libburn/libburn.h>
|
|
Denis Leroy |
9b44b2 |
|
|
Denis Leroy |
9b44b2 |
static void brasero_libisofs_class_init (BraseroLibisofsClass *klass);
|
|
Denis Leroy |
9b44b2 |
--- brasero-0.5.1/src/burn-libburn-common.c~ 2006-09-16 10:06:14.000000000 +0200
|
|
Denis Leroy |
9b44b2 |
+++ brasero-0.5.1/src/burn-libburn-common.c 2007-01-17 01:07:11.000000000 +0100
|
|
Denis Leroy |
9b44b2 |
@@ -247,38 +247,6 @@
|
|
Denis Leroy |
9b44b2 |
return BRASERO_BURN_OK;
|
|
Denis Leroy |
9b44b2 |
}
|
|
Denis Leroy |
9b44b2 |
|
|
Denis Leroy |
9b44b2 |
-static gboolean
|
|
Denis Leroy |
9b44b2 |
-brasero_libburn_common_process_message (BraseroLibburnCommon *self,
|
|
Denis Leroy |
9b44b2 |
- struct burn_message *mes)
|
|
Denis Leroy |
9b44b2 |
-{
|
|
Denis Leroy |
9b44b2 |
- GError *error;
|
|
Denis Leroy |
9b44b2 |
- gboolean retval = TRUE;
|
|
Denis Leroy |
9b44b2 |
-
|
|
Denis Leroy |
9b44b2 |
- switch (mes->type) {
|
|
Denis Leroy |
9b44b2 |
- case BURN_MESSAGE_ERROR:
|
|
Denis Leroy |
9b44b2 |
- if (mes->detail.error.message == BURN_ERROR_CANCELLED) {
|
|
Denis Leroy |
9b44b2 |
- retval = TRUE;
|
|
Denis Leroy |
9b44b2 |
- break;
|
|
Denis Leroy |
9b44b2 |
- }
|
|
Denis Leroy |
9b44b2 |
-
|
|
Denis Leroy |
9b44b2 |
- case BURN_MESSAGE_WARNING:
|
|
Denis Leroy |
9b44b2 |
- error = g_error_new (BRASERO_BURN_ERROR,
|
|
Denis Leroy |
9b44b2 |
- BRASERO_BURN_ERROR_GENERAL,
|
|
Denis Leroy |
9b44b2 |
- _("an unknown error occured with libburn"));
|
|
Denis Leroy |
9b44b2 |
- brasero_job_error (BRASERO_JOB (self), error);
|
|
Denis Leroy |
9b44b2 |
- retval = FALSE;
|
|
Denis Leroy |
9b44b2 |
- break;
|
|
Denis Leroy |
9b44b2 |
-
|
|
Denis Leroy |
9b44b2 |
- case BURN_MESSAGE_INFO:
|
|
Denis Leroy |
9b44b2 |
- BRASERO_JOB_LOG (self, _("(%s) libburn tried to say something"));
|
|
Denis Leroy |
9b44b2 |
- retval = TRUE;
|
|
Denis Leroy |
9b44b2 |
- break;
|
|
Denis Leroy |
9b44b2 |
- }
|
|
Denis Leroy |
9b44b2 |
-
|
|
Denis Leroy |
9b44b2 |
- burn_message_free (mes);
|
|
Denis Leroy |
9b44b2 |
- return retval;
|
|
Denis Leroy |
9b44b2 |
-}
|
|
Denis Leroy |
9b44b2 |
-
|
|
Denis Leroy |
9b44b2 |
static void
|
|
Denis Leroy |
9b44b2 |
brasero_libburn_common_status_changed (BraseroLibburnCommon *self,
|
|
Denis Leroy |
9b44b2 |
enum burn_drive_status status,
|
|
Denis Leroy |
9b44b2 |
@@ -381,15 +349,9 @@
|
|
Denis Leroy |
9b44b2 |
gdouble fraction;
|
|
Denis Leroy |
9b44b2 |
gint64 sectors;
|
|
Denis Leroy |
9b44b2 |
|
|
Denis Leroy |
9b44b2 |
- struct burn_message *message;
|
|
Denis Leroy |
9b44b2 |
enum burn_drive_status status;
|
|
Denis Leroy |
9b44b2 |
struct burn_progress progress;
|
|
Denis Leroy |
9b44b2 |
|
|
Denis Leroy |
9b44b2 |
- /* see if there is any pending message */
|
|
Denis Leroy |
9b44b2 |
- message = burn_get_message ();
|
|
Denis Leroy |
9b44b2 |
- if (message && !brasero_libburn_common_process_message (self, message))
|
|
Denis Leroy |
9b44b2 |
- return;
|
|
Denis Leroy |
9b44b2 |
-
|
|
Denis Leroy |
9b44b2 |
if (!self->priv->drive)
|
|
Denis Leroy |
9b44b2 |
return;
|
|
Denis Leroy |
9b44b2 |
|