[libchamplain] Remove CHAMPLAIN_STATE_INIT



commit 82d5d2c269da248951e89ca13815a642019da375
Author: JiÅ?í Techet <techet gmail com>
Date:   Mon Mar 8 23:15:48 2010 +0100

    Remove CHAMPLAIN_STATE_INIT
    
    We have no real use for two neutral states - one is enough.
    
    Signed-off-by: JiÅ?í Techet <techet gmail com>

 champlain/champlain-defines.h         |    1 -
 champlain/champlain-map-data-source.c |    4 ++--
 champlain/champlain-tile.c            |    2 +-
 champlain/champlain-view.c            |    4 ++--
 4 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/champlain/champlain-defines.h b/champlain/champlain-defines.h
index 90755f9..95757ee 100644
--- a/champlain/champlain-defines.h
+++ b/champlain/champlain-defines.h
@@ -42,7 +42,6 @@ typedef struct _ChamplainMapSource ChamplainMapSource;
 typedef enum
 {
   CHAMPLAIN_STATE_NONE,
-  CHAMPLAIN_STATE_INIT,
   CHAMPLAIN_STATE_LOADING,
   CHAMPLAIN_STATE_DONE
 } ChamplainState;
diff --git a/champlain/champlain-map-data-source.c b/champlain/champlain-map-data-source.c
index fb3fcc1..6132454 100644
--- a/champlain/champlain-map-data-source.c
+++ b/champlain/champlain-map-data-source.c
@@ -171,7 +171,7 @@ champlain_map_data_source_class_init (ChamplainMapDataSourceClass *klass)
            "map data source's state",
            "The state of the map data source",
            CHAMPLAIN_TYPE_STATE,
-           CHAMPLAIN_STATE_INIT,
+           CHAMPLAIN_STATE_NONE,
            G_PARAM_READWRITE));
 }
 
@@ -186,7 +186,7 @@ champlain_map_data_source_init (ChamplainMapDataSource *self)
   priv->bounding_box->right = 0.0;
   priv->bounding_box->top = 0.0;
 
-  priv->state = CHAMPLAIN_STATE_INIT;
+  priv->state = CHAMPLAIN_STATE_NONE;
 }
 
 /**
diff --git a/champlain/champlain-tile.c b/champlain/champlain-tile.c
index e04dd03..c0e3775 100644
--- a/champlain/champlain-tile.c
+++ b/champlain/champlain-tile.c
@@ -289,7 +289,7 @@ champlain_tile_init (ChamplainTile *self)
 {
   ChamplainTilePrivate *priv = GET_PRIVATE (self);
 
-  priv->state = CHAMPLAIN_STATE_INIT;
+  priv->state = CHAMPLAIN_STATE_NONE;
   priv->x = 0;
   priv->y = 0;
   priv->zoom_level = 0;
diff --git a/champlain/champlain-view.c b/champlain/champlain-view.c
index 2be77a8..3c6cea1 100644
--- a/champlain/champlain-view.c
+++ b/champlain/champlain-view.c
@@ -1057,7 +1057,7 @@ champlain_view_class_init (ChamplainViewClass *champlainViewClass)
            "View's state",
            "View's global state",
            CHAMPLAIN_TYPE_STATE,
-           CHAMPLAIN_STATE_INIT,
+           CHAMPLAIN_STATE_NONE,
            G_PARAM_READABLE));
 
   /**
@@ -1386,7 +1386,7 @@ champlain_view_init (ChamplainView *view)
   priv->anchor.x = 0;
   priv->anchor.y = 0;
   priv->anchor_zoom_level = 0;
-  priv->state = CHAMPLAIN_STATE_INIT;
+  priv->state = CHAMPLAIN_STATE_NONE;
   priv->latitude = 0.0f;
   priv->longitude = 0.0f;
   priv->goto_context = NULL;



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]