hu Jul 25 19:41:03 2002 Owen Taylor <otaylor@redhat.com>

        * glib/giochannel.c (g_io_channel_get_flags): Fix
        incorrect return value in g_return_val_if_fail
        (#85545, David L. Cooper II)

diff --git a/ChangeLog b/ChangeLog
index 1a61b88e20bba922d600a7696dc083ae876c1f77..b2634ce04008fe232461fdeea54082ca432d7601 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Jul 25 19:41:03 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/giochannel.c (g_io_channel_get_flags): Fix 
+       incorrect return value in g_return_val_if_fail 
+       (#85545, David L. Cooper II)
+
 Thu Jul 25 19:12:43 2002  Owen Taylor  <otaylor@redhat.com>
 
        * glib/giochannel.c (g_io_channel_set_encoding): Clarify

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 1a61b88e20bba922d600a7696dc083ae876c1f77..b2634ce04008fe232461fdeea54082ca432d7601 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Thu Jul 25 19:41:03 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/giochannel.c (g_io_channel_get_flags): Fix 
+       incorrect return value in g_return_val_if_fail 
+       (#85545, David L. Cooper II)
+
 Thu Jul 25 19:12:43 2002  Owen Taylor  <otaylor@redhat.com>
 
        * glib/giochannel.c (g_io_channel_set_encoding): Clarify

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 1a61b88e20bba922d600a7696dc083ae876c1f77..b2634ce04008fe232461fdeea54082ca432d7601 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,9 @@
+Thu Jul 25 19:41:03 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/giochannel.c (g_io_channel_get_flags): Fix 
+       incorrect return value in g_return_val_if_fail 
+       (#85545, David L. Cooper II)
+
 Thu Jul 25 19:12:43 2002  Owen Taylor  <otaylor@redhat.com>
 
        * glib/giochannel.c (g_io_channel_set_encoding): Clarify

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 1a61b88e20bba922d600a7696dc083ae876c1f77..b2634ce04008fe232461fdeea54082ca432d7601 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Thu Jul 25 19:41:03 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/giochannel.c (g_io_channel_get_flags): Fix 
+       incorrect return value in g_return_val_if_fail 
+       (#85545, David L. Cooper II)
+
 Thu Jul 25 19:12:43 2002  Owen Taylor  <otaylor@redhat.com>
 
        * glib/giochannel.c (g_io_channel_set_encoding): Clarify

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 1a61b88e20bba922d600a7696dc083ae876c1f77..b2634ce04008fe232461fdeea54082ca432d7601 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Thu Jul 25 19:41:03 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/giochannel.c (g_io_channel_get_flags): Fix 
+       incorrect return value in g_return_val_if_fail 
+       (#85545, David L. Cooper II)
+
 Thu Jul 25 19:12:43 2002  Owen Taylor  <otaylor@redhat.com>
 
        * glib/giochannel.c (g_io_channel_set_encoding): Clarify

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 1a61b88e20bba922d600a7696dc083ae876c1f77..b2634ce04008fe232461fdeea54082ca432d7601 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Thu Jul 25 19:41:03 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/giochannel.c (g_io_channel_get_flags): Fix 
+       incorrect return value in g_return_val_if_fail 
+       (#85545, David L. Cooper II)
+
 Thu Jul 25 19:12:43 2002  Owen Taylor  <otaylor@redhat.com>
 
        * glib/giochannel.c (g_io_channel_set_encoding): Clarify

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 1a61b88e20bba922d600a7696dc083ae876c1f77..b2634ce04008fe232461fdeea54082ca432d7601 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Thu Jul 25 19:41:03 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * glib/giochannel.c (g_io_channel_get_flags): Fix 
+       incorrect return value in g_return_val_if_fail 
+       (#85545, David L. Cooper II)
+
 Thu Jul 25 19:12:43 2002  Owen Taylor  <otaylor@redhat.com>
 
        * glib/giochannel.c (g_io_channel_set_encoding): Clarify

diff --git a/glib/giochannel.c b/glib/giochannel.c
index 254342a59843208bb1e5b0a55d357c94be083c55..2c229f61e6c00a7b08531288d89f171a3a2617f9 100644 (file)
--- a/glib/giochannel.c
+++ b/glib/giochannel.c
@@ -735,7 +735,7 @@ g_io_channel_get_flags (GIOChannel *channel)
 {
   GIOFlags flags;
 
-  g_return_val_if_fail (channel != NULL, G_IO_STATUS_ERROR);
+  g_return_val_if_fail (channel != NULL, 0);
 
   flags = (* channel->funcs->io_get_flags) (channel);