From 7b79cd4e5f85ff68dc8190b3f4b89ea064c1f31e Mon Sep 17 00:00:00 2001 From: bdilly Date: Fri, 22 Jul 2011 13:44:42 +0000 Subject: [PATCH] Elementary: conform only use X stuff if we are on X Fix issues with shot. git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@61589 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/elm_conform.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/lib/elm_conform.c b/src/lib/elm_conform.c index c575727..d63de06 100644 --- a/src/lib/elm_conform.c +++ b/src/lib/elm_conform.c @@ -196,13 +196,14 @@ _conformant_part_sizing_eval(Evas_Object *obj, Conformant_Part_Type part_type) Evas_Object *top = elm_widget_top_get(obj); #ifdef HAVE_ELEMENTARY_X xwin = elm_win_xwindow_get(top); - zone = ecore_x_e_illume_zone_get(xwin); + if (xwin) + zone = ecore_x_e_illume_zone_get(xwin); #endif if (part_type & ELM_CONFORM_INDICATOR_PART) { - if (!_conformant_part_geometry_env_get("ILLUME_IND", - &sx, &sy, &sw, &sh)) { + if ((!_conformant_part_geometry_env_get("ILLUME_IND", + &sx, &sy, &sw, &sh)) && (xwin)) { #ifdef HAVE_ELEMENTARY_X ecore_x_e_illume_indicator_geometry_get(zone, &sx, &sy, &sw, &sh); #else @@ -213,8 +214,8 @@ _conformant_part_sizing_eval(Evas_Object *obj, Conformant_Part_Type part_type) } if (part_type & ELM_CONFORM_VIRTUAL_KEYPAD_PART) { - if (!_conformant_part_geometry_env_get("ILLUME_KBD", - &sx, &sy, &sw, &sh)) { + if ((!_conformant_part_geometry_env_get("ILLUME_KBD", + &sx, &sy, &sw, &sh)) && (xwin)) { #ifdef HAVE_ELEMENTARY_X ecore_x_e_illume_keyboard_geometry_get(zone, &sx, &sy, &sw, &sh); #else @@ -225,8 +226,8 @@ _conformant_part_sizing_eval(Evas_Object *obj, Conformant_Part_Type part_type) } if (part_type & ELM_CONFORM_SOFTKEY_PART) { - if (!_conformant_part_geometry_env_get("ILLUME_STK", - &sx, &sy, &sw, &sh)) { + if ((!_conformant_part_geometry_env_get("ILLUME_STK", + &sx, &sy, &sw, &sh)) && (xwin)) { #ifdef HAVE_ELEMENTARY_X ecore_x_e_illume_softkey_geometry_get(zone, &sx, &sy, &sw, &sh); #else -- 2.7.4