Bug 554701 – filechooser spams console with useless warnings

svn path=/trunk/; revision=21571

diff --git a/ChangeLog b/ChangeLog
index 5421613aeeadd22d89391181923517f1969a51d1..e55f95c25e379221591fa4da06371bdb561ad0ac 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+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

diff --git a/gtk/gtkfilesystem.c b/gtk/gtkfilesystem.c
index 8b57da82921518bf16563966888b78b92a540a85..0bd79b08f647fc191d724ba9810c9d91432cf62f 100644 (file)
--- 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;
     }