anjuta r4043 - in trunk: . libanjuta/interfaces plugins/file-manager

[jhs svn gnome org]

Author: jhs
Date: Wed Jul  2 11:17:42 2008
New Revision: 4043
URL: http://svn.gnome.org/viewvc/anjuta?rev=4043&view=rev

Log:
2008-07-02  Johannes Schmid  <jhs gnome org>

	* libanjuta/interfaces/libanjuta.idl:
	Corrected sigal argument
	* plugins/file-manager/file-model.c (file_model_row_collapsed):
	#538921 Duplicated folders

Modified:
   trunk/ChangeLog
   trunk/libanjuta/interfaces/libanjuta.idl
   trunk/plugins/file-manager/file-model.c

Modified: trunk/libanjuta/interfaces/libanjuta.idl
==============================================================================
--- trunk/libanjuta/interfaces/libanjuta.idl	(original)
+++ trunk/libanjuta/interfaces/libanjuta.idl	Wed Jul  2 11:17:42 2008
@@ -88,7 +88,7 @@
 		 * 
 		 * This signal is emitted when the content is saved.
 		 */
-		void ::saved (const gchar *file);
+		void ::saved (GFile* file);
 		
 		/**
 		 * ianjuta_file_savable_save:

Modified: trunk/plugins/file-manager/file-model.c
==============================================================================
--- trunk/plugins/file-manager/file-model.c	(original)
+++ trunk/plugins/file-manager/file-model.c	Wed Jul  2 11:17:42 2008
@@ -324,10 +324,14 @@
 	GtkTreeModel* sort_model = gtk_tree_view_get_model(tree_view);
 	FileModel* model = FILE_MODEL(data);
 	GtkTreeIter child;
+	GtkTreeIter sort_iter;
 	GtkTreeIter real_iter;
 	
+	/* Iter might be invalid in some conditions */
+	gtk_tree_model_get_iter (sort_model, &sort_iter, path);
+	
 	gtk_tree_model_sort_convert_iter_to_child_iter(GTK_TREE_MODEL_SORT(sort_model),
-												   &real_iter, iter);
+												   &real_iter, &sort_iter);
 
 	while (gtk_tree_model_iter_children (GTK_TREE_MODEL(model), &child, &real_iter))
 	{