e_server: initialize display_policy at server.c

Change-Id: I5ff2ac270ab556e69f8eac19fd22ca64a200d847

diff --git a/src/bin/server/e_policy_wl.c b/src/bin/server/e_policy_wl.c
index 6d7a9cb235d0b4b1e4f5b6c3abb787cc80efa239..e7c48467e43d9513d1f90f1b867771a77cdaef80 100644 (file)
--- a/src/bin/server/e_policy_wl.c
+++ b/src/bin/server/e_policy_wl.c
@@ -3135,7 +3135,6 @@ e_policy_wl_init(void)
 
    e_service_softkey_client_remove_handler_add();
 
-   e_tizen_display_policy_init(comp_wl->wl.disp);
    e_policy_display_init();
 
    return EINA_TRUE;
@@ -3157,7 +3156,6 @@ e_policy_wl_shutdown(void)
    struct wl_global *global;
 
    e_policy_display_shutdown();
-   e_tizen_display_policy_shutdown();
 
    EINA_SAFETY_ON_NULL_RETURN(polwl);
 

diff --git a/src/bin/server/e_server.c b/src/bin/server/e_server.c
index 2c0c97ef16d905785469703794fe1e97c022ed6d..6f12281ac73655022384a0af294707c679acfdb6 100644 (file)
--- a/src/bin/server/e_server.c
+++ b/src/bin/server/e_server.c
@@ -29,6 +29,7 @@
 #include "e_tizen_ws_shell_manager_intern.h"
 #include "e_tizen_indicator_intern.h"
 #include "e_tizen_clipboard_intern.h"
+#include "e_tizen_display_policy_intern.h"
 
 typedef struct _E_Server E_Server;
 
@@ -70,6 +71,7 @@ struct _E_Server
         E_Tizen_Ws_Shell_Manager *tizen_ws_shell_manager;
         E_Tizen_Indicator *tizen_indicator;
         E_Tizen_Clipboard *tizen_clipboard;
+        E_Tizen_Display_Policy *tizen_display_policy;
     } handles; // feature handles
 };
 
@@ -144,6 +146,7 @@ e_server_init(void)
    e_server_feature_register(E_SERVER_FEATURE_TIZEN_WS_SHELL_MANAGER, e_tizen_ws_shell_manager_init(comp_wl->wl.disp));
    e_server_feature_register(E_SERVER_FEATURE_TIZEN_INDICATOR, e_tizen_indicator_init(comp_wl->wl.disp));
    e_server_feature_register(E_SERVER_FEATURE_TIZEN_CLIPBOARD, e_tizen_clipboard_init(comp_wl->wl.disp));
+   e_server_feature_register(E_SERVER_FEATURE_TIZEN_DISPLAY_POLICY, e_tizen_display_policy_init(comp_wl->wl.disp));
 
    return EINA_TRUE;
 }
@@ -151,6 +154,7 @@ e_server_init(void)
 EINTERN void
 e_server_shutdown(void)
 {
+   e_tizen_display_policy_shutdown();
    e_tizen_clipboard_shutdown();
    e_tizen_indicator_shutdown();
    e_tizen_ws_shell_shutdown();
@@ -285,6 +289,9 @@ e_server_feature_register(E_SERVER_FEATURE feature, void *handle)
        case E_SERVER_FEATURE_TIZEN_CLIPBOARD:
          g_server->handles.tizen_clipboard = handle;
          break;
+       case E_SERVER_FEATURE_TIZEN_DISPLAY_POLICY:
+         g_server->handles.tizen_display_policy = handle;
+         break;
        default:
          ERR("Unknown feature(%d) and handle(%p)", feature, handle);
          break;
@@ -390,6 +397,9 @@ e_server_feature_handle_get(E_SERVER_FEATURE feature)
        case E_SERVER_FEATURE_TIZEN_CLIPBOARD:
          handle = g_server->handles.tizen_clipboard;
          break;
+       case E_SERVER_FEATURE_TIZEN_DISPLAY_POLICY:
+         handle = g_server->handles.tizen_display_policy;
+         break;
        default:
          ERR("Unknown feature(%d)", feature);
          break;

diff --git a/src/bin/server/e_server_intern.h b/src/bin/server/e_server_intern.h
index feb2633942d160285cfaad74d87d356fed3bc6ce..ff39cb8ffab1b25182bcfe84c2500d30738e0def 100644 (file)
--- a/src/bin/server/e_server_intern.h
+++ b/src/bin/server/e_server_intern.h
@@ -34,6 +34,7 @@ typedef enum _E_SERVER_FEATURE {
     E_SERVER_FEATURE_TIZEN_WS_SHELL_MANAGER,
     E_SERVER_FEATURE_TIZEN_INDICATOR,
     E_SERVER_FEATURE_TIZEN_CLIPBOARD,
+    E_SERVER_FEATURE_TIZEN_DISPLAY_POLICY,
     E_SERVER_FEATURE_MAX
 } E_SERVER_FEATURE;