diff --git a/ChangeLog b/ChangeLog
index 6c86125d1..998004767 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-05  Tor Lillqvist  <tml@novell.com>
+
+	* glib/giowin32.c (g_io_win32_set_flags): Don't call g_warning().
+	(#320688) Instead set error and return failure.
+
 2005-11-07  Matthias Clasen  <mclasen@redhat.com>
 
 	* glib/gmain.c (g_main_dispatch): Don't call cb_funcs->unref
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 6c86125d1..998004767 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-11-05  Tor Lillqvist  <tml@novell.com>
+
+	* glib/giowin32.c (g_io_win32_set_flags): Don't call g_warning().
+	(#320688) Instead set error and return failure.
+
 2005-11-07  Matthias Clasen  <mclasen@redhat.com>
 
 	* glib/gmain.c (g_main_dispatch): Don't call cb_funcs->unref
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 6c86125d1..998004767 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+2005-11-05  Tor Lillqvist  <tml@novell.com>
+
+	* glib/giowin32.c (g_io_win32_set_flags): Don't call g_warning().
+	(#320688) Instead set error and return failure.
+
 2005-11-07  Matthias Clasen  <mclasen@redhat.com>
 
 	* glib/gmain.c (g_main_dispatch): Don't call cb_funcs->unref
diff --git a/glib/giowin32.c b/glib/giowin32.c
index 7f990330e..ff164a11e 100644
--- a/glib/giowin32.c
+++ b/glib/giowin32.c
@@ -1444,9 +1444,11 @@ g_io_win32_set_flags (GIOChannel *channel,
       g_print ("\n");
     }
 
-  g_warning ("g_io_win32_set_flags () not implemented.\n");
+  g_set_error (err, G_IO_CHANNEL_ERROR,
+	       G_IO_CHANNEL_ERROR_FAILED,
+	       "Not implemented on Win32");
 
-  return G_IO_STATUS_NORMAL;
+  return G_IO_STATUS_ERROR;
 }
 
 static GIOFlags