jgarzik enthusiastically applies a patch

diff --git a/ChangeLog b/ChangeLog
index d2beb35..7378573 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Jan 20 16:16:01 EST 1999  Jeff Garzik  <jgarzik@pobox.com>
+
+       * gutils.c (g_get_any_init):
+       Revert previous patch, move error value set line down to proper
+       place.  Caught by Elliot Lee <sopwith@redhat.com>.
+
 Wed Jan 20 20:48:58 GMT 1999  Adam D. Moss  <adam@gimp.org>
 
        * gutils.c (g_get_any_init): All gtk apps were broken

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index d2beb35..7378573 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Wed Jan 20 16:16:01 EST 1999  Jeff Garzik  <jgarzik@pobox.com>
+
+       * gutils.c (g_get_any_init):
+       Revert previous patch, move error value set line down to proper
+       place.  Caught by Elliot Lee <sopwith@redhat.com>.
+
 Wed Jan 20 20:48:58 GMT 1999  Adam D. Moss  <adam@gimp.org>
 
        * gutils.c (g_get_any_init): All gtk apps were broken

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d2beb35..7378573 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Wed Jan 20 16:16:01 EST 1999  Jeff Garzik  <jgarzik@pobox.com>
+
+       * gutils.c (g_get_any_init):
+       Revert previous patch, move error value set line down to proper
+       place.  Caught by Elliot Lee <sopwith@redhat.com>.
+
 Wed Jan 20 20:48:58 GMT 1999  Adam D. Moss  <adam@gimp.org>
 
        * gutils.c (g_get_any_init): All gtk apps were broken

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index d2beb35..7378573 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,9 @@
+Wed Jan 20 16:16:01 EST 1999  Jeff Garzik  <jgarzik@pobox.com>
+
+       * gutils.c (g_get_any_init):
+       Revert previous patch, move error value set line down to proper
+       place.  Caught by Elliot Lee <sopwith@redhat.com>.
+
 Wed Jan 20 20:48:58 GMT 1999  Adam D. Moss  <adam@gimp.org>
 
        * gutils.c (g_get_any_init): All gtk apps were broken

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index d2beb35..7378573 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Wed Jan 20 16:16:01 EST 1999  Jeff Garzik  <jgarzik@pobox.com>
+
+       * gutils.c (g_get_any_init):
+       Revert previous patch, move error value set line down to proper
+       place.  Caught by Elliot Lee <sopwith@redhat.com>.
+
 Wed Jan 20 20:48:58 GMT 1999  Adam D. Moss  <adam@gimp.org>
 
        * gutils.c (g_get_any_init): All gtk apps were broken

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index d2beb35..7378573 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Wed Jan 20 16:16:01 EST 1999  Jeff Garzik  <jgarzik@pobox.com>
+
+       * gutils.c (g_get_any_init):
+       Revert previous patch, move error value set line down to proper
+       place.  Caught by Elliot Lee <sopwith@redhat.com>.
+
 Wed Jan 20 20:48:58 GMT 1999  Adam D. Moss  <adam@gimp.org>
 
        * gutils.c (g_get_any_init): All gtk apps were broken

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index d2beb35..7378573 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Wed Jan 20 16:16:01 EST 1999  Jeff Garzik  <jgarzik@pobox.com>
+
+       * gutils.c (g_get_any_init):
+       Revert previous patch, move error value set line down to proper
+       place.  Caught by Elliot Lee <sopwith@redhat.com>.
+
 Wed Jan 20 20:48:58 GMT 1999  Adam D. Moss  <adam@gimp.org>
 
        * gutils.c (g_get_any_init): All gtk apps were broken

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index d2beb35..7378573 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Wed Jan 20 16:16:01 EST 1999  Jeff Garzik  <jgarzik@pobox.com>
+
+       * gutils.c (g_get_any_init):
+       Revert previous patch, move error value set line down to proper
+       place.  Caught by Elliot Lee <sopwith@redhat.com>.
+
 Wed Jan 20 20:48:58 GMT 1999  Adam D. Moss  <adam@gimp.org>
 
        * gutils.c (g_get_any_init): All gtk apps were broken

diff --git a/glib/gutils.c b/glib/gutils.c
index 67b4f0b..c5b7e24 100644 (file)
--- a/glib/gutils.c
+++ b/glib/gutils.c
@@ -452,10 +452,10 @@ g_get_any_init (void)
            pw = getpwuid_r (getuid (), &pwd, buffer, bufsize);
            if (pw)
              break;
-           error = errno;
 #    endif /* HAVE_GETPWUID_R_POSIX */
+           error = errno;
            if (error != ERANGE)
-             g_warning( "Could not read account information: %s", 
+             g_error ("Could not read account information: %s", 
                       g_strerror (error));
            bufsize *= 2;
          }

diff --git a/gutils.c b/gutils.c
index 67b4f0b..c5b7e24 100644 (file)
--- a/gutils.c
+++ b/gutils.c
@@ -452,10 +452,10 @@ g_get_any_init (void)
            pw = getpwuid_r (getuid (), &pwd, buffer, bufsize);
            if (pw)
              break;
-           error = errno;
 #    endif /* HAVE_GETPWUID_R_POSIX */
+           error = errno;
            if (error != ERANGE)
-             g_warning( "Could not read account information: %s", 
+             g_error ("Could not read account information: %s", 
                       g_strerror (error));
            bufsize *= 2;
          }