[Xfce4-commits] <xfce4-appfinder:master> Fix command loading.

[Nick Schermer]

Updating branch refs/heads/master
         to 84fbf8384cfdae3e46b3cccc2155dc57a0ea087b (commit)
       from 58ca7ab84d0fdb3904c4475114e08cbf91e3ed2c (commit)

commit 84fbf8384cfdae3e46b3cccc2155dc57a0ea087b
Author: Nick Schermer <nick at xfce.org>
Date:   Sun Jul 3 22:21:27 2011 +0200

    Fix command loading.

 src/appfinder-model.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/appfinder-model.c b/src/appfinder-model.c
index 3696ce2..efaad74 100644
--- a/src/appfinder-model.c
+++ b/src/appfinder-model.c
@@ -844,7 +844,7 @@ xfce_appfinder_model_collect_history (XfceAppfinderModel *model,
   if (contents == NULL)
     return;
 
-  for (;!model->collect_cancelled;)
+  for (;!g_cancellable_is_cancelled (model->collect_cancelled);)
     {
       end = strchr (contents, '\n');
       if (G_UNLIKELY (end == NULL))
@@ -1168,6 +1168,8 @@ xfce_appfinder_model_collect_thread (gpointer user_data)
   filename = xfce_resource_lookup (XFCE_RESOURCE_CACHE, HISTORY_PATH);
   if (G_LIKELY (filename != NULL))
     {
+      APPFINDER_DEBUG ("load commands from %s", filename);
+
       history = g_mapped_file_new (filename, FALSE, &error);
       if (G_LIKELY (history != NULL))
         {