From: Enlightenment S. <no-...@en...> - 2011-07-23 23:54:24
|
Log: Elm: Conformant Widget: Fix 'Zone may be used uninitialized' warning. Fix some formatting. Author: devilhorns Date: 2011-07-23 16:54:17 -0700 (Sat, 23 Jul 2011) New Revision: 61624 Trac: http://trac.enlightenment.org/e/changeset/61624 Modified: trunk/elementary/src/lib/elm_conform.c Modified: trunk/elementary/src/lib/elm_conform.c =================================================================== --- trunk/elementary/src/lib/elm_conform.c 2011-07-23 23:15:54 UTC (rev 61623) +++ trunk/elementary/src/lib/elm_conform.c 2011-07-23 23:54:17 UTC (rev 61624) @@ -187,7 +187,7 @@ static void _conformant_part_sizing_eval(Evas_Object *obj, Conformant_Part_Type part_type) { - Ecore_X_Window zone, xwin; + Ecore_X_Window zone = 0, xwin; int sx = -1, sy = -1, sw = -1, sh = -1; Widget_Data *wd = elm_widget_data_get(obj); @@ -203,37 +203,40 @@ if (part_type & ELM_CONFORM_INDICATOR_PART) { if ((!_conformant_part_geometry_env_get("ILLUME_IND", - &sx, &sy, &sw, &sh)) && (xwin)) { + &sx, &sy, &sw, &sh)) && (xwin)) + { #ifdef HAVE_ELEMENTARY_X - ecore_x_e_illume_indicator_geometry_get(zone, &sx, &sy, &sw, &sh); + ecore_x_e_illume_indicator_geometry_get(zone, &sx, &sy, &sw, &sh); #else - ; + ; #endif - } + } _conformant_part_size_set(obj, wd->shelf, sx, sy, sw, sh); } if (part_type & ELM_CONFORM_VIRTUAL_KEYPAD_PART) { if ((!_conformant_part_geometry_env_get("ILLUME_KBD", - &sx, &sy, &sw, &sh)) && (xwin)) { + &sx, &sy, &sw, &sh)) && (xwin)) + { #ifdef HAVE_ELEMENTARY_X - ecore_x_e_illume_keyboard_geometry_get(zone, &sx, &sy, &sw, &sh); + ecore_x_e_illume_keyboard_geometry_get(zone, &sx, &sy, &sw, &sh); #else - ; + ; #endif - } + } _conformant_part_size_set(obj,wd->virtualkeypad, sx, sy, sw, sh); } if (part_type & ELM_CONFORM_SOFTKEY_PART) { if ((!_conformant_part_geometry_env_get("ILLUME_STK", - &sx, &sy, &sw, &sh)) && (xwin)) { + &sx, &sy, &sw, &sh)) && (xwin)) + { #ifdef HAVE_ELEMENTARY_X - ecore_x_e_illume_softkey_geometry_get(zone, &sx, &sy, &sw, &sh); + ecore_x_e_illume_softkey_geometry_get(zone, &sx, &sy, &sw, &sh); #else - ; + ; #endif - } + } _conformant_part_size_set(obj, wd->panel, sx, sy, sw, sh); } } |