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

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2008-02-20 16:51:08 +0200 (Wed, 20 Feb 2008)
New Revision: 15207

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 (create_folder_callback):
	Ignore unexpected handles instead of aborting (N76517).


Modified: projects/haf/trunk/hildon-fm/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-fm/ChangeLog	2008-02-20 14:49:40 UTC (rev 15206)
+++ projects/haf/trunk/hildon-fm/ChangeLog	2008-02-20 14:51:08 UTC (rev 15207)
@@ -1,3 +1,8 @@
+2008-02-20  Marius Vollmer  <marius.vollmer at nokia.com>
+
+	* hildon-fm/hildon-file-chooser-dialog.c (create_folder_callback):
+	Ignore unexpected handles instead of aborting (N76517).
+
 2008-01-09  Marius Vollmer  <marius.vollmer at nokia.com>
 
 	Released 1.9.49 again as 2.0.0 for the Hildon 2.0 release.

Modified: projects/haf/trunk/hildon-fm/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-fm/debian/changelog	2008-02-20 14:49:40 UTC (rev 15206)
+++ projects/haf/trunk/hildon-fm/debian/changelog	2008-02-20 14:51:08 UTC (rev 15207)
@@ -1,6 +1,6 @@
 libhildonfm (1:2.0.1~unreleased) unstable; urgency=low
 
-  * 
+  * Fixes: NB#76517.
 
  -- 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 14:49:40 UTC (rev 15206)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-chooser-dialog.c	2008-02-20 14:51:08 UTC (rev 15207)
@@ -1227,7 +1227,11 @@
     g_assert(HILDON_IS_FILE_CHOOSER_DIALOG(data));
     self = HILDON_FILE_CHOOSER_DIALOG(data);
 
-    g_assert(self->priv->create_folder_handle == handle);
+    /* There can be still pending cancelled handles
+     * from previous operations, just ignore them
+     */
+    if (self->priv->create_folder_handle != handle)
+	    return;
 
     self->priv->create_folder_handle = NULL;
     dialog = GTK_DIALOG(self);