[grilo] Properly name some GType macros

[Juan A. Suarez Romero <jasuarez src gnome org>]

commit ca606fb1cd8e8fea10df782acc35122f0175062b
Author: Mathias Hasselmann <mathias openismus com>
Date:   Thu Aug 30 20:56:52 2012 +0200

    Properly name some GType macros
    
    Those for GrlCaps and GrlOperationOptions had "TYPE" add the end
    instead of the begin (right after the namespace).
    
    This fixes https://bugzilla.gnome.org/show_bug.cgi?id=683055

 src/grl-caps.h              |   15 +++++++++------
 src/grl-operation-options.h |   15 +++++++++------
 2 files changed, 18 insertions(+), 12 deletions(-)
---
diff --git a/src/grl-caps.h b/src/grl-caps.h
index f3e0e45..cec5fd9 100644
--- a/src/grl-caps.h
+++ b/src/grl-caps.h
@@ -51,12 +51,15 @@ typedef struct {
   gpointer _grl_reserved[GRL_PADDING];
 } GrlCapsClass;
 
-#define GRL_CAPS_TYPE (grl_caps_get_type ())
-#define GRL_CAPS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GRL_CAPS_TYPE, GrlCaps))
-#define GRL_CAPS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GRL_CAPS_TYPE, GrlCapsClass))
-#define GRL_IS_CAPS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GRL_CAPS_TYPE))
-#define GRL_IS_CAPS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GRL_CAPS_TYPE))
-#define GRL_CAPS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GRL_CAPS_TYPE, GrlCapsClass))
+#define GRL_TYPE_CAPS (grl_caps_get_type ())
+#define GRL_CAPS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GRL_TYPE_CAPS, GrlCaps))
+#define GRL_CAPS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GRL_TYPE_CAPS, GrlCapsClass))
+#define GRL_IS_CAPS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GRL_TYPE_CAPS))
+#define GRL_IS_CAPS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GRL_TYPE_CAPS))
+#define GRL_CAPS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GRL_TYPE_CAPS, GrlCapsClass))
+
+/* Keep this macro for backwards compatibility */
+#define GRL_CAPS_TYPE (GRL_TYPE_CAPS)
 
 /**
  * GrlTypeFilter:
diff --git a/src/grl-operation-options.h b/src/grl-operation-options.h
index f06ecab..9ed82be 100644
--- a/src/grl-operation-options.h
+++ b/src/grl-operation-options.h
@@ -50,12 +50,15 @@ typedef struct {
   gpointer _grl_reserved[GRL_PADDING];
 } GrlOperationOptionsClass;
 
-#define GRL_OPERATION_OPTIONS_TYPE (grl_operation_options_get_type ())
-#define GRL_OPERATION_OPTIONS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GRL_OPERATION_OPTIONS_TYPE, GrlOperationOptions))
-#define GRL_OPERATION_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GRL_OPERATION_OPTIONS_TYPE, GrlOperationOptionsClass))
-#define GRL_IS_OPERATION_OPTIONS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GRL_OPERATION_OPTIONS_TYPE))
-#define GRL_IS_OPERATION_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GRL_OPERATION_OPTIONS_TYPE))
-#define GRL_OPERATION_OPTIONS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GRL_OPERATION_OPTIONS_TYPE, GrlOperationOptionsClass))
+#define GRL_TYPE_OPERATION_OPTIONS (grl_operation_options_get_type ())
+#define GRL_OPERATION_OPTIONS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GRL_TYPE_OPERATION_OPTIONS, GrlOperationOptions))
+#define GRL_OPERATION_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GRL_TYPE_OPERATION_OPTIONS, GrlOperationOptionsClass))
+#define GRL_IS_OPERATION_OPTIONS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GRL_TYPE_OPERATION_OPTIONS))
+#define GRL_IS_OPERATION_OPTIONS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GRL_TYPE_OPERATION_OPTIONS))
+#define GRL_OPERATION_OPTIONS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GRL_TYPE_OPERATION_OPTIONS, GrlOperationOptionsClass))
+
+/* Keep this macro for backwards compatibility */
+#define GRL_OPERATION_OPTIONS_TYPE (GRL_TYPE_OPERATION_OPTIONS)
 
 /**
  * GrlResolutionFlags: