From d6e896daef6f8f4ae5e7b4de4c2362cb191d31a1 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <rishi@gnu.org>
Date: Sun, 11 Oct 2009 12:25:31 -0400
Subject: [PATCH] Fix 597272: Adjust the typedefs to to keep the C++ bindings
 happy

---
 champlain/champlain-cache.h           | 11 +++++++----
 champlain/champlain-layer.h           | 11 +++++++----
 champlain/champlain-polygon.h         | 11 +++++++----
 champlain/champlain-selection-layer.h | 11 +++++++----
 champlain/champlain-tile.h            | 11 +++++++----
 5 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/champlain/champlain-cache.h b/champlain/champlain-cache.h
index 818aa76..7eedc24 100644
--- a/champlain/champlain-cache.h
+++ b/champlain/champlain-cache.h
@@ -44,13 +44,16 @@ G_BEGIN_DECLS
 #define CHAMPLAIN_CACHE_GET_CLASS(obj) \
   (G_TYPE_INSTANCE_GET_CLASS ((obj), CHAMPLAIN_TYPE_CACHE, ChamplainCacheClass))
 
-typedef struct {
+typedef struct _ChamplainCache      ChamplainCache;
+typedef struct _ChamplainCacheClass ChamplainCacheClass;
+
+struct _ChamplainCache {
   GObject parent;
-} ChamplainCache;
+};
 
-typedef struct {
+struct _ChamplainCacheClass {
   GObjectClass parent_class;
-} ChamplainCacheClass;
+};
 
 GType champlain_cache_get_type (void);
 
diff --git a/champlain/champlain-layer.h b/champlain/champlain-layer.h
index b8469f6..e088421 100644
--- a/champlain/champlain-layer.h
+++ b/champlain/champlain-layer.h
@@ -48,13 +48,16 @@ G_BEGIN_DECLS
 #define CHAMPLAIN_LAYER_GET_CLASS(obj) \
   (G_TYPE_INSTANCE_GET_CLASS ((obj), CHAMPLAIN_TYPE_LAYER, ChamplainLayerClass))
 
-typedef struct {
+typedef struct _ChamplainLayer      ChamplainLayer;
+typedef struct _ChamplainLayerClass ChamplainLayerClass;
+
+struct _ChamplainLayer {
   ClutterGroup parent;
-} ChamplainLayer;
+};
 
-typedef struct {
+struct _ChamplainLayerClass {
   ClutterGroupClass parent_class;
-} ChamplainLayerClass;
+};
 
 GType champlain_layer_get_type (void);
 
diff --git a/champlain/champlain-polygon.h b/champlain/champlain-polygon.h
index 74d1269..7654e07 100644
--- a/champlain/champlain-polygon.h
+++ b/champlain/champlain-polygon.h
@@ -49,14 +49,17 @@ G_BEGIN_DECLS
 
 typedef struct _ChamplainPolygonPrivate ChamplainPolygonPrivate;
 
-typedef struct {
+typedef struct _ChamplainPolygon        ChamplainPolygon;
+typedef struct _ChamplainPolygonClass   ChamplainPolygonClass;
+
+struct _ChamplainPolygon {
   GInitiallyUnowned parent;
   ChamplainPolygonPrivate *priv;
-} ChamplainPolygon;
+};
 
-typedef struct {
+struct _ChamplainPolygonClass {
   GInitiallyUnownedClass parent_class;
-} ChamplainPolygonClass;
+};
 
 GType champlain_polygon_get_type (void);
 
diff --git a/champlain/champlain-selection-layer.h b/champlain/champlain-selection-layer.h
index ab911f4..89344e1 100644
--- a/champlain/champlain-selection-layer.h
+++ b/champlain/champlain-selection-layer.h
@@ -65,15 +65,18 @@ typedef enum {
   CHAMPLAIN_SELECTION_MULTIPLE
 } ChamplainSelectionMode;
 
-typedef struct {
+typedef struct _ChamplainSelectionLayer      ChamplainSelectionLayer;
+typedef struct _ChamplainSelectionLayerClass ChamplainSelectionLayerClass;
+
+struct _ChamplainSelectionLayer {
   ChamplainLayer parent;
 
   ChamplainSelectionLayerPrivate *priv;
-} ChamplainSelectionLayer;
+};
 
-typedef struct {
+struct _ChamplainSelectionLayerClass {
   ChamplainLayerClass parent_class;
-} ChamplainSelectionLayerClass;
+};
 
 GType champlain_selection_layer_get_type (void);
 
diff --git a/champlain/champlain-tile.h b/champlain/champlain-tile.h
index 01c7fe4..0ed5941 100644
--- a/champlain/champlain-tile.h
+++ b/champlain/champlain-tile.h
@@ -45,15 +45,18 @@ G_BEGIN_DECLS
 
 typedef struct _ChamplainTilePrivate ChamplainTilePrivate;
 
-typedef struct {
+typedef struct _ChamplainTile        ChamplainTile;
+typedef struct _ChamplainTileClass   ChamplainTileClass;
+
+struct _ChamplainTile {
   GObject parent;
 
   ChamplainTilePrivate *priv;
-} ChamplainTile;
+};
 
-typedef struct {
+struct _ChamplainTileClass {
   GObjectClass parent_class;
-} ChamplainTileClass;
+};
 
 GType champlain_tile_get_type (void);
 
-- 
2.39.5