Fix 597272: Adjust the typedefs to to keep the C++ bindings happy

diff --git a/champlain/champlain-cache.h b/champlain/champlain-cache.h
index 818aa760c72a79abf0ee6fbccd86f735aba5ce4e..7eedc2441acdc1af4c66c9c1e868083c9083b538 100644 (file)
--- 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 b8469f6528c8571af422963e175b62bca2a42300..e0884217ff921e790fb8d8eb728ee41fb00f198e 100644 (file)
--- 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 74d1269331e1d82c61b2ff2b281ef6299fb66603..7654e07e7fd7196c44196a990d4691e3fd82df14 100644 (file)
--- 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 ab911f47e93a97ad30d401a8f2154ba1cb887a96..89344e1cc13877a6a9451f65b89d60707f957548 100644 (file)
--- 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 01c7fe4ff39c6c98aaf6f8f43cfbd311c50755dd..0ed594176980b873e27e2a5bd86bea673950fc38 100644 (file)
--- 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);