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

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2008-02-20 18:47:01 +0200 (Wed, 20 Feb 2008)
New Revision: 15214

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
	(hildon_file_chooser_entry_changed): save the filename entry
	content as the internal file name as soon as it changes, so there
	isn't any mismatch between the internally stored name and the
	displayed one. (N75049)


Modified: projects/haf/trunk/hildon-fm/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-fm/ChangeLog	2008-02-20 16:44:02 UTC (rev 15213)
+++ projects/haf/trunk/hildon-fm/ChangeLog	2008-02-20 16:47:01 UTC (rev 15214)
@@ -1,6 +1,12 @@
 2008-02-20  Marius Vollmer  <marius.vollmer at nokia.com>
 
 	* hildon-fm/hildon-file-chooser-dialog.c
+	(hildon_file_chooser_entry_changed): save the filename entry
+	content as the internal file name as soon as it changes, so there
+	isn't any mismatch between the internally stored name and the
+	displayed one. (N75049)
+
+	* 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/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-fm/debian/changelog	2008-02-20 16:44:02 UTC (rev 15213)
+++ projects/haf/trunk/hildon-fm/debian/changelog	2008-02-20 16:47:01 UTC (rev 15214)
@@ -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, NB#74397.
+  * Fixes: NB#76327, NB#74397, NB#75049.
 
  -- 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:44:02 UTC (rev 15213)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-chooser-dialog.c	2008-02-20 16:47:01 UTC (rev 15214)
@@ -434,9 +434,9 @@
 hildon_file_chooser_dialog_do_autonaming(HildonFileChooserDialogPrivate *
                                          priv)
 {
+    gboolean changed;
+
     g_assert(HILDON_IS_FILE_SELECTION(priv->filetree));
-	
-	gboolean changed;
 
     if (GTK_WIDGET_VISIBLE(priv->caption_control_name) &&
         priv->stub_name && priv->stub_name[0] && !priv->edited)
@@ -1947,6 +1947,10 @@
 
     priv = HILDON_FILE_CHOOSER_DIALOG( data )->priv;
     priv->edited = TRUE;
+
+    g_free (priv->stub_name);
+    priv->stub_name = g_strdup (gtk_entry_get_text (GTK_ENTRY (widget)));
+
     gtk_dialog_set_response_sensitive(GTK_DIALOG(data),
                                           GTK_RESPONSE_OK,
                                           strlen(gtk_entry_get_text(GTK_ENTRY(widget))) > 0);