e_dpms: de-e_comp_get()ify

This commit is contained in:
Stefan Schmidt 2015-01-23 13:42:01 +01:00
parent c100027f20
commit fe024b561b
1 changed files with 5 additions and 5 deletions

View File

@ -29,7 +29,7 @@ e_dpms_update(void)
{ {
_e_dpms_enabled = enabled; _e_dpms_enabled = enabled;
#ifndef HAVE_WAYLAND_ONLY #ifndef HAVE_WAYLAND_ONLY
if (e_comp_get(NULL)->comp_type == E_PIXMAP_TYPE_X) if (e_comp->comp_type == E_PIXMAP_TYPE_X)
ecore_x_dpms_enabled_set(enabled); ecore_x_dpms_enabled_set(enabled);
#endif #endif
} }
@ -58,7 +58,7 @@ e_dpms_update(void)
changed = EINA_TRUE; changed = EINA_TRUE;
} }
#ifndef HAVE_WAYLAND_ONLY #ifndef HAVE_WAYLAND_ONLY
if (e_comp_get(NULL)->comp_type == E_PIXMAP_TYPE_X) if (e_comp->comp_type == E_PIXMAP_TYPE_X)
{ {
if (changed) ecore_x_dpms_timeouts_set(standby, suspend, off); if (changed) ecore_x_dpms_timeouts_set(standby, suspend, off);
} }
@ -74,7 +74,7 @@ e_dpms_force_update(void)
enabled = ((e_config->screensaver_enable) && enabled = ((e_config->screensaver_enable) &&
(!e_config->mode.presentation)); (!e_config->mode.presentation));
#ifndef HAVE_WAYLAND_ONLY #ifndef HAVE_WAYLAND_ONLY
if (e_comp_get(NULL)->comp_type == E_PIXMAP_TYPE_X) if (e_comp->comp_type == E_PIXMAP_TYPE_X)
ecore_x_dpms_enabled_set(enabled); ecore_x_dpms_enabled_set(enabled);
#endif #endif
if (!enabled) return; if (!enabled) return;
@ -87,7 +87,7 @@ e_dpms_force_update(void)
off += 7; off += 7;
} }
#ifndef HAVE_WAYLAND_ONLY #ifndef HAVE_WAYLAND_ONLY
if (e_comp_get(NULL)->comp_type != E_PIXMAP_TYPE_X) return; if (e_comp->comp_type != E_PIXMAP_TYPE_X) return;
ecore_x_dpms_timeouts_set(standby + 10, suspend + 10, off + 10); ecore_x_dpms_timeouts_set(standby + 10, suspend + 10, off + 10);
ecore_x_dpms_timeouts_set(standby, suspend, off); ecore_x_dpms_timeouts_set(standby, suspend, off);
#endif #endif
@ -149,7 +149,7 @@ e_dpms_init(void)
(E_EVENT_DESK_SHOW, _e_dpms_handler_desk_show_cb, NULL); (E_EVENT_DESK_SHOW, _e_dpms_handler_desk_show_cb, NULL);
#ifndef HAVE_WAYLAND_ONLY #ifndef HAVE_WAYLAND_ONLY
if (e_comp_get(NULL)->comp_type == E_PIXMAP_TYPE_X) if (e_comp->comp_type == E_PIXMAP_TYPE_X)
{ {
_e_dpms_enabled = ecore_x_dpms_enabled_get(); _e_dpms_enabled = ecore_x_dpms_enabled_get();
ecore_x_dpms_timeouts_get ecore_x_dpms_timeouts_get