Updating branch refs/heads/nick/xfrun4-merge
to 611394ad293380fc33e62b76c581848d0f08117d (commit)
from cb96cdd1bd7addecf72f301a0ac5f67172b97894 (commit)
commit 611394ad293380fc33e62b76c581848d0f08117d
Author: Nick Schermer <[email protected]>
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))
{
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
