Apply e_comp's interface

Change-Id: I41b55cd8f8702dfa59d8395be7fe0edd6a7d65fe

diff --git a/src/e_mod_keyrouter_events.c b/src/e_mod_keyrouter_events.c
index 80c7804fccdbf4963a22e513100414f194af1c41..7167910019be98196c4cf6a8ff52d9f294819893 100644 (file)
--- a/src/e_mod_keyrouter_events.c
+++ b/src/e_mod_keyrouter_events.c
@@ -699,12 +699,13 @@ e_keyrouter_util_get_pid(struct wl_client *client, struct wl_resource *surface)
 char *
 e_keyrouter_util_cmd_get_from_pid(int pid)
 {
-   Eina_List *l;
+   Eina_List *l, *connected_ec_list;
    E_Comp_Connected_Client_Info *cdata;
 
-   EINA_SAFETY_ON_NULL_RETURN_VAL(e_comp, NULL);
+   EINA_SAFETY_ON_NULL_RETURN_VAL(e_comp_get(), NULL);
 
-   EINA_LIST_FOREACH(e_comp->connected_clients, l, cdata)
+   connected_ec_list = e_comp_connected_ec_list_get();
+   EINA_LIST_FOREACH(connected_ec_list, l, cdata)
      {
         if (cdata->pid == pid) return strdup(cdata->name);
      }

diff --git a/src/e_mod_main_wl.c b/src/e_mod_main_wl.c
index 59d6d7368408860fe5006df8bd03ebad3b9e94e3..7f2ae9cef505a24626faf615302fd5bdb71470d2 100644 (file)
--- a/src/e_mod_main_wl.c
+++ b/src/e_mod_main_wl.c
@@ -1167,9 +1167,9 @@ _e_keyrouter_init(E_Module *m)
         return NULL;
      }
 
-   if (!e_comp)
+   if (!e_comp_get())
      {
-        KLERR("Failed to initialize keyrouter module ! (e_comp == NULL)");
+        KLERR("Failed to initialize keyrouter module ! (e_comp_get() == NULL)");
         goto err;
      }