Rename g_context_option_error_quark() to g_option_error_quark(), because

2004-09-27  Murray Cumming  <murrayc@murrayc.com>

        * glib/goptions.[h|c], glib/glib.symbols: Rename
        g_context_option_error_quark() to g_option_error_quark(), because that
        is consistent with normal naming conventions, and what bindings expect.

diff --git a/ChangeLog b/ChangeLog
index e18ac8e0e4da5a416d84a2885026c379e642f21a..5ab489344d6e4f828737241e8b24a2b40b1fb489 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
-2004-09-26  Matthias Clasen  <mclasen@redhat.com>
+2004-09-27  Murray Cumming  <murrayc@murrayc.com>
+
+       * glib/goptions.[h|c], glib/glib.symbols: Rename 
+       g_context_option_error_quark() to g_option_error_quark(), because that 
+       is consistent with normal naming conventions, and what bindings expect.
+
+.2004-09-26  Matthias Clasen  <mclasen@redhat.com>
 
        Fix #153649, Hidetaka Iwai:
        

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e18ac8e0e4da5a416d84a2885026c379e642f21a..5ab489344d6e4f828737241e8b24a2b40b1fb489 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,4 +1,10 @@
-2004-09-26  Matthias Clasen  <mclasen@redhat.com>
+2004-09-27  Murray Cumming  <murrayc@murrayc.com>
+
+       * glib/goptions.[h|c], glib/glib.symbols: Rename 
+       g_context_option_error_quark() to g_option_error_quark(), because that 
+       is consistent with normal naming conventions, and what bindings expect.
+
+.2004-09-26  Matthias Clasen  <mclasen@redhat.com>
 
        Fix #153649, Hidetaka Iwai:
        

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index e18ac8e0e4da5a416d84a2885026c379e642f21a..5ab489344d6e4f828737241e8b24a2b40b1fb489 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,4 +1,10 @@
-2004-09-26  Matthias Clasen  <mclasen@redhat.com>
+2004-09-27  Murray Cumming  <murrayc@murrayc.com>
+
+       * glib/goptions.[h|c], glib/glib.symbols: Rename 
+       g_context_option_error_quark() to g_option_error_quark(), because that 
+       is consistent with normal naming conventions, and what bindings expect.
+
+.2004-09-26  Matthias Clasen  <mclasen@redhat.com>
 
        Fix #153649, Hidetaka Iwai:
        

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index e18ac8e0e4da5a416d84a2885026c379e642f21a..5ab489344d6e4f828737241e8b24a2b40b1fb489 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,4 +1,10 @@
-2004-09-26  Matthias Clasen  <mclasen@redhat.com>
+2004-09-27  Murray Cumming  <murrayc@murrayc.com>
+
+       * glib/goptions.[h|c], glib/glib.symbols: Rename 
+       g_context_option_error_quark() to g_option_error_quark(), because that 
+       is consistent with normal naming conventions, and what bindings expect.
+
+.2004-09-26  Matthias Clasen  <mclasen@redhat.com>
 
        Fix #153649, Hidetaka Iwai:
        

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e18ac8e0e4da5a416d84a2885026c379e642f21a..5ab489344d6e4f828737241e8b24a2b40b1fb489 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,4 +1,10 @@
-2004-09-26  Matthias Clasen  <mclasen@redhat.com>
+2004-09-27  Murray Cumming  <murrayc@murrayc.com>
+
+       * glib/goptions.[h|c], glib/glib.symbols: Rename 
+       g_context_option_error_quark() to g_option_error_quark(), because that 
+       is consistent with normal naming conventions, and what bindings expect.
+
+.2004-09-26  Matthias Clasen  <mclasen@redhat.com>
 
        Fix #153649, Hidetaka Iwai:
        

diff --git a/glib/glib.symbols b/glib/glib.symbols
index 216c817a745cc60aaab412922cc5e596968e2c84..dc10b5476c3b050bd2797446141c8d261088c81a 100644 (file)
--- a/glib/glib.symbols
+++ b/glib/glib.symbols
@@ -408,7 +408,7 @@ g_on_error_query
 g_on_error_stack_trace
 g_option_context_add_group
 g_option_context_add_main_entries
-g_option_context_error_quark
+g_option_error_quark
 g_option_context_free
 g_option_context_get_help_enabled
 g_option_context_get_ignore_unknown_options

diff --git a/glib/goption.c b/glib/goption.c
index 21c7b22cee0a71355c34b67d1c634dcc22fcd941..155cad2c19cc939dfa883ac3f76008facb7cb504 100644 (file)
--- a/glib/goption.c
+++ b/glib/goption.c
@@ -102,7 +102,7 @@ static void free_pending_nulls (GOptionContext *context,
                                gboolean        perform_nulls);
 
 GQuark
-g_option_context_error_quark (void)
+g_option_error_quark (void)
 {
   static GQuark q = 0;
   

diff --git a/glib/goption.h b/glib/goption.h
index adbd7041b6334b40aa274d6843511b8cf4ab2c97..f1ffd0fca783f6789cb22e7533c91835e0393818 100644 (file)
--- a/glib/goption.h
+++ b/glib/goption.h
@@ -62,7 +62,7 @@ typedef void (*GOptionErrorFunc) (GOptionContext *context,
                                  gpointer        data,
                                  GError        **error);
 
-#define G_OPTION_ERROR (g_option_context_error_quark ())
+#define G_OPTION_ERROR (g_option_error_quark ())
 
 typedef enum
 {
@@ -71,7 +71,7 @@ typedef enum
   G_OPTION_ERROR_FAILED
 } GOptionError;
 
-GQuark g_option_context_error_quark (void) G_GNUC_CONST;
+GQuark g_option_error_quark (void) G_GNUC_CONST;
 
 
 struct _GOptionEntry