diff options
| author | Christian Persch <chpe@src.gnome.org> | 2008-10-02 19:56:01 +0000 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2008-10-02 19:56:01 +0000 |
| commit | 1d9431b920bf094ba587c4bb0a087ad286d7f195 (patch) | |
| tree | 1c4e0bcc33d6d76822dca514e24489f03e133bab | |
| parent | e65267157aae9c11ccc83979b9ec2932a31c634a (diff) | |
| download | gdk-pixbuf-1d9431b920bf094ba587c4bb0a087ad286d7f195.tar.gz | |
Bug 554704 – gtkfilesystemmodel does too much work
svn path=/branches/gtk-2-14/; revision=21578
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | gtk/gtkfilesystemmodel.c | 8 |
2 files changed, 11 insertions, 4 deletions
@@ -1,5 +1,12 @@ 2008-10-02 Christian Persch + Bug 554704 – gtkfilesystemmodel does too much work + + * gtk/gtkfilesystemmodel.c: Replace g_slist_length()<1 check with a + simple NULL check. + +2008-10-02 Christian Persch + Bug 554701 – filechooser spams console with useless warnings * gtk/gtkfilesystem.c.c: Don't warn if the async call was simply diff --git a/gtk/gtkfilesystemmodel.c b/gtk/gtkfilesystemmodel.c index de08a6374..9536d0fa7 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) |