Change the GtkClutter macro namespace

The namespace for the object provided by clutter-gtk should be
GtkClutter and not Gtk, to avoid potential collisions with
symbols provided by gtk+.

This also fixes http://bugzilla.openedhand.com/show_bug.cgi?id=1187
and other parsers assuming that the namespace is GtkClutter.

diff --git a/clutter-gtk/gtk-clutter-embed.c b/clutter-gtk/gtk-clutter-embed.c
index 3915d35..04519c5 100644 (file)
--- a/clutter-gtk/gtk-clutter-embed.c
+++ b/clutter-gtk/gtk-clutter-embed.c
@@ -60,7 +60,7 @@
 
 G_DEFINE_TYPE (GtkClutterEmbed, gtk_clutter_embed, GTK_TYPE_WIDGET);
 
-#define GTK_CLUTTER_EMBED_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTK_TYPE_CLUTTER_EMBED, GtkClutterEmbedPrivate))
+#define GTK_CLUTTER_EMBED_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTK_CLUTTER_TYPE_EMBED, GtkClutterEmbedPrivate))
 
 struct _GtkClutterEmbedPrivate
 {
@@ -564,7 +564,7 @@ gtk_clutter_init (int    *argc,
 GtkWidget *
 gtk_clutter_embed_new (void)
 {
-  return g_object_new (GTK_TYPE_CLUTTER_EMBED, NULL);
+  return g_object_new (GTK_CLUTTER_TYPE_EMBED, NULL);
 }
 
 /**
@@ -582,7 +582,7 @@ gtk_clutter_embed_new (void)
 ClutterActor *
 gtk_clutter_embed_get_stage (GtkClutterEmbed *embed)
 {
-  g_return_val_if_fail (GTK_IS_CLUTTER_EMBED (embed), NULL);
+  g_return_val_if_fail (GTK_CLUTTER_IS_EMBED (embed), NULL);
 
   return embed->priv->stage;
 }

diff --git a/clutter-gtk/gtk-clutter-embed.h b/clutter-gtk/gtk-clutter-embed.h
index 4536add..52dd00d 100644 (file)
--- a/clutter-gtk/gtk-clutter-embed.h
+++ b/clutter-gtk/gtk-clutter-embed.h
@@ -32,12 +32,12 @@
 
 G_BEGIN_DECLS
 
-#define GTK_TYPE_CLUTTER_EMBED          (gtk_clutter_embed_get_type ())
-#define GTK_CLUTTER_EMBED(o)            (G_TYPE_CHECK_INSTANCE_CAST ((o), GTK_TYPE_CLUTTER_EMBED, GtkClutterEmbed))
-#define GTK_IS_CLUTTER_EMBED(o)         (G_TYPE_CHECK_INSTANCE_TYPE ((o), GTK_TYPE_CLUTTER_EMBED))
-#define GTK_CLUTTER_EMBED_CLASS(k)      (G_TYPE_CHECK_CLASS_CAST ((k), GTK_TYPE_CLUTTER_EMBED, GtkClutterEmbedClass))
-#define GTK_IS_CLUTTER_EMBED_CLASS(k)   (G_TYPE_CHECK_CLASS_TYPE ((k), GTK_TYPE_CLUTTER_EMBED))
-#define GTK_CLUTTER_EMBED_GET_CLASS(o)  (G_TYPE_INSTANCE_GET_CLASS ((o), GTK_TYPE_CLUTTER_EMBED, GtkClutterEmbedClass))
+#define GTK_CLUTTER_TYPE_EMBED          (gtk_clutter_embed_get_type ())
+#define GTK_CLUTTER_EMBED(o)            (G_TYPE_CHECK_INSTANCE_CAST ((o), GTK_CLUTTER_TYPE_EMBED, GtkClutterEmbed))
+#define GTK_CLUTTER_IS_EMBED(o)         (G_TYPE_CHECK_INSTANCE_TYPE ((o), GTK_CLUTTER_TYPE_EMBED))
+#define GTK_CLUTTER_EMBED_CLASS(k)      (G_TYPE_CHECK_CLASS_CAST ((k), GTK_CLUTTER_TYPE_EMBED, GtkClutterEmbedClass))
+#define GTK_CLUTTER_IS_EMBED_CLASS(k)   (G_TYPE_CHECK_CLASS_TYPE ((k), GTK_CLUTTER_TYPE_EMBED))
+#define GTK_CLUTTER_EMBED_GET_CLASS(o)  (G_TYPE_INSTANCE_GET_CLASS ((o), GTK_CLUTTER_TYPE_EMBED, GtkClutterEmbedClass))
 
 typedef struct _GtkClutterEmbed         GtkClutterEmbed;
 typedef struct _GtkClutterEmbedPrivate  GtkClutterEmbedPrivate;

diff --git a/clutter-gtk/gtk-clutter-scrollable.c b/clutter-gtk/gtk-clutter-scrollable.c
index 7e87c3a..6fea476 100644 (file)
--- a/clutter-gtk/gtk-clutter-scrollable.c
+++ b/clutter-gtk/gtk-clutter-scrollable.c
@@ -102,7 +102,7 @@ gtk_clutter_scrollable_set_adjustments (GtkClutterScrollable *scrollable,
 {
   GtkClutterScrollableIface *iface;
 
-  g_return_if_fail (GTK_IS_CLUTTER_SCROLLABLE (scrollable));
+  g_return_if_fail (GTK_CLUTTER_IS_SCROLLABLE (scrollable));
   g_return_if_fail (h_adjust == NULL || GTK_IS_ADJUSTMENT (h_adjust));
 
   iface = GTK_CLUTTER_SCROLLABLE_GET_IFACE (scrollable);
@@ -128,7 +128,7 @@ gtk_clutter_scrollable_get_adjustments (GtkClutterScrollable  *scrollable,
 {
   GtkClutterScrollableIface *iface;
 
-  g_return_if_fail (GTK_IS_CLUTTER_SCROLLABLE (scrollable));
+  g_return_if_fail (GTK_CLUTTER_IS_SCROLLABLE (scrollable));
 
   iface = GTK_CLUTTER_SCROLLABLE_GET_IFACE (scrollable);
   if (iface->get_adjustments)

diff --git a/clutter-gtk/gtk-clutter-scrollable.h b/clutter-gtk/gtk-clutter-scrollable.h
index 1eb53d6..e42695b 100644 (file)
--- a/clutter-gtk/gtk-clutter-scrollable.h
+++ b/clutter-gtk/gtk-clutter-scrollable.h
@@ -36,10 +36,10 @@
 
 G_BEGIN_DECLS
 
-#define GTK_TYPE_CLUTTER_SCROLLABLE             (gtk_clutter_scrollable_get_type ())
-#define GTK_CLUTTER_SCROLLABLE(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CLUTTER_SCROLLABLE, GtkClutterScrollable))
-#define GTK_IS_CLUTTER_SCROLLABLE(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CLUTTER_SCROLLABLE))
-#define GTK_CLUTTER_SCROLLABLE_GET_IFACE(obj)   (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GTK_TYPE_CLUTTER_SCROLLABLE, GtkClutterScrollableIface))
+#define GTK_CLUTTER_TYPE_SCROLLABLE             (gtk_clutter_scrollable_get_type ())
+#define GTK_CLUTTER_SCROLLABLE(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_CLUTTER_TYPE_SCROLLABLE, GtkClutterScrollable))
+#define GTK_CLUTTER_IS_SCROLLABLE(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_CLUTTER_TYPE_SCROLLABLE))
+#define GTK_CLUTTER_SCROLLABLE_GET_IFACE(obj)   (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GTK_CLUTTER_TYPE_SCROLLABLE, GtkClutterScrollableIface))
 
 typedef struct _GtkClutterScrollable            GtkClutterScrollable; /* dummy */
 typedef struct _GtkClutterScrollableIface       GtkClutterScrollableIface;

diff --git a/clutter-gtk/gtk-clutter-viewport.c b/clutter-gtk/gtk-clutter-viewport.c
index e945c6d..4adcae4 100644 (file)
--- a/clutter-gtk/gtk-clutter-viewport.c
+++ b/clutter-gtk/gtk-clutter-viewport.c
@@ -42,7 +42,7 @@
 #define gtk_adjustment_get_page_size(a)         ((a)->page_size)
 #endif
 
-#define GET_PRIVATE(obj)        (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_CLUTTER_VIEWPORT, GtkClutterViewportPrivate))
+#define GET_PRIVATE(obj)        (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_CLUTTER_TYPE_VIEWPORT, GtkClutterViewportPrivate))
 
 #define I_(str) (g_intern_static_string ((str)))
 
@@ -54,7 +54,7 @@ G_DEFINE_TYPE_WITH_CODE (GtkClutterViewport,
                          CLUTTER_TYPE_ACTOR,
                          G_IMPLEMENT_INTERFACE (CLUTTER_TYPE_CONTAINER,
                                                 clutter_container_iface_init)
-                         G_IMPLEMENT_INTERFACE (GTK_TYPE_CLUTTER_SCROLLABLE,
+                         G_IMPLEMENT_INTERFACE (GTK_CLUTTER_TYPE_SCROLLABLE,
                                                 gtk_clutter_scrollable_iface_init));
 
 struct _GtkClutterViewportPrivate
@@ -658,7 +658,7 @@ ClutterActor *
 gtk_clutter_viewport_new (GtkAdjustment *h_adjust,
                           GtkAdjustment *v_adjust)
 {
-  return g_object_new (GTK_TYPE_CLUTTER_VIEWPORT,
+  return g_object_new (GTK_CLUTTER_TYPE_VIEWPORT,
                        "hadjustment", h_adjust,
                        "vadjustment", v_adjust,
                        NULL);
@@ -684,7 +684,7 @@ gtk_clutter_viewport_get_origin (GtkClutterViewport *viewport,
 {
   GtkClutterViewportPrivate *priv;
 
-  g_return_if_fail (GTK_IS_CLUTTER_VIEWPORT (viewport));
+  g_return_if_fail (GTK_CLUTTER_IS_VIEWPORT (viewport));
 
   priv = viewport->priv;
 

diff --git a/clutter-gtk/gtk-clutter-viewport.h b/clutter-gtk/gtk-clutter-viewport.h
index 792a9f8..67a5059 100644 (file)
--- a/clutter-gtk/gtk-clutter-viewport.h
+++ b/clutter-gtk/gtk-clutter-viewport.h
@@ -31,12 +31,12 @@
 
 G_BEGIN_DECLS
 
-#define GTK_TYPE_CLUTTER_VIEWPORT               (gtk_clutter_viewport_get_type ())
-#define GTK_CLUTTER_VIEWPORT(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CLUTTER_VIEWPORT, GtkClutterViewport))
-#define GTK_IS_CLUTTER_VIEWPORT(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CLUTTER_VIEWPORT))
-#define GTK_CLUTTER_VIEWPORT_CLASS(klass)       (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CLUTTER_VIEWPORT, GtkClutterViewportClass))
-#define GTK_IS_CLUTTER_VIEWPORT_CLASS(klass)    (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CLUTTER_VIEWPORT))
-#define GTK_CLUTTER_VIEWPORT_GET_CLASS(obj)     (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CLUTTER_VIEWPORT, GtkClutterViewportClass))
+#define GTK_CLUTTER_TYPE_VIEWPORT               (gtk_clutter_viewport_get_type ())
+#define GTK_CLUTTER_VIEWPORT(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_CLUTTER_TYPE_VIEWPORT, GtkClutterViewport))
+#define GTK_CLUTTER_IS_VIEWPORT(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_CLUTTER_TYPE_VIEWPORT))
+#define GTK_CLUTTER_VIEWPORT_CLASS(klass)       (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_CLUTTER_TYPE_VIEWPORT, GtkClutterViewportClass))
+#define GTK_CLUTTER_IS_VIEWPORT_CLASS(klass)    (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_CLUTTER_TYPE_VIEWPORT))
+#define GTK_CLUTTER_VIEWPORT_GET_CLASS(obj)     (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_CLUTTER_TYPE_VIEWPORT, GtkClutterViewportClass))
 
 typedef struct _GtkClutterViewport              GtkClutterViewport;
 typedef struct _GtkClutterViewportPrivate       GtkClutterViewportPrivate;

diff --git a/doc/reference/clutter-gtk-sections.txt b/doc/reference/clutter-gtk-sections.txt
index 01e338e..93a0266 100644 (file)
--- a/doc/reference/clutter-gtk-sections.txt
+++ b/doc/reference/clutter-gtk-sections.txt
@@ -8,10 +8,10 @@ gtk_clutter_embed_get_stage
 
 <SUBSECTION Standard>
 GTK_CLUTTER_EMBED
-GTK_IS_CLUTTER_EMBED
-GTK_TYPE_CLUTTER_EMBED
+GTK_CLUTTER_IS_EMBED
+GTK_CLUTTER_TYPE_EMBED
 GTK_CLUTTER_EMBED_CLASS
-GTK_IS_CLUTTER_EMBED_CLASS
+GTK_CLUTTER_IS_EMBED_CLASS
 GTK_CLUTTER_EMBED_GET_CLASS
 
 <SUBSECTION Private>
@@ -54,9 +54,9 @@ gtk_clutter_scrollable_get_adjustments
 
 <SUBSECTION Standard>
 GtkClutterScrollable
-GTK_TYPE_CLUTTER_SCROLLABLE
+GTK_CLUTTER_TYPE_SCROLLABLE
 GTK_CLUTTER_SCROLLABLE
-GTK_IS_CLUTTER_SCROLLABLE
+GTK_CLUTTER_IS_SCROLLABLE
 GTK_CLUTTER_SCROLLABLE_GET_IFACE
 <SUBSECTION Private>
 gtk_clutter_scrollable_get_type
@@ -71,11 +71,11 @@ gtk_clutter_viewport_new
 gtk_clutter_viewport_get_origin
 
 <SUBSECTION Standard>
-GTK_TYPE_CLUTTER_VIEWPORT
+GTK_CLUTTER_TYPE_VIEWPORT
 GTK_CLUTTER_VIEWPORT
-GTK_IS_CLUTTER_VIEWPORT
+GTK_CLUTTER_IS_VIEWPORT
 GTK_CLUTTER_VIEWPORT_CLASS
-GTK_IS_CLUTTER_VIEWPORT_CLASS
+GTK_CLUTTER_IS_VIEWPORT_CLASS
 GTK_CLUTTER_VIEWPORT_GET_CLASS
 
 <SUBSECTION Private>