dpms: move zone controlling to output temporarily

Change-Id: If7fdd0a1825c6faea229de95c455885a3c9f3602

diff --git a/src/bin/e_dpms.c b/src/bin/e_dpms.c
index c22d782..b53144a 100644 (file)
--- a/src/bin/e_dpms.c
+++ b/src/bin/e_dpms.c
@@ -25,8 +25,6 @@ _e_dpms_set_cb(const Eldbus_Service_Interface *iface, const Eldbus_Message *msg)
    Eldbus_Message *reply = eldbus_message_method_return_new(msg);
    E_Dpms_Mode dpms_value = E_DPMS_MODE_OFF;
    int result = -1;
-   E_Zone *zone = NULL;
-   Eina_List *zl = NULL;
 
    DBG("got DPMS request");
 
@@ -42,14 +40,6 @@ _e_dpms_set_cb(const Eldbus_Service_Interface *iface, const Eldbus_Message *msg)
         else if (dpms_value == E_DPMS_MODE_SUSPEND) val = E_OUTPUT_DPMS_SUSPEND;
         else val = E_OUTPUT_DPMS_OFF;
 
-        EINA_LIST_FOREACH(e_comp->zones, zl, zone)
-          {
-             if (dpms_value == E_DPMS_MODE_ON)
-               e_zone_display_state_set(zone, E_ZONE_DISPLAY_STATE_ON);
-             else if (dpms_value == E_DPMS_MODE_OFF)
-               e_zone_display_state_set(zone, E_ZONE_DISPLAY_STATE_OFF);
-          }
-
         if (e_output_dpms_set(output, val))
           DBG("set DPMS");
      }

diff --git a/src/bin/e_output.c b/src/bin/e_output.c
index b162fb7..9a467cf 100644 (file)
--- a/src/bin/e_output.c
+++ b/src/bin/e_output.c
@@ -2070,14 +2070,23 @@ e_output_dpms_set(E_Output *output, E_OUTPUT_DPMS val)
    E_Output_Intercept_Hook_Point hookpoint;
    tdm_output_dpms tval;
    tdm_error error;
+   Eina_List *l;
+   E_Zone *zone;
 
    EINA_SAFETY_ON_NULL_RETURN_VAL(output, EINA_FALSE);
 
+   /* FIXME: The zone controlling should be moved to e_zone */
+   EINA_LIST_FOREACH(e_comp->zones, l, zone)
+     {
+        if (val == E_OUTPUT_DPMS_ON)
+          e_zone_display_state_set(zone, E_ZONE_DISPLAY_STATE_ON);
+        else if (val == E_OUTPUT_DPMS_OFF)
+          e_zone_display_state_set(zone, E_ZONE_DISPLAY_STATE_OFF);
+     }
+
    if (val == E_OUTPUT_DPMS_OFF)
      {
         E_Plane *ep;
-        Eina_List *l;
-
         EINA_LIST_FOREACH(output->planes, l, ep)
           {
              e_plane_dpms_off(ep);