From 60033fd59dc34302c51d6b3c6a73759737fcdc76 Mon Sep 17 00:00:00 2001
From: Christian Persch <chpe@src.gnome.org>
Date: Thu, 2 Oct 2008 19:47:57 +0000
Subject: [PATCH] =?UTF-8?q?Bug=20554701=20=E2=80=93=20filechooser=20spams?=
 =?UTF-8?q?=20console=20with=20useless=20warnings?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

svn path=/trunk/; revision=21571
---
 ChangeLog           | 7 +++++++
 gtk/gtkfilesystem.c | 4 +++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 5421613aee..e55f95c25e 100644
--- 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 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;
     }