[maemo-commits] [maemo-commits] r14697 - in projects/haf/trunk/hildon-fm: . debian hildon-fm

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2007-11-01 15:44:11 +0200 (Thu, 01 Nov 2007)
New Revision: 14697

Modified:
   projects/haf/trunk/hildon-fm/ChangeLog
   projects/haf/trunk/hildon-fm/debian/changelog
   projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-selection.c
Log:
	* hildon-fm/hildon-file-selection.c
	(hildon_file_selection_row_deleted): Also move cursor to the next
	row if it was previously in a descendant of the deleted
	row. (N71153)


Modified: projects/haf/trunk/hildon-fm/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-fm/ChangeLog	2007-11-01 13:37:22 UTC (rev 14696)
+++ projects/haf/trunk/hildon-fm/ChangeLog	2007-11-01 13:44:11 UTC (rev 14697)
@@ -1,5 +1,10 @@
 2007-11-01  Marius Vollmer  <marius.vollmer at nokia.com>
 
+	* hildon-fm/hildon-file-selection.c
+	(hildon_file_selection_row_deleted): Also move cursor to the next
+	row if it was previously in a descendant of the deleted
+	row. (N71153)
+	
 	* hildon-fm/hildon-file-system-smb.c: keep a list of pending
 	handles in MyFileFolder object, cancel them on finalize. (N73898)
 	

Modified: projects/haf/trunk/hildon-fm/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-fm/debian/changelog	2007-11-01 13:37:22 UTC (rev 14696)
+++ projects/haf/trunk/hildon-fm/debian/changelog	2007-11-01 13:44:11 UTC (rev 14697)
@@ -1,6 +1,6 @@
 libhildonfm (1:1.9.47~unreleased) unstable; urgency=low
 
-  * Fixes: NB#37279, NB#69201, NB#72950, NB#73898.
+  * Fixes: NB#37279, NB#69201, NB#72950, NB#73898, NB#71153.
 
  -- Marius Vollmer <marius.vollmer at nokia.com>  Thu, 01 Nov 2007 15:08:44 +0200
 

Modified: projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-selection.c
===================================================================
--- projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-selection.c	2007-11-01 13:37:22 UTC (rev 14696)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-selection.c	2007-11-01 13:44:11 UTC (rev 14697)
@@ -4451,9 +4451,10 @@
           return;
         }
 
-      if (cursor_path && gtk_tree_path_compare (path, cursor_path) != 0)
+      if (cursor_path && gtk_tree_path_compare (path, cursor_path) != 0 &&
+	  !gtk_tree_path_is_descendant (cursor_path, path))
         {
-          /* We have a cursor but it is not on the row that is being
+          /* We have a cursor but it is not on/inside the row that is being
              deleted.  Do nothing.
           */
           gtk_tree_path_free (cursor_path);