Sort quark names. Rename pyg_boxed_marshal_key to pygboxed_marshal_key.

    * gobject/gobjectmodule.c: (initgobject):
    * gobject/pygobject-private.h:
    * gobject/pygtype.c: (pyg_register_boxed_custom):
    Sort quark names. Rename pyg_boxed_marshal_key to pygboxed_marshal_key.
    Don't set the keys twice

3 files changed, 13 insertions, 15 deletions

diff --git a/gobject/gobjectmodule.c b/gobject/gobjectmodule.c
index ce6dc56..e25c1e2 100644
--- a/gobject/gobjectmodule.c
+++ b/gobject/gobjectmodule.c
@@ -2484,19 +2484,17 @@ initgobject(void)
 
     g_type_init();
 
-    pyginterface_type_key    = g_quark_from_static_string("PyGInterface::type");
-    pygobject_wrapper_key    = g_quark_from_static_string("PyGObject::wrapper");
-    pygobject_class_key      = g_quark_from_static_string("PyGObject::class");
     pygboxed_type_key        = g_quark_from_static_string("PyGBoxed::class");
-    pyginterface_type_key    = g_quark_from_static_string("PyGInterface::type");
-    pyginterface_info_key    = g_quark_from_static_string("PyGInterface::info");
-    pygobject_class_init_key = g_quark_from_static_string("PyGObject::class-init");
-    pyg_boxed_marshal_key    = g_quark_from_static_string("PyGBoxed::marshal");
+    pygboxed_marshal_key     = g_quark_from_static_string("PyGBoxed::marshal");
     pygenum_class_key        = g_quark_from_static_string("PyGEnum::class");
     pygflags_class_key       = g_quark_from_static_string("PyGFlags::class");
+    pygobject_class_key      = g_quark_from_static_string("PyGObject::class");
+    pygobject_class_init_key = g_quark_from_static_string("PyGObject::class-init");
+    pygobject_wrapper_key    = g_quark_from_static_string("PyGObject::wrapper");
+    pyginterface_type_key    = g_quark_from_static_string("PyGInterface::type");
+    pyginterface_info_key    = g_quark_from_static_string("PyGInterface::info");
     pygpointer_class_key     = g_quark_from_static_string("PyGPointer::class");
 
-
     PY_TYPE_OBJECT = g_boxed_type_register_static("PyObject",
 						  pyobject_copy,
 						  pyobject_free);
diff --git a/gobject/pygobject-private.h b/gobject/pygobject-private.h
index 18d05af..fb6f419 100644
--- a/gobject/pygobject-private.h
+++ b/gobject/pygobject-private.h
@@ -41,15 +41,15 @@ extern struct _PyGObject_Functions pygobject_api_functions;
 
 extern GType PY_TYPE_OBJECT;
 
+extern GQuark pygboxed_type_key;
+extern GQuark pygboxed_marshal_key;
+extern GQuark pygenum_class_key;
+extern GQuark pygflags_class_key;
 extern GQuark pyginterface_type_key;
-extern GQuark pygobject_class_init_key;
 extern GQuark pyginterface_info_key;
-extern GQuark pygboxed_type_key;
+extern GQuark pygobject_class_init_key;
 extern GQuark pygobject_class_key;
 extern GQuark pygobject_wrapper_key;
-extern GQuark pyg_boxed_marshal_key;
-extern GQuark pygenum_class_key;
-extern GQuark pygflags_class_key;
 extern GQuark pygpointer_class_key;
 
 void  pyg_destroy_notify (gpointer user_data);
diff --git a/gobject/pygtype.c b/gobject/pygtype.c
index 9679cfa..73140a6 100644
--- a/gobject/pygtype.c
+++ b/gobject/pygtype.c
@@ -324,7 +324,7 @@ typedef struct {
 } PyGBoxedMarshal;
 
 #define pyg_boxed_lookup(boxed_type) \
-  ((PyGBoxedMarshal *)g_type_get_qdata((boxed_type), pyg_boxed_marshal_key))
+  ((PyGBoxedMarshal *)g_type_get_qdata((boxed_type), pygboxed_marshal_key))
 
 
 /**
@@ -349,7 +349,7 @@ pyg_register_boxed_custom(GType boxed_type,
     bm = g_new(PyGBoxedMarshal, 1);
     bm->fromvalue = from_func;
     bm->tovalue = to_func;
-    g_type_set_qdata(boxed_type, pyg_boxed_marshal_key, bm);
+    g_type_set_qdata(boxed_type, pygboxed_marshal_key, bm);
 }
 
 static int