From: Chris Michael <cp.michael@samsung.com>
Date: Wed, 3 Jul 2013 13:30:40 +0000 (+0100)
Subject: Revert "EFL formatting and 80 column wrap"
X-Git-Tag: submit/devel/efl/20131022.203902~491
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8fc3c9c8bc62ae63170c757886f361cef5ec3d85;p=platform%2Fupstream%2Fefl.git

Revert "EFL formatting and 80 column wrap"

Revert this because I have better things to do than argue about commit
messages.

This reverts commit ee5483bee137731db67366232537741ce5780f71.
---

diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
index 226cce6..4a4dee6 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
@@ -25,7 +25,7 @@ struct _EE_Wl_Smart_Data
 
 static const Evas_Smart_Cb_Description _smart_callbacks[] =
 {
-   {NULL, NULL}
+     {NULL, NULL}
 };
 
 EVAS_SMART_SUBCLASS_NEW(_smart_frame_type, _ecore_evas_wl_frame,
@@ -307,32 +307,27 @@ _rotation_do(Ecore_Evas *ee, int rotation, int resize)
                   evas_output_framespace_get(ee->evas, NULL, NULL, &fw, &fh);
                   if ((rotation == 0) || (rotation == 180))
                     {
-                       ecore_wl_window_resize(wdata->win, ee->h + fw, 
-                                              ee->w + fh, 0);
+                       ecore_wl_window_resize(wdata->win, ee->h + fw, ee->w + fh, 0);
                     }
                   else
                     {
-                       ecore_wl_window_resize(wdata->win, ee->h + fh, 
-                                              ee->w + fw, 0);
+                       ecore_wl_window_resize(wdata->win, ee->h + fh, ee->w + fw, 0);
                     }
                   if ((ee->rotation == 0) || (ee->rotation == 180))
                     {
                        evas_output_size_set(ee->evas, ee->w + fw, ee->h + fh);
-                       evas_output_viewport_set(ee->evas, 0, 0, 
-                                                ee->w + fw, ee->h + fh);
+                       evas_output_viewport_set(ee->evas, 0, 0, ee->w + fw, ee->h + fh);
                     }
                   else
                     {
                        evas_output_size_set(ee->evas, ee->h + fw, ee->w + fh);
-                       evas_output_viewport_set(ee->evas, 0, 0, 
-                                                ee->h + fw, ee->w + fh);
+                       evas_output_viewport_set(ee->evas, 0, 0, ee->h + fw, ee->w + fh);
                     }
                }
              else
                {
                   evas_output_size_set(ee->evas, ee->req.w, ee->req.h);
-                  evas_output_viewport_set(ee->evas, 0, 0, 
-                                           ee->req.w, ee->req.h);
+                  evas_output_viewport_set(ee->evas, 0, 0, ee->req.w, ee->req.h);
                   if (ee->func.fn_resize) ee->func.fn_resize(ee);
                }
              if ((ee->rotation == 90) || (ee->rotation == 270))
@@ -645,8 +640,7 @@ _border_size_eval(Evas_Object *obj EINA_UNUSED, EE_Wl_Smart_Data *sd)
    /* bottom border */
    if (sd->border[1])
      {
-        evas_object_move(sd->border[1], sd->x, 
-                         sd->y + sd->h - sd->border_size[1]);
+        evas_object_move(sd->border[1], sd->x, sd->y + sd->h - sd->border_size[1]);
         evas_object_resize(sd->border[1], sd->w, sd->border_size[1]);
      }
 
@@ -961,9 +955,7 @@ void
 _ecore_evas_wl_common_object_cursor_set(Ecore_Evas *ee, Evas_Object *obj, int layer, int hot_x, int hot_y)
 {
    int x, y, fx, fy;
-   Ecore_Evas_Engine_Wl_Data *wdata;
-
-   if (!(wdata = ee->engine.data)) return;
+   Ecore_Evas_Engine_Wl_Data *wdata = ee->engine.data;
 
    if (ee->prop.cursor.object) evas_object_del(ee->prop.cursor.object);
 
@@ -1029,7 +1021,7 @@ _ecore_evas_wl_common_border_update(Ecore_Evas *ee)
    if (!wdata->frame)
      return;
 
-   if ((ee->prop.borderless) || (ee->prop.fullscreen))
+   if (ee->prop.borderless || ee->prop.fullscreen)
      {
         evas_object_hide(wdata->frame);
         evas_output_framespace_set(ee->evas, 0, 0, 0, 0);
@@ -1065,8 +1057,8 @@ _ecore_evas_wl_common_maximized_set(Ecore_Evas *ee, int max)
    LOGFN(__FILE__, __LINE__, __FUNCTION__);
 
    if (!ee) return;
-   if (ee->prop.maximized == max) return;
    wdata = ee->engine.data;
+   if (ee->prop.maximized == max) return;
    ecore_wl_window_maximized_set(wdata->win, max);
 }