Fix main menu coding style

Patch by: Henrique Dante de Almeida <hdante@profusion.mobi>

SVN revision: 82985

diff --git a/legacy/elementary/data/themes/widgets/hover.edc b/legacy/elementary/data/themes/widgets/hover.edc
index f667bce..3fda5a0 100644 (file)
--- a/legacy/elementary/data/themes/widgets/hover.edc
+++ b/legacy/elementary/data/themes/widgets/hover.edc
@@ -899,7 +899,7 @@ group { name: "elm/hover/base/main_menu";
          description { state: "default" 0.0;
             visible: 0;
             fixed: 1 1;
-        }
+         }
       }
       part { name: "elm.swallow.size";
          type: SWALLOW;
@@ -1005,8 +1005,8 @@ group { name: "elm/hover/base/main_menu_submenu";
             image {
                normal: "bt_dis_base.png";
                border: 4 4 4 4;
+               middle: SOLID;
             }
-            image.middle: SOLID;
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;

diff --git a/legacy/elementary/data/themes/widgets/menu.edc b/legacy/elementary/data/themes/widgets/menu.edc
index 194d5a6..3de2fdf 100644 (file)
--- a/legacy/elementary/data/themes/widgets/menu.edc
+++ b/legacy/elementary/data/themes/widgets/menu.edc
@@ -773,8 +773,8 @@ group { name: "elm/menu/main_menu_submenu/default";
             image {
                normal: "bt_base2.png";
                border: 7 7 7 7;
+               middle: SOLID;
             }
-            image.middle: SOLID;
          }
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
@@ -783,8 +783,10 @@ group { name: "elm/menu/main_menu_submenu/default";
          description { state: "clicked" 0.0;
             inherit: "default" 0.0;
             inherit: "visible" 0.0;
-            image.normal: "bt_base1.png";
-            image.middle: SOLID;
+            image {
+               normal: "bt_base1.png";
+               middle: SOLID;
+            }
          }
          description { state: "disabled" 0.0;
             inherit:  "default" 0.0;
@@ -797,8 +799,8 @@ group { name: "elm/menu/main_menu_submenu/default";
             image {
                normal: "bt_dis_base.png";
                border: 4 4 4 4;
+               middle: SOLID;
             }
-            image.middle: SOLID;
          }
          description { state: "disabled" 0.0;
             inherit:  "default" 0.0;

diff --git a/legacy/elementary/data/themes/widgets/win.edc b/legacy/elementary/data/themes/widgets/win.edc
index a1c9df4..fa05ea2 100644 (file)
--- a/legacy/elementary/data/themes/widgets/win.edc
+++ b/legacy/elementary/data/themes/widgets/win.edc
@@ -254,14 +254,12 @@ group { name: "elm/win/base/default";
             align: 0.5 0;
             fixed: 1 1;
          }
-
          description { state: "visible" 0.0;
             inherit: "default" 0.0;
             visible: 1;
             fixed: 0 1;
          }
       }
-
       part { type: SWALLOW; name: "elm.swallow.contents";
          description { state: "default" 0.0;
             rel1 {

diff --git a/legacy/elementary/src/lib/elm_dbus_menu.c b/legacy/elementary/src/lib/elm_dbus_menu.c
index 7cff564..19b74bf 100644 (file)
--- a/legacy/elementary/src/lib/elm_dbus_menu.c
+++ b/legacy/elementary/src/lib/elm_dbus_menu.c
@@ -50,9 +50,10 @@ enum
    ELM_DBUS_SIGNAL_ITEM_ACTIVATION_REQUESTED,
 };
 
-typedef struct _Callback_Data {
-  void (*result_cb)(Eina_Bool, void *);
-  void *data;
+typedef struct _Callback_Data
+{
+   void (*result_cb)(Eina_Bool, void *);
+   void *data;
 } Callback_Data;
 
 static Eina_Bool
@@ -79,12 +80,12 @@ _menu_add_recursive(Elm_DBus_Menu *dbus_menu, Elm_Menu_Item *item)
 
 static void
 _app_register_cb(void *data, const EDBus_Message *msg,
-                EDBus_Pending *pending EINA_UNUSED)
+                 EDBus_Pending *pending EINA_UNUSED)
 {
-  Callback_Data *cd = data;
+   Callback_Data *cd = data;
 
-  cd->result_cb(!edbus_message_error_get(msg, NULL, NULL), cd->data);
-  free(cd);
+   cd->result_cb(!edbus_message_error_get(msg, NULL, NULL), cd->data);
+   free(cd);
 }
 
 static Eina_Bool
@@ -891,7 +892,7 @@ _elm_dbus_menu_unregister(Eo *obj)
 
 void
 _elm_dbus_menu_app_menu_register(Ecore_X_Window xid, Eo *obj,
-                                void (*result_cb)(Eina_Bool, void *), void *data)
+                                 void (*result_cb)(Eina_Bool, void *), void *data)
 {
    EDBus_Message *msg;
    const char *obj_path;
@@ -915,7 +916,7 @@ _elm_dbus_menu_app_menu_register(Ecore_X_Window xid, Eo *obj,
    edbus_message_arguments_append(msg, "uo", (unsigned)xid,
                                   obj_path);
    edbus_connection_send(sd->dbus_menu->bus, msg, _app_register_cb,
-                        cd, -1);
+                         cd, -1);
    sd->dbus_menu->xid = xid;
 }
 

diff --git a/legacy/elementary/src/lib/elm_menu.c b/legacy/elementary/src/lib/elm_menu.c
index 3ec6b9c..5ca1fc7 100644 (file)
--- a/legacy/elementary/src/lib/elm_menu.c
+++ b/legacy/elementary/src/lib/elm_menu.c
@@ -134,7 +134,7 @@ _sizing_eval(Evas_Object *obj)
 {
    Eina_List *l;
    Elm_Menu_Item *item;
-   Evas_Coord x_p, y_p, w_p, h_p, x2, y2, w2, h2, bw, bh, bx, by;
+   Evas_Coord x_p, y_p, w_p, h_p, x2, y2, w2, h2, bw, bh;
    Elm_Widget_Smart_Data *hover;
 
    ELM_MENU_DATA_GET(obj, sd);
@@ -166,10 +166,10 @@ _sizing_eval(Evas_Object *obj)
    elm_hover_target_set(sd->hv, sd->location);
 
    hover = eo_data_get(sd->hv, ELM_OBJ_WIDGET_CLASS);
-   edje_object_part_geometry_get(hover->resize_obj, "bottom", &bx, &by, &bw, &bh);
+   edje_object_part_geometry_get(hover->resize_obj, "bottom", NULL,
+                                NULL, &bw, &bh);
    evas_object_size_hint_min_set(obj, bw, bh);
 
-
    EINA_LIST_FOREACH(sd->items, l, item)
      if (item->submenu.open) _submenu_sizing_eval(item);
 }

diff --git a/legacy/elementary/src/lib/elm_win.c b/legacy/elementary/src/lib/elm_win.c
index 92e3d28..ca982c1 100644 (file)
--- a/legacy/elementary/src/lib/elm_win.c
+++ b/legacy/elementary/src/lib/elm_win.c
@@ -1415,9 +1415,9 @@ _elm_win_smart_del(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
    Elm_Win_Smart_Data *sd = _pd;
 
    evas_object_event_callback_del_full(sd->layout,
-                                      EVAS_CALLBACK_CHANGED_SIZE_HINTS,
-                                      _elm_win_on_resize_obj_changed_size_hints,
-                                      obj);
+                                       EVAS_CALLBACK_CHANGED_SIZE_HINTS,
+                                       _elm_win_on_resize_obj_changed_size_hints,
+                                       obj);
    evas_object_del(sd->box);
    evas_object_del(sd->layout);