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

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2008-04-17 18:56:43 +0300 (Thu, 17 Apr 2008)
New Revision: 15456

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_get_current_folder_path): Return the goal
	uri if we have one (N83593).


Modified: projects/haf/trunk/hildon-fm/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-fm/ChangeLog	2008-04-17 12:19:59 UTC (rev 15455)
+++ projects/haf/trunk/hildon-fm/ChangeLog	2008-04-17 15:56:43 UTC (rev 15456)
@@ -1,3 +1,9 @@
+2008-04-17  Marius Vollmer  <marius.vollmer at nokia.com>
+
+	* hildon-fm/hildon-file-selection.c
+	(_hildon_file_selection_get_current_folder_path): Return the goal
+	uri if we have one (N83593).
+
 2008-04-17  Kimmo Hämäläinen  <kimmo.hamalainen at nokia.com>
 
 	* hildon-fm/hildon-file-selection.c: Add new property PROP_DRAGGING

Modified: projects/haf/trunk/hildon-fm/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-fm/debian/changelog	2008-04-17 12:19:59 UTC (rev 15455)
+++ projects/haf/trunk/hildon-fm/debian/changelog	2008-04-17 15:56:43 UTC (rev 15456)
@@ -1,6 +1,6 @@
 libhildonfm (1:2.0.3~unreleased) unstable; urgency=low
 
-  * Fixes: NB#79697, NB#77225.
+  * Fixes: NB#79697, NB#77225, NB#83593.
   * Add "currently-dragging" property to HildonFileSelection. Related to
     NB#83827
 

Modified: projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-selection.c
===================================================================
--- projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-selection.c	2008-04-17 12:19:59 UTC (rev 15455)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-selection.c	2008-04-17 15:56:43 UTC (rev 15456)
@@ -3479,7 +3479,14 @@
 _hildon_file_selection_get_current_folder_path (HildonFileSelection *self)
 {
   GtkTreeIter iter;
+  HildonFileSystemModel *model =
+    HILDON_FILE_SYSTEM_MODEL(self->priv->main_model);
 
+  if (self->priv->cursor_goal_uri)
+    return (gtk_file_system_uri_to_path
+	    (_hildon_file_system_model_get_file_system(model),
+	     self->priv->cursor_goal_uri));
+ 
   if (hildon_file_selection_get_current_folder_iter(self, &iter)) {
     GtkFilePath *path;