Change ChamplainStateEnum to ChamplainState like other enums

diff --git a/champlain/champlain-defines.h b/champlain/champlain-defines.h
index aed9d8e88f93c5fbc4779b2e17bb83bfa6a56a70..3534a5a4f287fe4fc99fbacafd14c7436151735f 100644 (file)
--- a/champlain/champlain-defines.h
+++ b/champlain/champlain-defines.h
@@ -46,6 +46,6 @@ typedef enum
   CHAMPLAIN_STATE_INIT,
   CHAMPLAIN_STATE_LOADING,
   CHAMPLAIN_STATE_DONE
-} ChamplainStateEnum;
+} ChamplainState;
 
 #endif

diff --git a/champlain/champlain-tile.c b/champlain/champlain-tile.c
index aa523224eb5ccc0a8abe07793dbe009de25d44c5..75344ec20326bd0472e4f0a07df714287bb4b0ac 100644 (file)
--- a/champlain/champlain-tile.c
+++ b/champlain/champlain-tile.c
@@ -56,7 +56,7 @@ struct _ChamplainTilePrivate {
 
   gchar * uri;
   gpointer data;
-  ChamplainStateEnum state;
+  ChamplainState state;
   gchar *filename;
   ClutterActor *actor;
 };
@@ -212,7 +212,7 @@ champlain_tile_class_init (ChamplainTileClass *klass)
       g_param_spec_enum ("state",
         "State",
         "The state of the tile",
-        CHAMPLAIN_TYPE_STATE_ENUM,
+        CHAMPLAIN_TYPE_STATE,
         CHAMPLAIN_STATE_NONE,
         G_PARAM_READWRITE));
 
@@ -299,7 +299,7 @@ champlain_tile_get_size (ChamplainTile *self)
   return priv->size;
 }
 
-ChamplainStateEnum
+ChamplainState
 champlain_tile_get_state (ChamplainTile *self)
 {
   g_return_val_if_fail(CHAMPLAIN_TILE(self), CHAMPLAIN_STATE_NONE);
@@ -384,7 +384,7 @@ champlain_tile_set_size (ChamplainTile *self, guint size)
 }
 
 void
-champlain_tile_set_state (ChamplainTile *self, ChamplainStateEnum state)
+champlain_tile_set_state (ChamplainTile *self, ChamplainState state)
 {
   g_return_if_fail(CHAMPLAIN_TILE(self));
 

diff --git a/champlain/champlain-tile.h b/champlain/champlain-tile.h
index afde69bfebf852810222a6593ec3060b8115c8fb..177b28abb105b953ccbf19b0cd99a35ff1d939f6 100644 (file)
--- a/champlain/champlain-tile.h
+++ b/champlain/champlain-tile.h
@@ -60,7 +60,7 @@ gint champlain_tile_get_x (ChamplainTile *self);
 gint champlain_tile_get_y (ChamplainTile *self);
 gint champlain_tile_get_zoom_level (ChamplainTile *self);
 guint champlain_tile_get_size (ChamplainTile *self);
-ChamplainStateEnum champlain_tile_get_state (ChamplainTile *self);
+ChamplainState champlain_tile_get_state (ChamplainTile *self);
 gchar * champlain_tile_get_uri (ChamplainTile *self);
 gchar * champlain_tile_get_filename (ChamplainTile *self);
 ClutterActor * champlain_tile_get_actor (ChamplainTile *self);
@@ -69,7 +69,7 @@ void champlain_tile_set_x (ChamplainTile *self, gint x);
 void champlain_tile_set_y (ChamplainTile *self, gint y);
 void champlain_tile_set_zoom_level (ChamplainTile *self, gint zoom_level);
 void champlain_tile_set_size (ChamplainTile *self, guint size);
-void champlain_tile_set_state (ChamplainTile *self, ChamplainStateEnum state);
+void champlain_tile_set_state (ChamplainTile *self, ChamplainState state);
 void champlain_tile_set_uri (ChamplainTile *self, gchar* uri);
 void champlain_tile_set_filename (ChamplainTile *self, gchar* filename);
 void champlain_tile_set_actor (ChamplainTile *self, ClutterActor* actor);