Remove unnecessary wayland env set 98/117198/2
authorDaehyeon Jung <darrenh.jung@samsung.com>
Fri, 3 Mar 2017 07:19:42 +0000 (16:19 +0900)
committerHwanKyu Jhun <h.jhun@samsung.com>
Mon, 17 Jul 2017 03:05:27 +0000 (03:05 +0000)
 - When ECORE_EVAS_EXTN_SOCKET_ENGINE=wayland_egl set,
  an application failed to get WAYLAND_DISPLAY env
 - WAYLAND_DISPLAY no longer required for widget.

Change-Id: Idef9f28c4f3491a2fb25fb332cb3b1e063c81245

src/widget_instance.c

index c298a1e0385dea96d66e66356226e96556f9dd61..6e83e1a0424b5dbb829ffc197b47656277a25d1a 100644 (file)
@@ -83,9 +83,6 @@ struct _sdk_util {
        char *caller;
 };
 
-static char *wayland_display = NULL;
-static char *xdg_runtime_dir = NULL;
-
 static GList *_widget_instances = NULL;
 static GList *_widget_apps = NULL;
 
@@ -410,22 +407,6 @@ EAPI int widget_instance_launch(const char *instance_id, char *content_info, int
                return -1;
        }
 
-       if (xdg_runtime_dir == NULL) {
-               xdg_runtime_dir = getenv("XDG_RUNTIME_DIR");
-               if (xdg_runtime_dir == NULL) {
-                       _E("failed to get XDG_RUNTIME_DIR");
-                       return -1;
-               }
-       }
-
-       if (wayland_display == NULL) {
-               wayland_display = getenv("WAYLAND_DISPLAY");
-               if (wayland_display == NULL) {
-                       _E("unable to get wayland display port");
-                       return -1;
-               }
-       }
-
        instance = __pick_instance(instance_id);
 
        if (instance == NULL) {
@@ -442,8 +423,6 @@ EAPI int widget_instance_launch(const char *instance_id, char *content_info, int
        snprintf(pid_buf, sizeof(pid_buf), "%d", getpid());
        bundle_add_str(b, WIDGET_K_CALLER, pid_buf);
        bundle_add_str(b, WIDGET_K_ENDPOINT, viewer_appid);
-       bundle_add_str(b, AUL_K_WAYLAND_DISPLAY, wayland_display);
-       bundle_add_str(b, AUL_K_WAYLAND_WORKING_DIR, xdg_runtime_dir);
        bundle_add_str(b, WIDGET_K_OPERATION, "create");
 
        if (sdk_util.name) {