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

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2007-11-01 15:35:31 +0200 (Thu, 01 Nov 2007)
New Revision: 14695

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):
	relax a bit the requirement of create_folder_handle being NULL,
	just cancelling the previous operation. (N72950)


Modified: projects/haf/trunk/hildon-fm/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-fm/ChangeLog	2007-11-01 13:32:19 UTC (rev 14694)
+++ projects/haf/trunk/hildon-fm/ChangeLog	2007-11-01 13:35:31 UTC (rev 14695)
@@ -1,5 +1,9 @@
 2007-11-01  Marius Vollmer  <marius.vollmer at nokia.com>
 
+	* hildon-fm/hildon-file-chooser-dialog.c (handle_folder_popup):
+	relax a bit the requirement of create_folder_handle being NULL,
+	just cancelling the previous operation. (N72950)
+	
 	* hildon-fm/hildon-file-selection.c (sort_function): Fall back to
 	sorting by name when time or size are identical (N69201).
 

Modified: projects/haf/trunk/hildon-fm/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-fm/debian/changelog	2007-11-01 13:32:19 UTC (rev 14694)
+++ projects/haf/trunk/hildon-fm/debian/changelog	2007-11-01 13:35:31 UTC (rev 14695)
@@ -1,6 +1,6 @@
 libhildonfm (1:1.9.47~unreleased) unstable; urgency=low
 
-  * Fixes: NB#37279, NB#69201.
+  * Fixes: NB#37279, NB#69201, NB#72950.
 
  -- Marius Vollmer <marius.vollmer at nokia.com>  Thu, 01 Nov 2007 15:08:44 +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	2007-11-01 13:32:19 UTC (rev 14694)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-chooser-dialog.c	2007-11-01 13:35:31 UTC (rev 14695)
@@ -1296,7 +1296,11 @@
       HildonFileChooserDialogPrivate *sub_priv =
         HILDON_FILE_CHOOSER_DIALOG (dialog)->priv;
 
-      g_assert(sub_priv->create_folder_handle == NULL);
+      if (sub_priv->create_folder_handle)
+        {
+	  gtk_file_system_cancel_operation (sub_priv->create_folder_handle);
+	  sub_priv->create_folder_handle = NULL;
+	}
 
       /* Callback is quaranteed to be called, it unrefs the object data */
       sub_priv->create_folder_handle =