[Goodies-commits] r6117 - xfburn/trunk/xfburn
David Mohr
squisher at xfce.org
Sun Nov 16 17:24:40 CET 2008
Author: squisher
Date: 2008-11-16 16:24:40 +0000 (Sun, 16 Nov 2008)
New Revision: 6117
Modified:
xfburn/trunk/xfburn/xfburn-data-composition.c
Log:
Add directories to the iso with properties from the filesystem through iso_tree_add_node
Modified: xfburn/trunk/xfburn/xfburn-data-composition.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-data-composition.c 2008-11-16 09:58:06 UTC (rev 6116)
+++ xfburn/trunk/xfburn/xfburn-data-composition.c 2008-11-16 16:24:40 UTC (rev 6117)
@@ -1099,6 +1099,7 @@
DATA_COMPOSITION_COLUMN_ICON, icon_directory,
DATA_COMPOSITION_COLUMN_CONTENT, name,
DATA_COMPOSITION_COLUMN_TYPE, DATA_COMPOSITION_TYPE_DIRECTORY,
+ DATA_COMPOSITION_COLUMN_PATH, path,
DATA_COMPOSITION_COLUMN_SIZE, (guint64) 4, -1);
xfburn_disc_usage_add_size (XFBURN_DISC_USAGE (priv->disc_usage), (guint64) 4);
gdk_threads_leave ();
@@ -1162,14 +1163,16 @@
DATA_COMPOSITION_COLUMN_ICON, (G_IS_OBJECT (mime_icon) ? mime_icon : icon_file),
DATA_COMPOSITION_COLUMN_CONTENT, name,
DATA_COMPOSITION_COLUMN_HUMANSIZE, humansize,
- DATA_COMPOSITION_COLUMN_SIZE, (guint64) s.st_size, DATA_COMPOSITION_COLUMN_PATH, path,
+ DATA_COMPOSITION_COLUMN_SIZE, (guint64) s.st_size,
+ DATA_COMPOSITION_COLUMN_PATH, path,
DATA_COMPOSITION_COLUMN_TYPE, DATA_COMPOSITION_TYPE_FILE, -1);
#else
gtk_tree_store_set (GTK_TREE_STORE (model), iter,
DATA_COMPOSITION_COLUMN_ICON, icon_file,
DATA_COMPOSITION_COLUMN_CONTENT, name,
DATA_COMPOSITION_COLUMN_HUMANSIZE, humansize,
- DATA_COMPOSITION_COLUMN_SIZE, (guint64) s.st_size, DATA_COMPOSITION_COLUMN_PATH, path,
+ DATA_COMPOSITION_COLUMN_SIZE, (guint64) s.st_size,
+ DATA_COMPOSITION_COLUMN_PATH, path,
DATA_COMPOSITION_COLUMN_TYPE, DATA_COMPOSITION_TYPE_FILE, -1);
#endif
@@ -1742,10 +1745,7 @@
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)
- r = iso_tree_add_new_dir (parent, name, &dir);
- else
- r = iso_tree_add_node (image, parent, src, &node);
+ r = iso_tree_add_node (image, parent, src, &node);
if (r < 0) {
if (r == ISO_NULL_POINTER)
@@ -1758,9 +1758,11 @@
g_error ("Failed adding %s as a node to the image: code %d!", src, r);
}
- /* FIXME: do we need to call iso_node_ref on node? Probably not... */
+ /* why was this called again? iso_tree_add_node seems to do
+ * a good job setting the name by itself.
if (type != DATA_COMPOSITION_TYPE_DIRECTORY)
iso_node_set_name (node, name);
+ */
g_free (name);
g_free (src);
@@ -1768,10 +1770,9 @@
if (type == DATA_COMPOSITION_TYPE_DIRECTORY && gtk_tree_model_iter_has_child (model, iter)) {
GtkTreeIter child;
- /* FIXME: this should not cause a sigfault...
if (iso_node_get_type(node) != LIBISO_DIR)
g_error ("Expected %s to be a directory, but it isn't...\n", src);
- */
+ dir = (IsoDir *)node;
gtk_tree_model_iter_children (model, &child, iter);
fill_image_with_composition (model, image, dir, &child);
More information about the Goodies-commits
mailing list