e_desk_area: remove use_desk_area config value

The desk area feature turn to default feature.
So, remove all the check of use_desk_area value.

Change-Id: I5cbc2de81cb6afcd7a559d691d56e77d24eec728

diff --git a/src/bin/e_desk.c b/src/bin/e_desk.c
index 7f15813..28db4e6 100644 (file)
--- a/src/bin/e_desk.c
+++ b/src/bin/e_desk.c
@@ -1598,22 +1598,19 @@ _e_desk_free(E_Desk *desk)
    Eina_List *l;
    E_Desk_Area *eda;
 
-   if (e_config->use_desk_area)
-     {
-        for (int i=E_DESK_AREA_LAYER_COUNT-1; i>=0; i--)
-          {
-             EINA_LIST_FOREACH(desk->desk_area.list[i], l, eda)
-               {
-                  e_object_del(E_OBJECT(eda));
-               }
-             eina_list_free(desk->desk_area.list[i]);
-             desk->desk_area.list[i] = NULL;
-          }
+   for (int i=E_DESK_AREA_LAYER_COUNT-1; i>=0; i--)
+      {
+         EINA_LIST_FOREACH(desk->desk_area.list[i], l, eda)
+         {
+            e_object_del(E_OBJECT(eda));
+         }
+         eina_list_free(desk->desk_area.list[i]);
+         desk->desk_area.list[i] = NULL;
+      }
 
-        e_desk_desk_area_del(desk, desk->desk_area.base);
-        desk->desk_area.base = NULL;
-        desk->desk_area.active = NULL;
-     }
+   e_desk_desk_area_del(desk, desk->desk_area.base);
+   desk->desk_area.base = NULL;
+   desk->desk_area.active = NULL;
 
 
    E_FREE_FUNC(desk->smart_obj, evas_object_del);
@@ -2059,8 +2056,6 @@ e_desk_desk_area_add(E_Desk *desk, int x, int y, int w, int h, E_Desk_Area_Layer
    int id;
    unsigned int list_id;
 
-   if (!e_config->use_desk_area) return NULL;
-
    E_OBJECT_CHECK_RETURN(desk, NULL);
    E_OBJECT_TYPE_CHECK_RETURN(desk, E_DESK_TYPE, NULL);
 
@@ -2087,8 +2082,6 @@ e_desk_desk_area_del(E_Desk *desk, E_Desk_Area *eda)
    E_OBJECT_CHECK(desk);
    E_OBJECT_TYPE_CHECK(desk, E_DESK_TYPE);
 
-   if (!e_config->use_desk_area) return;
-
    if (!eda) return;
 
    list_id = _e_desk_desk_area_layer_map(e_desk_area_layer_get(eda));
@@ -2101,7 +2094,6 @@ static Eina_Bool
 _e_desk_desk_area_base_new(E_Desk *desk)
 {
    if (!desk) return EINA_FALSE;
-   if (!e_config->use_desk_area) return EINA_FALSE;
 
    if (!desk->desk_area.base)
      {
@@ -2122,8 +2114,6 @@ e_desk_desk_area_base_get(E_Desk *desk)
    E_OBJECT_CHECK_RETURN(desk, NULL);
    E_OBJECT_TYPE_CHECK_RETURN(desk, E_DESK_TYPE, NULL);
 
-   if (!e_config->use_desk_area) return NULL;
-
    return desk->desk_area.base;
 }
 
@@ -2132,8 +2122,6 @@ e_desk_desk_area_active_set(E_Desk *desk, E_Desk_Area *eda)
 {
    E_OBJECT_CHECK(desk);
    E_OBJECT_TYPE_CHECK(desk, E_DESK_TYPE);
-
-   if (!e_config->use_desk_area) return;
    if (desk->desk_area.active == eda) return;
 
    desk->desk_area.active = eda;
@@ -2148,8 +2136,6 @@ e_desk_desk_area_active_get(E_Desk *desk)
    E_OBJECT_CHECK_RETURN(desk, NULL);
    E_OBJECT_TYPE_CHECK_RETURN(desk, E_DESK_TYPE, NULL);
 
-   if (!e_config->use_desk_area) return NULL;
-
    return desk->desk_area.active;
 }
 
@@ -2180,8 +2166,6 @@ e_desk_desk_area_enable(E_Desk *desk)
    E_Desk_Area *eda = NULL;
    Eina_List *l;
 
-   if (!e_config->use_desk_area) return EINA_FALSE;
-
    E_OBJECT_CHECK_RETURN(desk, EINA_FALSE);
    E_OBJECT_TYPE_CHECK_RETURN(desk, E_DESK_TYPE, EINA_FALSE);
 
@@ -2212,8 +2196,6 @@ e_desk_desk_area_disable(E_Desk *desk)
    E_Desk_Area *eda = NULL;
    Eina_List *l;
 
-   if (!e_config->use_desk_area) return EINA_FALSE;
-
    E_OBJECT_CHECK_RETURN(desk, EINA_FALSE);
    E_OBJECT_TYPE_CHECK_RETURN(desk, E_DESK_TYPE, EINA_FALSE);
 
@@ -2240,8 +2222,6 @@ e_desk_desk_area_raise(E_Desk *desk, E_Desk_Area *eda)
 {
    unsigned int list_id;
 
-   if (!e_config->use_desk_area) return;
-
    E_OBJECT_CHECK(desk);
    E_OBJECT_TYPE_CHECK(desk, E_DESK_TYPE);
 
@@ -2261,8 +2241,6 @@ e_desk_desk_area_lower(E_Desk *desk, E_Desk_Area *eda)
 {
    unsigned int list_id;
 
-   if (!e_config->use_desk_area) return;
-
    E_OBJECT_CHECK(desk);
    E_OBJECT_TYPE_CHECK(desk, E_DESK_TYPE);
 

diff --git a/src/bin/e_policy_wl.c b/src/bin/e_policy_wl.c
index 9b5e8ee..42dc330 100644 (file)
--- a/src/bin/e_policy_wl.c
+++ b/src/bin/e_policy_wl.c
@@ -2009,10 +2009,7 @@ _tzpol_notilv_set(E_Client *ec, int lv)
 #ifdef REFACTOR_DESK_AREA
    cur_ly = e_client_layer_get(ec);
 #else
-   if (e_config->use_desk_area)
-     cur_ly = e_client_desk_area_original_layer_get(ec);
-   else
-     cur_ly = e_client_layer_get(ec);
+   cur_ly = e_client_desk_area_original_layer_get(ec);
 #endif
 
    if (cur_ly != ly)

diff --git a/src/bin/services/e_service_lockscreen.c b/src/bin/services/e_service_lockscreen.c
index f21bef4..911050b 100644 (file)
--- a/src/bin/services/e_service_lockscreen.c
+++ b/src/bin/services/e_service_lockscreen.c
@@ -19,10 +19,7 @@ e_service_lockscreen_client_set(E_Client *ec)
    layer = e_client_layer_get(ec);
 #else
    // set lockscreen layer
-   if (e_config->use_desk_area)
-     layer = e_client_desk_area_original_layer_get(ec);
-   else
-     layer = e_client_layer_get(ec);
+   layer = e_client_desk_area_original_layer_get(ec);
 #endif
 
    if (E_LAYER_CLIENT_NOTIFICATION_LOW > layer)

diff --git a/src/bin/services/e_service_quickpanel.c b/src/bin/services/e_service_quickpanel.c
index b69bf8a..87e1fe9 100644 (file)
--- a/src/bin/services/e_service_quickpanel.c
+++ b/src/bin/services/e_service_quickpanel.c
@@ -2292,10 +2292,7 @@ e_service_quickpanel_client_add(E_Client *ec, E_Service_Quickpanel_Type type)
    layer = e_client_layer_get(ec);
 #else
    // set quickpanel layer
-   if (e_config->use_desk_area)
-     layer = e_client_desk_area_original_layer_get(ec);
-   else
-     layer = e_client_layer_get(ec);
+   layer = e_client_desk_area_original_layer_get(ec);
 #endif
 
    if (E_POLICY_QUICKPANEL_LAYER != layer)

diff --git a/src/bin/services/e_service_scrsaver.c b/src/bin/services/e_service_scrsaver.c
index d83292b..dd39220 100644 (file)
--- a/src/bin/services/e_service_scrsaver.c
+++ b/src/bin/services/e_service_scrsaver.c
@@ -17,10 +17,7 @@ e_service_scrsaver_client_set(E_Client *ec)
    layer = e_client_layer_get(ec);
 #else
    // set screensaver layer
-   if (e_config->use_desk_area)
-     layer = e_client_desk_area_original_layer_get(ec);
-   else
-     layer = e_client_layer_get(ec);
+   layer = e_client_desk_area_original_layer_get(ec);
 #endif
 
    if (E_POLICY_SCRSAVER_LAYER != layer)

diff --git a/src/bin/services/e_service_taskbar.c b/src/bin/services/e_service_taskbar.c
index 2150c0f..15feae7 100644 (file)
--- a/src/bin/services/e_service_taskbar.c
+++ b/src/bin/services/e_service_taskbar.c
@@ -105,10 +105,7 @@ e_service_taskbar_client_set(E_Client *ec)
    layer = e_client_layer_get(ec);
 #else
    // set taskbar layer
-   if (e_config->use_desk_area)
-     layer = e_client_desk_area_original_layer_get(ec);
-   else
-     layer = e_client_layer_get(ec);
+   layer = e_client_desk_area_original_layer_get(ec);
 #endif
 
    if (E_POLICY_TASKBAR_LAYER != layer)

diff --git a/src/bin/services/e_service_volume.c b/src/bin/services/e_service_volume.c
index fb01860..cdcb07e 100644 (file)
--- a/src/bin/services/e_service_volume.c
+++ b/src/bin/services/e_service_volume.c
@@ -298,10 +298,7 @@ e_service_volume_client_set(E_Client *ec)
    layer = e_client_layer_get(ec);
 #else
    // set volume layer
-   if (e_config->use_desk_area)
-     layer = e_client_desk_area_original_layer_get(ec);
-   else
-     layer = e_client_layer_get(ec);
+   layer = e_client_desk_area_original_layer_get(ec);
 #endif
 
    if (E_POLICY_VOLUME_LAYER != layer)