brasero r964 - in trunk: . src

[philippr svn gnome org]

Author: philippr
Date: Wed Jul  9 18:15:03 2008
New Revision: 964
URL: http://svn.gnome.org/viewvc/brasero?rev=964&view=rev

Log:
	Fix warnings in data projects
	Fix previous changes (problem with bogus rows)

	* src/brasero-data-tree-model.c
	(brasero_data_tree_model_iter_parent),
	(brasero_data_tree_model_iter_nth_child),
	(brasero_data_tree_model_iter_children),
	(brasero_data_tree_model_iter_next),
	(brasero_data_tree_model_get_value),
	(brasero_data_tree_model_get_path),
	(brasero_data_tree_model_path_to_node),
	(brasero_data_tree_model_node_added):

Modified:
   trunk/ChangeLog
   trunk/src/brasero-data-tree-model.c

Modified: trunk/src/brasero-data-tree-model.c
==============================================================================
--- trunk/src/brasero-data-tree-model.c	(original)
+++ trunk/src/brasero-data-tree-model.c	Wed Jul  9 18:15:03 2008
@@ -105,7 +105,7 @@
 	g_return_val_if_fail (child->user_data != NULL, FALSE);
 
 	node = child->user_data;
-	if (iter->user_data2 == GINT_TO_POINTER (BRASERO_ROW_BOGUS)) {
+	if (child->user_data2 == GINT_TO_POINTER (BRASERO_ROW_BOGUS)) {
 		/* This is a bogus row intended for empty directories
 		 * user_data has the parent empty directory. */
 		iter->user_data2 = GINT_TO_POINTER (BRASERO_ROW_REGULAR);
@@ -141,7 +141,7 @@
 		g_return_val_if_fail (priv->stamp == parent->stamp, FALSE);
 		g_return_val_if_fail (parent->user_data != NULL, FALSE);
 
-		if (iter->user_data2 == GINT_TO_POINTER (BRASERO_ROW_BOGUS)) {
+		if (parent->user_data2 == GINT_TO_POINTER (BRASERO_ROW_BOGUS)) {
 			/* This is a bogus row intended for empty directories,
 			 * it hasn't got children. */
 			return FALSE;
@@ -238,7 +238,6 @@
 
 	priv = BRASERO_DATA_TREE_MODEL_PRIVATE (model);
 
-	/* make sure that iter comes from us */
 	if (!parent) {
 		BraseroFileNode *root;
 
@@ -253,6 +252,7 @@
 		return TRUE;
 	}
 
+	/* make sure that iter comes from us */
 	g_return_val_if_fail (priv->stamp == parent->stamp, FALSE);
 	g_return_val_if_fail (parent->user_data != NULL, FALSE);
 
@@ -305,7 +305,6 @@
 
 	node = iter->user_data;
 	iter->user_data = node->next;
-
 	if (!node->next)
 		return FALSE;
 
@@ -458,6 +457,11 @@
 			g_value_init (value, G_TYPE_BOOLEAN);
 			g_value_set_boolean (value, FALSE);
 			return;
+	
+		case BRASERO_DATA_TREE_MODEL_COLOR:
+			g_value_init (value, G_TYPE_STRING);
+			g_value_set_string (value, NULL);
+			return;
 
 		default:
 			return;
@@ -697,13 +701,7 @@
 	node = iter->user_data;
 
 	/* NOTE: there is only one single node without a name: root */
-	path = gtk_tree_path_new ();
-	for (; node->parent && BRASERO_FILE_NODE_NAME (node); node = node->parent) {
-		guint nth;
-
-		nth = brasero_data_tree_model_node_index (node);
-		gtk_tree_path_prepend_index (path, nth);
-	}
+	path = brasero_data_tree_model_node_to_path (BRASERO_DATA_TREE_MODEL (model), node);
 
 	/* Add index 0 for empty bogus row */
 	if (iter->user_data2 == GINT_TO_POINTER (BRASERO_ROW_BOGUS))
@@ -736,7 +734,6 @@
 		if (!node)
 			return NULL;
 	}
-
 	return node;
 }
 
@@ -1175,7 +1172,7 @@
 	if (BRASERO_DATA_PROJECT_CLASS (brasero_data_tree_model_parent_class)->reset)
 		BRASERO_DATA_PROJECT_CLASS (brasero_data_tree_model_parent_class)->reset (project, num_nodes);
 }
-guint tintin = 1;
+
 static gboolean
 brasero_data_tree_model_node_added (BraseroDataProject *project,
 				    BraseroFileNode *node,
@@ -1210,7 +1207,6 @@
 	}
 
 	/* Add the row itself */
-	
 	gtk_tree_model_row_inserted (GTK_TREE_MODEL (project),
 				     path,
 				     &iter);
@@ -1238,23 +1234,11 @@
 
 	/* Now see if this is a directory which is empty and needs a BOGUS */
 	if (!node->is_file && !node->is_loading) {
-		/* NOTE: No need to check for the number of children ... */
-
 		/* emit child-toggled. Thanks to bogus rows we only need to emit
 		 * this signal once since a directory will always have a child
 		 * in the tree */
 		path = brasero_data_tree_model_node_to_path (BRASERO_DATA_TREE_MODEL (project), node);
 		gtk_tree_model_row_has_child_toggled (GTK_TREE_MODEL (project), path, &iter);
-
-		/* add the row */
-		iter.stamp = priv->stamp;
-		iter.user_data = node;
-		iter.user_data2 = GINT_TO_POINTER (BRASERO_ROW_BOGUS);
-
-		gtk_tree_path_append_index (path, 0);
-		gtk_tree_model_row_inserted (GTK_TREE_MODEL (project),
-					     path,
-					     &iter);
 		gtk_tree_path_free (path);
 	}