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

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2007-09-21 16:11:09 +0300 (Fri, 21 Sep 2007)
New Revision: 13999

Modified:
   projects/haf/trunk/hildon-fm/ChangeLog
   projects/haf/trunk/hildon-fm/debian/changelog
   projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-chooser-dialog.c
Log:
	* hildon-fm/hildon-file-chooser-dialog.c (handle_folder_popup):
	Use hildon_file_selection_move_cursor_to_uri when
	set_current_folder fails (N63425).
	(handle_folder_popup): Do not cast first argument to get_entry,
	get_entry takes a GtkWidget.


Modified: projects/haf/trunk/hildon-fm/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-fm/ChangeLog	2007-09-21 13:10:34 UTC (rev 13998)
+++ projects/haf/trunk/hildon-fm/ChangeLog	2007-09-21 13:11:09 UTC (rev 13999)
@@ -6,6 +6,12 @@
 
 2007-09-21  Marius Vollmer  <marius.vollmer at nokia.com>
 
+	* hildon-fm/hildon-file-chooser-dialog.c (handle_folder_popup):
+	Use hildon_file_selection_move_cursor_to_uri when
+	set_current_folder fails (N63425).
+	(handle_folder_popup): Do not cast first argument to get_entry,
+	get_entry takes a GtkWidget.
+
 	* hildon-fm/hildon-file-selection.c
 	(hildon_file_selection_create_thumbnail_view,
 	hildon_file_selection_create_list_view): Ellipsize display name in

Modified: projects/haf/trunk/hildon-fm/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-fm/debian/changelog	2007-09-21 13:10:34 UTC (rev 13998)
+++ projects/haf/trunk/hildon-fm/debian/changelog	2007-09-21 13:11:09 UTC (rev 13999)
@@ -1,6 +1,6 @@
 libhildonfm (1:1.9.40~unreleased) unstable; urgency=low
 
-  * Fixes: NB#63339, NB#59490, NB#63171.
+  * Fixes: NB#63339, NB#63171, NB#63425, NB#59490.
 
  -- Marius Vollmer <marius.vollmer at nokia.com>  Mon, 17 Sep 2007 23:13:51 +0300
 

Modified: projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-chooser-dialog.c
===================================================================
--- projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-chooser-dialog.c	2007-09-21 13:10:34 UTC (rev 13998)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-chooser-dialog.c	2007-09-21 13:11:09 UTC (rev 13999)
@@ -1230,6 +1230,7 @@
   GtkFileSystem *backend;
   GtkWidget *dialog;
   gint response;
+  gchar *uri = NULL;
 
   g_return_if_fail(HILDON_IS_FILE_CHOOSER_DIALOG(self));
 
@@ -1249,8 +1250,7 @@
     self->priv->edited = FALSE;
     hildon_file_chooser_dialog_set_current_name 
       (GTK_FILE_CHOOSER(self),
-       get_entry (GTK_ENTRY(self->priv->entry_name),
-		  self->priv->ext_name));
+       get_entry (self->priv->entry_name, self->priv->ext_name));
   }
 
   backend = _hildon_file_system_model_get_file_system(self->priv->model);
@@ -1264,8 +1264,6 @@
 
     while ((response = gtk_dialog_run(GTK_DIALOG(dialog))) == GTK_RESPONSE_OK)
     {
-      gchar *uri;
-
       uri = gtk_file_chooser_get_uri(GTK_FILE_CHOOSER(dialog));
       ULOG_INFO_F("About to create folder %s", uri);
 
@@ -1288,8 +1286,6 @@
                                        create_folder_callback,
                                        g_object_ref(dialog));
 
-      g_free(uri);
-
       /* Make OK button insensitive while folder operation is going */
       gtk_dialog_set_response_sensitive
         (GTK_DIALOG(dialog), GTK_RESPONSE_OK, FALSE);
@@ -1304,8 +1300,11 @@
     if (response == HILDON_RESPONSE_FOLDER_CREATED)
       {
         g_assert(file_path != NULL);
-        hildon_file_chooser_dialog_set_current_folder
-          (GTK_FILE_CHOOSER(self), file_path, NULL);
+        if (!hildon_file_chooser_dialog_set_current_folder
+          (GTK_FILE_CHOOSER(self), file_path, NULL) && uri) {
+			hildon_file_selection_move_cursor_to_uri (self->priv->filetree, 
+														uri);
+		}
       }
     gtk_file_path_free(file_path);
   }
@@ -1321,6 +1320,7 @@
   gtk_widget_destroy(dialog);
   gtk_window_present(GTK_WINDOW(self));
   self->priv->popup_protect = FALSE;
+  g_free(uri);
 }
 
 static gboolean hildon_file_chooser_dialog_location_pressed(GtkWidget