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.

diff --git a/legacy/elementary/src/lib/elm_app_client_view.eo b/legacy/elementary/src/lib/elm_app_client_view.eo
index 81de5ee..7ff2bff 100644 (file)
--- a/legacy/elementary/src/lib/elm_app_client_view.eo
+++ b/legacy/elementary/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/legacy/elementary/src/lib/elm_app_common.h b/legacy/elementary/src/lib/elm_app_common.h
index 2d37f70..8c25449 100644 (file)
--- a/legacy/elementary/src/lib/elm_app_common.h
+++ b/legacy/elementary/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/legacy/elementary/src/lib/elm_app_server_view.eo b/legacy/elementary/src/lib/elm_app_server_view.eo
index 416b373..a95abbe 100644 (file)
--- a/legacy/elementary/src/lib/elm_app_server_view.eo
+++ b/legacy/elementary/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/legacy/elementary/src/lib/elm_general.eot b/legacy/elementary/src/lib/elm_general.eot
index 6388b30..b175c9b 100644 (file)
--- a/legacy/elementary/src/lib/elm_general.eot
+++ b/legacy/elementary/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,
+}
+