Rename GTK_CHAMPLAIN_TYPE_EMBED to GTK_TYPE_CHAMPLAIN_EMBED to match Gtk's

diff --git a/champlain-gtk/gtk-champlain-embed.c b/champlain-gtk/gtk-champlain-embed.c
index fea26c1a27daec473d6e78d7de8057c07322a822..b70d44eb48e75b9f530a4a052681571b9cfcecd8 100644 (file)
--- a/champlain-gtk/gtk-champlain-embed.c
+++ b/champlain-gtk/gtk-champlain-embed.c
@@ -49,7 +49,7 @@ enum
 
 //static guint gtk_champlain_embed_embed_signals[LAST_SIGNAL] = { 0, };
 
-#define GTK_CHAMPLAIN_EMBED_GET_PRIVATE(obj)    (G_TYPE_INSTANCE_GET_PRIVATE((obj), GTK_CHAMPLAIN_TYPE_EMBED, GtkChamplainEmbedPrivate))
+#define GTK_CHAMPLAIN_EMBED_GET_PRIVATE(obj)    (G_TYPE_INSTANCE_GET_PRIVATE((obj), GTK_TYPE_CHAMPLAIN_EMBED, GtkChamplainEmbedPrivate))
 
 struct _GtkChamplainEmbedPrivate
 {
@@ -263,7 +263,7 @@ mouse_button_cb (GtkWidget *widget,
 GtkWidget *
 gtk_champlain_embed_new ()
 {
-  return g_object_new (GTK_CHAMPLAIN_TYPE_EMBED, NULL);
+  return g_object_new (GTK_TYPE_CHAMPLAIN_EMBED, NULL);
 }
 
 /**

diff --git a/champlain-gtk/gtk-champlain-embed.h b/champlain-gtk/gtk-champlain-embed.h
index 4f719d27b7e80536f8127d8de95298e61e2072de..eb1603eeb42d4b25daeeefa51d68e2dd644f1e22 100644 (file)
--- a/champlain-gtk/gtk-champlain-embed.h
+++ b/champlain-gtk/gtk-champlain-embed.h
@@ -26,12 +26,12 @@
 #include <gtk/gtk.h>
 #include <champlain/champlain.h>
 
-#define GTK_CHAMPLAIN_TYPE_EMBED     (gtk_champlain_embed_get_type())
-#define GTK_CHAMPLAIN_EMBED(obj)     (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_CHAMPLAIN_TYPE_EMBED, GtkChamplainEmbed))
-#define GTK_CHAMPLAIN_EMBED_CLASS(klass)  (G_TYPE_CHECK_CLASS_CAST((klass),  GTK_CHAMPLAIN_TYPE_EMBED, GtkChamplainEmbedClass))
-#define GTK_CHAMPLAIN_IS_EMBED(obj)  (G_TYPE_CHECK_INSTANCE_TYPE((obj), GTK_CHAMPLAIN_TYPE_EMBED))
-#define GTK_CHAMPLAIN_IS_EMBED_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),  GTK_CHAMPLAIN_TYPE_EMBED))
-#define GTK_CHAMPLAIN_EMBED_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),  GTK_CHAMPLAIN_TYPE_EMBED, GtkChamplainEmbedClass))
+#define GTK_TYPE_CHAMPLAIN_EMBED     (gtk_champlain_embed_get_type())
+#define GTK_CHAMPLAIN_EMBED(obj)     (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_TYPE_CHAMPLAIN_EMBED, GtkChamplainEmbed))
+#define GTK_CHAMPLAIN_EMBED_CLASS(klass)  (G_TYPE_CHECK_CLASS_CAST((klass),  GTK_TYPE_CHAMPLAIN_EMBED, GtkChamplainEmbedClass))
+#define GTK_CHAMPLAIN_IS_EMBED(obj)  (G_TYPE_CHECK_INSTANCE_TYPE((obj), GTK_TYPE_CHAMPLAIN_EMBED))
+#define GTK_CHAMPLAIN_IS_EMBED_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),  GTK_TYPE_CHAMPLAIN_EMBED))
+#define GTK_CHAMPLAIN_EMBED_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj),  GTK_TYPE_CHAMPLAIN_EMBED, GtkChamplainEmbedClass))
 
 typedef struct _GtkChamplainEmbedPrivate GtkChamplainEmbedPrivate;