[EGIT] [core/elementary] master 05/19: elementary: move definition of Elm_App_View_State to elm_general.eot

[Vitor Sousa]

felipealmeida pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=d5eb188f59542ba0737b8317f8fa97b5ee66baf9

commit d5eb188f59542ba0737b8317f8fa97b5ee66baf9
Author: Vitor Sousa <vitorsousasi...@gmail.com>
Date:   Mon Jan 18 16:20:59 2016 -0200

    elementary: move definition of Elm_App_View_State to elm_general.eot
    
    Move the definition of the enumeration Elm_App_View_State from
    elm_app_common.h to elm_general.eot, and give it the the Eolian name:
    Elm.App.View_State.
    
    Replace Elm_App_View_State with Elm.App.View_State in
    elm_app_client_view.eo and elm_app_server_view.eo.
---
 src/lib/elm_app_client_view.eo |  2 +-
 src/lib/elm_app_common.h       | 21 ---------------------
 src/lib/elm_app_server_view.eo |  2 +-
 src/lib/elm_general.eot        |  9 +++++++++
 4 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/src/lib/elm_app_client_view.eo b/src/lib/elm_app_client_view.eo
index 81de5ee..7ff2bff 100644
--- a/src/lib/elm_app_client_view.eo
+++ b/src/lib/elm_app_client_view.eo
@@ -7,7 +7,7 @@ class Elm.App_Client_View (Eo.Base)
             [[Get state of view]]
          }
          values {
-            state: Elm_App_View_State; [[state of view]]
+            state: Elm.App.View_State; [[state of view]]
          }
       }
       @property new_events {
diff --git a/src/lib/elm_app_common.h b/src/lib/elm_app_common.h
index 2d37f70..8c25449 100644
--- a/src/lib/elm_app_common.h
+++ b/src/lib/elm_app_common.h
@@ -1,24 +1,3 @@
-/**
- * @addtogroup App
- *
- * @{
- */
-
-/**
- * Elm_App_View_State
- */
-typedef enum
-{
-   ELM_APP_VIEW_STATE_UNKNOWN = 0,
-   ELM_APP_VIEW_STATE_LIVE,
-   ELM_APP_VIEW_STATE_PAUSED,
-   ELM_APP_VIEW_STATE_CLOSED,
-   ELM_APP_VIEW_STATE_SHALLOW
-} Elm_App_View_State;
-
-/**
- * @}
- */
 
 char *_dbus_package_to_path(const char *package);
 
diff --git a/src/lib/elm_app_server_view.eo b/src/lib/elm_app_server_view.eo
index 416b373..a95abbe 100644
--- a/src/lib/elm_app_server_view.eo
+++ b/src/lib/elm_app_server_view.eo
@@ -59,7 +59,7 @@ class Elm.App_Server_View (Eo.Base)
          get {
          }
          values {
-            ret: Elm_App_View_State;
+            ret: Elm.App.View_State;
          }
       }
       @property path {
diff --git a/src/lib/elm_general.eot b/src/lib/elm_general.eot
index 6388b30..b175c9b 100644
--- a/src/lib/elm_general.eot
+++ b/src/lib/elm_general.eot
@@ -119,3 +119,12 @@ enum Elm.Focus_Direction
    left,     [[ left direction ]]
 }
 
+enum Elm.App.View_State
+{
+   unknown = 0,
+   live,
+   paused,
+   closed,
+   shallow,
+}
+

--