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

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-09-24 11:19:00 +0300 (Mon, 24 Sep 2007)
New Revision: 14023

Modified:
   projects/haf/trunk/hildon-fm/ChangeLog
   projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-model.c
Log:
added missing thread locking to dfa_run


Modified: projects/haf/trunk/hildon-fm/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-fm/ChangeLog	2007-09-24 08:13:24 UTC (rev 14022)
+++ projects/haf/trunk/hildon-fm/ChangeLog	2007-09-24 08:19:00 UTC (rev 14023)
@@ -1,3 +1,9 @@
+2007-09-24  Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>
+
+	* hildon-fm/hildon-file-system-model.c (dfa_run): Add a missing
+	GDK_THREADS_ENTER/LEAVE pair, fixes a crash that happens when closing
+	memory card cover after starting File Manager.
+
 2007-09-21  Marius Vollmer  <marius.vollmer at nokia.com>
 
 	* hildon-fm/hildon-file-chooser-dialog.c (response_handler): Use

Modified: projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-model.c
===================================================================
--- projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-model.c	2007-09-24 08:13:24 UTC (rev 14022)
+++ projects/haf/trunk/hildon-fm/hildon-fm/hildon-file-system-model.c	2007-09-24 08:19:00 UTC (rev 14023)
@@ -1156,12 +1156,14 @@
 
   dfa_clos *c = (dfa_clos *)data;
   
+  GDK_THREADS_ENTER ();
   node = hildon_file_system_model_search_folder (c->monitor);
   model_node = node->data;
 
   model_node->pending_adds -= g_slist_length (c->paths);
 
   hildon_file_system_model_files_added (c->monitor, c->paths, c->data);
+  GDK_THREADS_LEAVE ();
 
   g_object_unref (c->monitor);
   gtk_file_paths_free (c->paths);