Author: pollux
Date: 2007-08-21 14:59:27 +0000 (Tue, 21 Aug 2007)
New Revision: 25995
Modified:
xfburn/trunk/configure.in.in
xfburn/trunk/xfburn/xfburn-burn-data-cd-composition-dialog.c
xfburn/trunk/xfburn/xfburn-burn-data-dvd-composition-dialog.c
xfburn/trunk/xfburn/xfburn-data-composition.c
Log:
build with libisofs 0.2.8
Modified: xfburn/trunk/configure.in.in
===================================================================
--- xfburn/trunk/configure.in.in 2007-08-20 22:50:08 UTC (rev 25994)
+++ xfburn/trunk/configure.in.in 2007-08-21 14:59:27 UTC (rev 25995)
@@ -30,7 +30,7 @@
dnl check for required packages
XDT_CHECK_PACKAGE([LIBBURN], [libburn-1], [0.3.0])
-XDT_CHECK_PACKAGE([LIBISOFS], [libisofs-1], [0.2.3])
+XDT_CHECK_PACKAGE([LIBISOFS], [libisofs-1], [0.2.8])
XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.6.0])
XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0])
XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.4.0])
Modified: xfburn/trunk/xfburn/xfburn-burn-data-cd-composition-dialog.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-burn-data-cd-composition-dialog.c
2007-08-20 22:50:08 UTC (rev 25994)
+++ xfburn/trunk/xfburn/xfburn-burn-data-cd-composition-dialog.c
2007-08-21 14:59:27 UTC (rev 25995)
@@ -545,8 +545,13 @@
GtkWidget *dialog_progress;
struct burn_source * src = NULL;
+ struct ecma119_source_opts src_opts = {};
- src = iso_source_new_ecma119 (priv->volume_set, 0, 2, ECMA119_JOLIET);
+ src_opts.volnum = 0;
+ src_opts.level = 2;
+ src_opts.flags = ECMA119_JOLIET;
+
+ src = iso_source_new_ecma119 (priv->volume_set, &src_opts);
if (src == NULL) {
/* could not create source */
xfce_err (_("Could not create ISO source structure"));
Modified: xfburn/trunk/xfburn/xfburn-burn-data-dvd-composition-dialog.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-burn-data-dvd-composition-dialog.c
2007-08-20 22:50:08 UTC (rev 25994)
+++ xfburn/trunk/xfburn/xfburn-burn-data-dvd-composition-dialog.c
2007-08-21 14:59:27 UTC (rev 25995)
@@ -538,8 +538,12 @@
GtkWidget *dialog_progress;
struct burn_source * src = NULL;
+ struct ecma119_source_opts src_opts = {};
- src = iso_source_new_ecma119 (priv->volume_set, 0, 2, ECMA119_JOLIET);
+ src_opts.volnum = 0;
+ src_opts.level = 2;
+ src_opts.flags = ECMA119_JOLIET;
+ src = iso_source_new_ecma119 (priv->volume_set, &src_opts);
if (src == NULL) {
/* could not create source */
xfce_err (_("Could not create ISO source structure"));
Modified: xfburn/trunk/xfburn/xfburn-data-composition.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-data-composition.c 2007-08-20 22:50:08 UTC
(rev 25994)
+++ xfburn/trunk/xfburn/xfburn-data-composition.c 2007-08-21 14:59:27 UTC
(rev 25995)
@@ -1440,21 +1440,23 @@
}
static void
-fill_volume_with_composition (GtkTreeModel *model, struct iso_tree_node *
parent, GtkTreeIter *iter)
+fill_volume_with_composition (GtkTreeModel *model, struct iso_tree_node_dir *
parent, GtkTreeIter *iter)
{
do {
DataCompositionEntryType type;
gchar *name = NULL;
gchar *src = NULL;
- struct iso_tree_node *node = NULL;
+ struct iso_tree_node_dir *node_dir = NULL;
gtk_tree_model_get (model, iter, DATA_COMPOSITION_COLUMN_TYPE, &type,
DATA_COMPOSITION_COLUMN_CONTENT, &name,
DATA_COMPOSITION_COLUMN_PATH, &src, -1);
if (type == DATA_COMPOSITION_TYPE_DIRECTORY) {
- node = iso_tree_add_new_dir (parent, name);
+ node_dir = iso_tree_add_dir (parent, name);
} else {
+ struct iso_tree_node *node = NULL;
+
node = iso_tree_add_node (parent, src);
iso_tree_node_set_name (node, name);
}
@@ -1465,7 +1467,7 @@
GtkTreeIter child;
gtk_tree_model_iter_children (model, &child, iter);
- fill_volume_with_composition (model, node, &child);
+ fill_volume_with_composition (model, node_dir, &child);
}
} while (gtk_tree_model_iter_next (model, iter));
}
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
