fix indentation (GConvertError): generic error is conventionally called

2000-09-28  Havoc Pennington  <hp@pobox.com>

* glib.h (GThreadPriority): fix indentation
(GConvertError): generic error is conventionally called
_FAILED rather than _OTHER, at least at the moment,
according to GError docs in docs/reference.

* gconvert.c: s/_OTHER/_FAILED/

diff --git a/ChangeLog b/ChangeLog
index 8931f5c..a54344a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2000-09-28  Havoc Pennington  <hp@pobox.com>
+
+       * glib.h (GThreadPriority): fix indentation
+       (GConvertError): generic error is conventionally called
+       _FAILED rather than _OTHER, at least at the moment, 
+       according to GError docs in docs/reference.
+       
+       * gconvert.c: s/_OTHER/_FAILED/
+       
 2000-09-28  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * configure.in: Adjusted the test for an unimplemented

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 8931f5c..a54344a 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,12 @@
+2000-09-28  Havoc Pennington  <hp@pobox.com>
+
+       * glib.h (GThreadPriority): fix indentation
+       (GConvertError): generic error is conventionally called
+       _FAILED rather than _OTHER, at least at the moment, 
+       according to GError docs in docs/reference.
+       
+       * gconvert.c: s/_OTHER/_FAILED/
+       
 2000-09-28  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * configure.in: Adjusted the test for an unimplemented

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 8931f5c..a54344a 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+2000-09-28  Havoc Pennington  <hp@pobox.com>
+
+       * glib.h (GThreadPriority): fix indentation
+       (GConvertError): generic error is conventionally called
+       _FAILED rather than _OTHER, at least at the moment, 
+       according to GError docs in docs/reference.
+       
+       * gconvert.c: s/_OTHER/_FAILED/
+       
 2000-09-28  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * configure.in: Adjusted the test for an unimplemented

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 8931f5c..a54344a 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,12 @@
+2000-09-28  Havoc Pennington  <hp@pobox.com>
+
+       * glib.h (GThreadPriority): fix indentation
+       (GConvertError): generic error is conventionally called
+       _FAILED rather than _OTHER, at least at the moment, 
+       according to GError docs in docs/reference.
+       
+       * gconvert.c: s/_OTHER/_FAILED/
+       
 2000-09-28  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * configure.in: Adjusted the test for an unimplemented

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 8931f5c..a54344a 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,12 @@
+2000-09-28  Havoc Pennington  <hp@pobox.com>
+
+       * glib.h (GThreadPriority): fix indentation
+       (GConvertError): generic error is conventionally called
+       _FAILED rather than _OTHER, at least at the moment, 
+       according to GError docs in docs/reference.
+       
+       * gconvert.c: s/_OTHER/_FAILED/
+       
 2000-09-28  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * configure.in: Adjusted the test for an unimplemented

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 8931f5c..a54344a 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,12 @@
+2000-09-28  Havoc Pennington  <hp@pobox.com>
+
+       * glib.h (GThreadPriority): fix indentation
+       (GConvertError): generic error is conventionally called
+       _FAILED rather than _OTHER, at least at the moment, 
+       according to GError docs in docs/reference.
+       
+       * gconvert.c: s/_OTHER/_FAILED/
+       
 2000-09-28  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * configure.in: Adjusted the test for an unimplemented

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 8931f5c..a54344a 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,12 @@
+2000-09-28  Havoc Pennington  <hp@pobox.com>
+
+       * glib.h (GThreadPriority): fix indentation
+       (GConvertError): generic error is conventionally called
+       _FAILED rather than _OTHER, at least at the moment, 
+       according to GError docs in docs/reference.
+       
+       * gconvert.c: s/_OTHER/_FAILED/
+       
 2000-09-28  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * configure.in: Adjusted the test for an unimplemented

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 8931f5c..a54344a 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+2000-09-28  Havoc Pennington  <hp@pobox.com>
+
+       * glib.h (GThreadPriority): fix indentation
+       (GConvertError): generic error is conventionally called
+       _FAILED rather than _OTHER, at least at the moment, 
+       according to GError docs in docs/reference.
+       
+       * gconvert.c: s/_OTHER/_FAILED/
+       
 2000-09-28  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * configure.in: Adjusted the test for an unimplemented

diff --git a/gconvert.c b/gconvert.c
index 144ad9e..ff7980c 100644 (file)
--- a/gconvert.c
+++ b/gconvert.c
@@ -50,7 +50,7 @@ open_converter (const gchar *to_codeset,
                     "Conversion from character set `%s' to `%s' is not supported",
                     from_codeset, to_codeset);
       else
-        g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_OTHER,
+        g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_FAILED,
                     "Could not open converter from `%s' to `%s': %s",
                     from_codeset, to_codeset, strerror (errno));
     }
@@ -155,7 +155,7 @@ g_convert (const gchar *str,
          have_error = TRUE;
          break;
        default:
-         g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_OTHER,
+         g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_FAILED,
                       "Error during conversion: %s",
                       strerror (errno));
          have_error = TRUE;
@@ -353,7 +353,7 @@ g_convert_with_fallback (const gchar *str,
                }
              break;
            default:
-             g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_OTHER,
+             g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_FAILED,
                           "Error during conversion: %s",
                           strerror (errno));
              have_error = TRUE;

diff --git a/glib.h b/glib.h
index 155d66c..c2f32fe 100644 (file)
--- a/glib.h
+++ b/glib.h
@@ -3079,10 +3079,10 @@ typedef void            (*GThreadFunc)          (gpointer       value);
 
 typedef enum
 {
-    G_THREAD_PRIORITY_LOW,
-    G_THREAD_PRIORITY_NORMAL,
-    G_THREAD_PRIORITY_HIGH,
-    G_THREAD_PRIORITY_URGENT
+  G_THREAD_PRIORITY_LOW,
+  G_THREAD_PRIORITY_NORMAL,
+  G_THREAD_PRIORITY_HIGH,
+  G_THREAD_PRIORITY_URGENT
 } GThreadPriority;
 
 typedef struct _GThread         GThread;
@@ -3442,7 +3442,7 @@ typedef enum
 {
   G_CONVERT_ERROR_NO_CONVERSION,
   G_CONVERT_ERROR_ILLEGAL_SEQUENCE,
-  G_CONVERT_ERROR_OTHER
+  G_CONVERT_ERROR_FAILED
 } GConvertError;
 
 #define G_CONVERT_ERROR g_convert_error_quark()

diff --git a/glib/gconvert.c b/glib/gconvert.c
index 144ad9e..ff7980c 100644 (file)
--- a/glib/gconvert.c
+++ b/glib/gconvert.c
@@ -50,7 +50,7 @@ open_converter (const gchar *to_codeset,
                     "Conversion from character set `%s' to `%s' is not supported",
                     from_codeset, to_codeset);
       else
-        g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_OTHER,
+        g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_FAILED,
                     "Could not open converter from `%s' to `%s': %s",
                     from_codeset, to_codeset, strerror (errno));
     }
@@ -155,7 +155,7 @@ g_convert (const gchar *str,
          have_error = TRUE;
          break;
        default:
-         g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_OTHER,
+         g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_FAILED,
                       "Error during conversion: %s",
                       strerror (errno));
          have_error = TRUE;
@@ -353,7 +353,7 @@ g_convert_with_fallback (const gchar *str,
                }
              break;
            default:
-             g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_OTHER,
+             g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_FAILED,
                           "Error during conversion: %s",
                           strerror (errno));
              have_error = TRUE;

diff --git a/glib/glib.h b/glib/glib.h
index 155d66c..c2f32fe 100644 (file)
--- a/glib/glib.h
+++ b/glib/glib.h
@@ -3079,10 +3079,10 @@ typedef void            (*GThreadFunc)          (gpointer       value);
 
 typedef enum
 {
-    G_THREAD_PRIORITY_LOW,
-    G_THREAD_PRIORITY_NORMAL,
-    G_THREAD_PRIORITY_HIGH,
-    G_THREAD_PRIORITY_URGENT
+  G_THREAD_PRIORITY_LOW,
+  G_THREAD_PRIORITY_NORMAL,
+  G_THREAD_PRIORITY_HIGH,
+  G_THREAD_PRIORITY_URGENT
 } GThreadPriority;
 
 typedef struct _GThread         GThread;
@@ -3442,7 +3442,7 @@ typedef enum
 {
   G_CONVERT_ERROR_NO_CONVERSION,
   G_CONVERT_ERROR_ILLEGAL_SEQUENCE,
-  G_CONVERT_ERROR_OTHER
+  G_CONVERT_ERROR_FAILED
 } GConvertError;
 
 #define G_CONVERT_ERROR g_convert_error_quark()