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

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2007-09-28 16:04:54 +0300 (Fri, 28 Sep 2007)
New Revision: 14184

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_set_cursor_stubbornly): also emit
	stubbornly ::current-folder-changed (N66336).
	(struct idle_cursor_data) (set_cursor_idle_handler)
	(set_cursor_when_idle)
	(hildon_file_selection_row_deleted)
	(hildon_file_selection_row_inserted): pass the HildonFileSelection
	around.


Modified: projects/haf/trunk/hildon-fm/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-fm/ChangeLog	2007-09-28 12:59:38 UTC (rev 14183)
+++ projects/haf/trunk/hildon-fm/ChangeLog	2007-09-28 13:04:54 UTC (rev 14184)
@@ -1,5 +1,14 @@
 2007-09-28  Marius Vollmer  <marius.vollmer at nokia.com>
 
+	* hildon-fm/hildon-file-selection.c
+	(hildon_file_selection_set_cursor_stubbornly): also emit
+	stubbornly ::current-folder-changed (N66336).
+	(struct idle_cursor_data) (set_cursor_idle_handler)
+	(set_cursor_when_idle)
+	(hildon_file_selection_row_deleted)
+	(hildon_file_selection_row_inserted): pass the HildonFileSelection
+	around.
+
 	* hildon-fm/hildon-file-chooser-dialog.c (build_ui): Put the
 	location into a HildonCaption, make it focusable and popup the
 	change folder dialog when GDK_Enter is pressed (N68746).

Modified: projects/haf/trunk/hildon-fm/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-fm/debian/changelog	2007-09-28 12:59:38 UTC (rev 14183)
+++ projects/haf/trunk/hildon-fm/debian/changelog	2007-09-28 13:04:54 UTC (rev 14184)
@@ -1,7 +1,7 @@
 libhildonfm (1:1.9.41~unreleased) unstable; urgency=low
 
   * Fixes: NB#71163, NB#71170, NB#71144, NB#71168, NB#69754.
-  * Fixes: NB#70816, NB#68746, NB#70479, NB#71265.
+  * Fixes: NB#70816, NB#68746, NB#70479, NB#71265, NB#66336.
 
  -- Marius Vollmer <marius.vollmer at nokia.com>  Tue, 25 Sep 2007 09:56:09 +0300
 

Modified: projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-selection.c
===================================================================
--- projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-selection.c	2007-09-28 12:59:38 UTC (rev 14183)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-selection.c	2007-09-28 13:04:54 UTC (rev 14184)
@@ -4291,7 +4291,8 @@
    not valid for the model.
 */
 static void
-hildon_file_selection_set_cursor_stubbornly (GtkTreeView *view,
+hildon_file_selection_set_cursor_stubbornly (HildonFileSelection *self,
+					     GtkTreeView *view,
                                              GtkTreePath *path)
 {
   GtkTreeIter iter;
@@ -4324,9 +4325,12 @@
       gtk_tree_view_set_cursor (GTK_TREE_VIEW (view), p, NULL, FALSE);
       gtk_tree_path_free (p);
     }
+
+  g_signal_emit(self, signal_folder_changed, 0);
 }
 
 struct idle_cursor_data {
+  HildonFileSelection *self;
   GtkTreeView *view;
   GtkTreePath *path;
   gboolean stubbornly;
@@ -4339,7 +4343,7 @@
 
   GDK_THREADS_ENTER ();
   if (c->stubbornly)
-    hildon_file_selection_set_cursor_stubbornly (c->view, c->path);
+    hildon_file_selection_set_cursor_stubbornly (c->self, c->view, c->path);
   else
     gtk_tree_view_set_cursor (c->view, c->path, NULL, FALSE);
 
@@ -4351,10 +4355,12 @@
 }
 
 static void
-set_cursor_when_idle (GtkTreeView *view, GtkTreePath *path,
+set_cursor_when_idle (HildonFileSelection *self,
+		      GtkTreeView *view, GtkTreePath *path,
                       gboolean stubbornly)
 {
   struct idle_cursor_data *c = g_new (struct idle_cursor_data, 1);
+  c->self = self;
   c->view = GTK_TREE_VIEW (view);
   c->path = gtk_tree_path_copy (path);
   c->stubbornly = stubbornly;
@@ -4434,7 +4440,7 @@
         }
       gtk_tree_path_free (cursor_path);
 
-      set_cursor_when_idle (view, path, TRUE);
+      set_cursor_when_idle (self, view, path, TRUE);
     }
 }
 
@@ -4465,7 +4471,7 @@
       !gtk_tree_selection_get_selected (selection, NULL, NULL))
     {
       gtk_tree_view_expand_to_path (view, path);
-      set_cursor_when_idle (view, path, FALSE);
+      set_cursor_when_idle (self, view, path, FALSE);
       g_free (priv->cursor_goal_uri);
       priv->cursor_goal_uri = NULL;
     }