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

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2008-02-20 18:44:02 +0200 (Wed, 20 Feb 2008)
New Revision: 15213

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): Do not change current name unless there has
	been actually a change in the subdialog. (N74397)


Modified: projects/haf/trunk/hildon-fm/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-fm/ChangeLog	2008-02-20 16:40:34 UTC (rev 15212)
+++ projects/haf/trunk/hildon-fm/ChangeLog	2008-02-20 16:44:02 UTC (rev 15213)
@@ -1,5 +1,9 @@
 2008-02-20  Marius Vollmer  <marius.vollmer at nokia.com>
 
+	* hildon-fm/hildon-file-chooser-dialog.c
+	(handle_folder_popup): Do not change current name unless there has
+	been actually a change in the subdialog. (N74397)
+
 	* hildon-fm/hildon-file-system-private.c
 	(_hildon_file_system_compare_ignore_last_separator): actually
 	ignore all appended slashes in both paths instead of just removing

Modified: projects/haf/trunk/hildon-fm/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-fm/debian/changelog	2008-02-20 16:40:34 UTC (rev 15212)
+++ projects/haf/trunk/hildon-fm/debian/changelog	2008-02-20 16:44:02 UTC (rev 15213)
@@ -1,7 +1,7 @@
 libhildonfm (1:2.0.1~unreleased) unstable; urgency=low
 
   * Fixes: NB#76517, NB#79427, NB#76380, NB#76271, NB#79697.
-  * Fixes: NB#76327.
+  * Fixes: NB#76327, NB#74397.
 
  -- Marius Vollmer <marius.vollmer at nokia.com>  Wed, 20 Feb 2008 16:42:40 +0200
 

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	2008-02-20 16:40:34 UTC (rev 15212)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-chooser-dialog.c	2008-02-20 16:44:02 UTC (rev 15213)
@@ -1261,6 +1261,7 @@
   GtkWidget *dialog;
   gint response;
   gchar *uri = NULL;
+  gboolean edit_entry = FALSE;
 
   g_return_if_fail(HILDON_IS_FILE_CHOOSER_DIALOG(self));
 
@@ -1275,14 +1276,6 @@
 
   self->priv->popup_protect = TRUE;
 
-  if (self->priv->edited)
-  {
-    self->priv->edited = FALSE;
-    hildon_file_chooser_dialog_set_current_name 
-      (GTK_FILE_CHOOSER(self),
-       get_entry (self->priv->entry_name, self->priv->ext_name));
-  }
-
   backend = _hildon_file_system_model_get_file_system(self->priv->model);
 
   if (self->priv->action == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER)
@@ -1338,6 +1331,7 @@
 			hildon_file_selection_move_cursor_to_uri (self->priv->filetree, 
 								  uri);
 		}
+	edit_entry = TRUE;
       }
     gtk_file_path_free(file_path);
   }
@@ -1347,9 +1341,20 @@
                GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
 
     if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_OK)
-      sync_current_folders(HILDON_FILE_CHOOSER_DIALOG(dialog), self);
+      {
+        sync_current_folders(HILDON_FILE_CHOOSER_DIALOG(dialog), self);
+	edit_entry = TRUE;
+      }
   }
 
+  if (edit_entry && self->priv->edited)
+  {
+    self->priv->edited = FALSE;
+    hildon_file_chooser_dialog_set_current_name 
+      (GTK_FILE_CHOOSER(self),
+       get_entry (self->priv->entry_name, self->priv->ext_name));
+  }
+
   gtk_widget_destroy(dialog);
   gtk_window_present(GTK_WINDOW(self));
   self->priv->popup_protect = FALSE;