server: Store E_Desktop_Shell instance

This patch stores E_Desktop_Shell instance to E_Server to be used in the
future.

Change-Id: I5c668dd6b02c4135ad0493af31a13d4001b99dda

diff --git a/src/bin/server/e_server.c b/src/bin/server/e_server.c
index 0b8d88a442fba0e70ee994ea41d21883b3c4116b..80dfd0da2f6aece133b6b698acfb9a066942f0f9 100644 (file)
--- a/src/bin/server/e_server.c
+++ b/src/bin/server/e_server.c
@@ -45,7 +45,6 @@ struct _E_Server
     struct {
         Dummy_Handle *wl_data_device_manager_handle;
         Dummy_Handle *input_handle;
-        Dummy_Handle *desktop_shell_handle;
         Dummy_Handle *wtz_shell_handle;
         Dummy_Handle *wl_tbm_handle;
         Dummy_Handle *wl_remote_surface_handle;
@@ -76,6 +75,7 @@ struct _E_Server
         E_Tizen_Clipboard *tizen_clipboard;
         E_Tizen_Display_Policy *tizen_display_policy;
         E_Tizen_Embedded_Compositor *tizen_embedded_compositor;
+        E_Desktop_Shell *desktop_shell;
     } handles; // feature handles
 };
 
@@ -100,8 +100,7 @@ e_server_init(void)
      e_server_feature_register(E_SERVER_FEATURE_WL_DATA_DEVICE_MANAGER, &dummy_handle);
    if (e_comp_wl_input_init())
      e_server_feature_register(E_SERVER_FEATURE_INPUT, &dummy_handle);
-   if (e_desktop_shell_create(comp_wl->wl.disp))
-     e_server_feature_register(E_SERVER_FEATURE_DESKTOP_SHELL, &dummy_handle);
+    e_server_feature_register(E_SERVER_FEATURE_DESKTOP_SHELL, e_desktop_shell_create(comp_wl->wl.disp));
    if (e_wtz_shell_init(comp_wl->wl.disp))
      e_server_feature_register(E_SERVER_FEATURE_WTZ_SHELL, &dummy_handle);
    if (e_comp_wl_tbm_init())
@@ -213,7 +212,7 @@ e_server_feature_register(E_SERVER_FEATURE feature, void *handle)
          g_server->handles.input_handle = handle;
          break;
        case E_SERVER_FEATURE_DESKTOP_SHELL:
-         g_server->handles.desktop_shell_handle = handle;
+         g_server->handles.desktop_shell = handle;
          break;
        case E_SERVER_FEATURE_WTZ_SHELL:
          g_server->handles.wtz_shell_handle = handle;
@@ -327,7 +326,7 @@ e_server_feature_handle_get(E_SERVER_FEATURE feature)
          handle = g_server->handles.input_handle;
          break;
        case E_SERVER_FEATURE_DESKTOP_SHELL:
-         handle = g_server->handles.desktop_shell_handle;
+         handle = g_server->handles.desktop_shell;
          break;
        case E_SERVER_FEATURE_WTZ_SHELL:
          handle = g_server->handles.wtz_shell_handle;