summaryrefslogtreecommitdiff
path: root/gtk/gtkfilesystemmodel.c
diff options
context:
space:
mode:
authorChristian Persch <chpe@src.gnome.org>2008-10-02 19:48:02 +0000
committerChristian Persch <chpe@src.gnome.org>2008-10-02 19:48:02 +0000
commitae2bf7863c5c693e072beb203b4499fe7ebd8723 (patch)
tree2c56c0b70b387a6dc699cfdc0b76499da7154463 /gtk/gtkfilesystemmodel.c
parent60033fd59dc34302c51d6b3c6a73759737fcdc76 (diff)
downloadgtk+-ae2bf7863c5c693e072beb203b4499fe7ebd8723.tar.gz
Bug 554704 – gtkfilesystemmodel does too much work
svn path=/trunk/; revision=21572
Diffstat (limited to 'gtk/gtkfilesystemmodel.c')
-rw-r--r--gtk/gtkfilesystemmodel.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk/gtkfilesystemmodel.c b/gtk/gtkfilesystemmodel.c
index de08a6374f..9536d0fa74 100644
--- a/gtk/gtkfilesystemmodel.c
+++ b/gtk/gtkfilesystemmodel.c
@@ -994,7 +994,7 @@ ref_path_cb (GCancellable *cancellable,
if (folder)
info->cleanups = g_slist_prepend (info->cleanups, folder);
- else if (g_slist_length (info->files) == 1
+ else if ((info->files != NULL && info->files->next == NULL) /* g_slist_length == 1 */
&& g_file_equal (info->node->file, info->files->data))
{
/* Done, now call the function */
@@ -1025,7 +1025,7 @@ ref_path_cb (GCancellable *cancellable,
g_object_unref (info->files->data);
info->files = g_slist_remove (info->files, info->files->data);
- if (g_slist_length (info->files) < 1)
+ if (info->files == NULL)
{
/* Done, now call the function */
if (info->node)
@@ -1136,7 +1136,7 @@ _gtk_file_system_model_path_do (GtkFileSystemModel *model,
}
g_object_unref (parent_file);
- if (g_slist_length (files) < 1)
+ if (files == NULL)
return;
/* Now we have all paths, except the root path */
@@ -1153,7 +1153,7 @@ _gtk_file_system_model_path_do (GtkFileSystemModel *model,
g_object_unref (files->data);
files = g_slist_remove (files, files->data);
- if (g_slist_length (files) < 1)
+ if (files == NULL)
{
/* Done, now call the function */
if (node)