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