Bug 554701 – filechooser spams console with useless warnings

svn path=/trunk/; revision=21571

2 files changed, 10 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 5421613aee..e55f95c25e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 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
+        cancelled.
+
+2008-10-02  Christian Persch
+
         Bug 554698 – mem leak in filechooser
 
         * gtk/gtkfilechooserdefault.c: Plug a mem leak.
diff --git a/gtk/gtkfilesystem.c b/gtk/gtkfilesystem.c
index 8b57da8292..0bd79b08f6 100644
--- a/gtk/gtkfilesystem.c
+++ b/gtk/gtkfilesystem.c
@@ -1304,7 +1304,9 @@ enumerator_files_callback (GObject      *source_object,
 
   if (error)
     {
-      g_warning (error->message);
+      if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+        g_warning ("%s", error->message);
+
       g_error_free (error);
       return;
     }