diff --git a/src/bin/ephoto.c b/src/bin/ephoto.c
index a687c50..9db96ee 100644
--- a/src/bin/ephoto.c
+++ b/src/bin/ephoto.c
@@ -21,7 +21,7 @@ elm_main(int argc, char **argv)
    elm_app_compile_locale_set(LOCALEDIR);
    bindtextdomain(PACKAGE, elm_app_locale_dir_get());
    textdomain(PACKAGE);
-#endif   
+#endif
 
    __log_domain = eina_log_domain_register("ephoto", EINA_COLOR_ORANGE);
    if (!__log_domain)
diff --git a/src/bin/ephoto.h b/src/bin/ephoto.h
index 5ff11b0..93f21ba 100644
--- a/src/bin/ephoto.h
+++ b/src/bin/ephoto.h
@@ -34,7 +34,7 @@ Evas_Object *ephoto_window_add(const char *path);
 void         ephoto_title_set(Ephoto *ephoto, const char *title);
 void         ephoto_thumb_size_set(Ephoto *ephoto, int size);
 Evas_Object *ephoto_thumb_add(Ephoto *ephoto, Evas_Object *parent, const char *path);
-void         ephoto_thumb_path_set(Evas_Object *o, const char *path);
+void         ephoto_thumb_path_set(Evas_Object *obj, const char *path);
 void         ephoto_directory_set(Ephoto *ephoto, const char *path);
 
 Eina_Bool    ephoto_config_init(Ephoto *em);
diff --git a/src/bin/ephoto_config.c b/src/bin/ephoto_config.c
index 0812ff0..928f690 100644
--- a/src/bin/ephoto_config.c
+++ b/src/bin/ephoto_config.c
@@ -114,7 +114,7 @@ ephoto_config_window(Ephoto *ephoto)
    elm_box_horizontal_set(box, EINA_FALSE);
    evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL);
-   
+
    scroller = elm_scroller_add(win);
    evas_object_size_hint_weight_set(scroller, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(scroller, EVAS_HINT_FILL, EVAS_HINT_FILL);
@@ -174,7 +174,7 @@ ephoto_config_window(Ephoto *ephoto)
 
    ic = elm_icon_add(box);
    evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
-   elm_icon_standard_set(ic, "stock_save");   
+   elm_icon_standard_set(ic, "stock_save");
 
    button = elm_button_add(hbox);
    elm_object_text_set(button, "Save");
@@ -185,7 +185,7 @@ ephoto_config_window(Ephoto *ephoto)
 
    ic = elm_icon_add(box);
    evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
-   elm_icon_standard_set(ic, "stock_close"); 
+   elm_icon_standard_set(ic, "stock_close");
 
    button = elm_button_add(hbox);
    elm_object_text_set(button, "Cancel");
@@ -197,7 +197,7 @@ ephoto_config_window(Ephoto *ephoto)
    ephoto->config->window = win;
    elm_win_inwin_content_set(win, box);
    evas_object_show(box);
-}  
+}
 
 void
 ephoto_about_window(Ephoto *ephoto)
@@ -211,7 +211,7 @@ ephoto_about_window(Ephoto *ephoto)
    elm_box_horizontal_set(box, EINA_FALSE);
    evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL);
-   
+
    scroller = elm_scroller_add(win);
    evas_object_size_hint_weight_set(scroller, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(scroller, EVAS_HINT_FILL, EVAS_HINT_FILL);
@@ -240,7 +240,7 @@ ephoto_about_window(Ephoto *ephoto)
 
    ic = elm_icon_add(box);
    evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
-   elm_icon_standard_set(ic, "stock_close"); 
+   elm_icon_standard_set(ic, "stock_close");
 
    button = elm_button_add(box);
    elm_object_text_set(button, "Close");
diff --git a/src/bin/ephoto_cropper.c b/src/bin/ephoto_cropper.c
index d85626d..0ec0196 100644
--- a/src/bin/ephoto_cropper.c
+++ b/src/bin/ephoto_cropper.c
@@ -14,7 +14,7 @@ struct _Ephoto_Cropper
    int resizing;
 };
 
-static void 
+static void
 _cropper_both_mouse_move(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source)
 {
    Ephoto_Cropper *ec = data;
@@ -34,8 +34,8 @@ _cropper_both_mouse_move(void *data, Evas_Object *obj EINA_UNUSED, const char *e
    else if (my > ly+lh)
      my = ly+lh;
 
-   nx = mx - ec->startx;
-   ny = my - ec->starty;
+   nx = mx-ec->startx;
+   ny = my-ec->starty;
    ec->startx = mx;
    ec->starty = my;
 
@@ -55,7 +55,7 @@ _cropper_both_mouse_move(void *data, Evas_Object *obj EINA_UNUSED, const char *e
    edje_object_message_send(elm_layout_edje_get(ec->layout), EDJE_MESSAGE_INT_SET, 1, msg);
 }
 
-static void 
+static void
 _cropper_both_mouse_up(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source)
 {
    Ephoto_Cropper *ec = data;
@@ -65,7 +65,7 @@ _cropper_both_mouse_up(void *data, Evas_Object *obj EINA_UNUSED, const char *emi
    ec->resizing = 0;
 }
 
-static void 
+static void
 _cropper_resize_both(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source)
 {
    Ephoto_Cropper *ec = data;
@@ -74,8 +74,8 @@ _cropper_resize_both(void *data, Evas_Object *obj EINA_UNUSED, const char *emiss
    ec->resizing = 1;
    evas_pointer_canvas_xy_get(evas_object_evas_get(ec->cropper), &mx, &my);
    evas_object_geometry_get(ec->cropper, &cx, &cy, 0, 0);
-   ec->offsetx = mx - cx;
-   ec->offsety = my - cy;
+   ec->offsetx = mx-cx;
+   ec->offsety = my-cy;
    ec->startx = mx;
    ec->starty = my;
 
@@ -83,7 +83,7 @@ _cropper_resize_both(void *data, Evas_Object *obj EINA_UNUSED, const char *emiss
    edje_object_signal_callback_add(ec->cropper, "mouse,up,1", source, _cropper_both_mouse_up, ec);
 }
 
-static void 
+static void
 _cropper_horiz_mouse_move(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source)
 {
    Ephoto_Cropper *ec = data;
@@ -99,7 +99,7 @@ _cropper_horiz_mouse_move(void *data, Evas_Object *obj EINA_UNUSED, const char *
    else if (mx > lx+lw)
      mx = lx+lw;
 
-   nx = mx - ec->startx;
+   nx = mx-ec->startx;
    ec->startx = mx;
 
    msg = alloca(sizeof(Edje_Message_Int_Set) + (3*sizeof(int)));
@@ -113,7 +113,7 @@ _cropper_horiz_mouse_move(void *data, Evas_Object *obj EINA_UNUSED, const char *
    edje_object_message_send(elm_layout_edje_get(ec->layout), EDJE_MESSAGE_INT_SET, 1, msg);
 }
 
-static void 
+static void
 _cropper_horiz_mouse_up(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source)
 {
    Ephoto_Cropper *ec = data;
@@ -124,7 +124,7 @@ _cropper_horiz_mouse_up(void *data, Evas_Object *obj EINA_UNUSED, const char *em
 }
 
 
-static void 
+static void
 _cropper_resize_horiz(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED)
 {
    Ephoto_Cropper *ec = data;
@@ -133,8 +133,8 @@ _cropper_resize_horiz(void *data, Evas_Object *obj EINA_UNUSED, const char *emis
    ec->resizing = 1;
    evas_pointer_canvas_xy_get(evas_object_evas_get(ec->cropper), &mx, &my);
    evas_object_geometry_get(ec->cropper, &cx, &cy, 0, 0);
-   ec->offsetx = mx - cx;
-   ec->offsety = my - cy;
+   ec->offsetx = mx-cx;
+   ec->offsety = my-cy;
    ec->startx = mx;
    ec->starty = my;
 
@@ -143,7 +143,7 @@ _cropper_resize_horiz(void *data, Evas_Object *obj EINA_UNUSED, const char *emis
    edje_object_signal_callback_add(ec->cropper, "mouse,up,1", source, _cropper_horiz_mouse_up, ec);
 }
 
-static void 
+static void
 _cropper_vert_mouse_move(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source)
 {
    Ephoto_Cropper *ec = data;
@@ -159,7 +159,7 @@ _cropper_vert_mouse_move(void *data, Evas_Object *obj EINA_UNUSED, const char *e
    else if (my > ly+lh)
      my = ly+lh;
 
-   ny = my - ec->starty;
+   ny = my-ec->starty;
    ec->starty = my;
 
    msg = alloca(sizeof(Edje_Message_Int_Set) + (3*sizeof(int)));
@@ -173,7 +173,7 @@ _cropper_vert_mouse_move(void *data, Evas_Object *obj EINA_UNUSED, const char *e
    edje_object_message_send(elm_layout_edje_get(ec->layout), EDJE_MESSAGE_INT_SET, 1, msg);
 }
 
-static void 
+static void
 _cropper_vert_mouse_up(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source)
 {
    Ephoto_Cropper *ec = data;
@@ -183,7 +183,7 @@ _cropper_vert_mouse_up(void *data, Evas_Object *obj EINA_UNUSED, const char *emi
    ec->resizing = 0;
 }
 
-static void 
+static void
 _cropper_resize_vert(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED)
 {
    Ephoto_Cropper *ec = data;
@@ -192,8 +192,8 @@ _cropper_resize_vert(void *data, Evas_Object *obj EINA_UNUSED, const char *emiss
    ec->resizing = 1;
    evas_pointer_canvas_xy_get(evas_object_evas_get(ec->cropper), &mx, &my);
    evas_object_geometry_get(ec->cropper, &cx, &cy, 0, 0);
-   ec->offsetx = mx - cx;
-   ec->offsety = my - cy;
+   ec->offsetx = mx-cx;
+   ec->offsety = my-cy;
    ec->startx = mx;
    ec->starty = my;
 
@@ -202,7 +202,7 @@ _cropper_resize_vert(void *data, Evas_Object *obj EINA_UNUSED, const char *emiss
 
 }
 
-static void 
+static void
 _cropper_mouse_move(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED)
 {
    Ephoto_Cropper *ec = data;
@@ -223,10 +223,10 @@ _cropper_mouse_move(void *data, Evas_Object *obj EINA_UNUSED, const char *emissi
           my = ly;
         else if (my > ly+lh)
           my = ly+lh;
-                
 
-        nx = mx - ec->startx;
-        ny = my - ec->starty;
+
+        nx = mx-ec->startx;
+        ny = my-ec->starty;
         ec->startx = mx;
         ec->starty = my;
 
@@ -239,7 +239,7 @@ _cropper_mouse_move(void *data, Evas_Object *obj EINA_UNUSED, const char *emissi
      }
 }
 
-static void 
+static void
 _cropper_mouse_up(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED)
 {
    Ephoto_Cropper *ec = data;
@@ -248,7 +248,7 @@ _cropper_mouse_up(void *data, Evas_Object *obj EINA_UNUSED, const char *emission
    edje_object_signal_callback_del_full(ec->cropper, "mouse,up,1", "dragger", _cropper_mouse_up, ec);
 }
 
-static void 
+static void
 _cropper_move(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED)
 {
    Ephoto_Cropper *ec = data;
@@ -258,15 +258,15 @@ _cropper_move(void *data, Evas_Object *obj EINA_UNUSED, const char *emission EIN
    evas_object_geometry_get(ec->cropper, &cx, &cy, 0, 0);
    ec->startx = mx;
    ec->starty = my;
-   ec->offsetx = mx - cx;
-   ec->offsety = my - cy;
+   ec->offsetx = mx-cx;
+   ec->offsety = my-cy;
 
    edje_object_signal_callback_add(ec->cropper, "mouse,move", "dragger", _cropper_mouse_move, ec);
    edje_object_signal_callback_add(ec->cropper, "mouse,up,1", "dragger", _cropper_mouse_up, ec);
 }
 
-static void 
-_image_resize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_data EINA_UNUSED)
+static void
+_image_resize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    Ephoto_Cropper *ec = data;
 
@@ -277,8 +277,8 @@ _image_resize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, voi
    evas_object_image_size_get(elm_image_object_get(ec->image), &iw, &ih);
    if (iw < sw && ih < sh)
      {
-        diffw = sw - iw;
-        diffh = sh - ih;
+        diffw = sw-iw;
+        diffh = sh-ih;
         diffw /= 2;
         diffh /= 2;
         ix = sx+diffw;
@@ -320,8 +320,8 @@ _image_resize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, voi
                   nh = onh*((double)nw/(double)onw);
                }
           }
-        diffw = sw - nw;
-        diffh = sh - nh;
+        diffw = sw-nw;
+        diffh = sh-nh;
         diffw /= 2;
         diffh /= 2;
         ix = sx+diffw;
@@ -336,8 +336,8 @@ _image_resize(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, voi
      }
 }
 
-static void 
-_cropper_free(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_data EINA_UNUSED)
+static void
+_cropper_free(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    Ephoto_Cropper *ec = data;
    free(ec);
@@ -348,7 +348,7 @@ ephoto_cropper_add(Evas_Object *parent, const char *file, const char *key)
 {
    Ephoto_Cropper *ec = calloc(1, sizeof(Ephoto_Cropper));
    ec->resizing = 0;
- 
+
    ec->box = elm_box_add(parent);
    evas_object_size_hint_weight_set(ec->box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(ec->box, EVAS_HINT_FILL, EVAS_HINT_FILL);
diff --git a/src/bin/ephoto_main.c b/src/bin/ephoto_main.c
index 6c2ceaf..7126e1a 100644
--- a/src/bin/ephoto_main.c
+++ b/src/bin/ephoto_main.c
@@ -115,7 +115,7 @@ _ephoto_single_browser_slideshow(void *data, Evas_Object *obj EINA_UNUSED, void
 }
 
 static void
-_win_free(void *data, Evas *e EINA_UNUSED, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
+_win_free(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    Ephoto *ephoto = data;
    if (ephoto->timer.thumb_regen) ecore_timer_del(ephoto->timer.thumb_regen);
@@ -124,7 +124,7 @@ _win_free(void *data, Evas *e EINA_UNUSED, Evas_Object *o EINA_UNUSED, void *eve
 }
 
 static void
-_resize_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
+_resize_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    Ephoto *ephoto = data;
    int w, h;
@@ -215,7 +215,7 @@ ephoto_window_add(const char *path)
         evas_object_del(ephoto->win);
         return NULL;
      }
-   ephoto->sb = elm_naviframe_item_insert_after(ephoto->pager, ephoto->tb, 
+   ephoto->sb = elm_naviframe_item_insert_after(ephoto->pager, ephoto->tb,
                   NULL, NULL, NULL, ephoto->single_browser, "overlap");
    elm_naviframe_item_title_enabled_set(ephoto->sb, EINA_FALSE, EINA_FALSE);
    evas_object_smart_callback_add
@@ -278,7 +278,7 @@ ephoto_title_set(Ephoto *ephoto, const char *title)
 {
    char buf[1024] = "Ephoto";
 
-   if (title) 
+   if (title)
      {
         snprintf(buf, sizeof(buf), "Ephoto - %s", title);
         elm_win_title_set(ephoto->win, buf);
@@ -468,17 +468,17 @@ ephoto_thumb_size_set(Ephoto *ephoto, int size)
 }
 
 static void
-_thumb_del(void *data, Evas *e EINA_UNUSED, Evas_Object *o, void *event_info EINA_UNUSED)
+_thumb_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED)
 {
    Ephoto *ephoto = data;
-   ephoto->thumbs = eina_list_remove(ephoto->thumbs, o);
+   ephoto->thumbs = eina_list_remove(ephoto->thumbs, obj);
 }
 
 static void
 _load_error(void *data , Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    const char *path = data;
-   ERR("Error loading thumbnail: %s\n", path);  
+   ERR("Error loading thumbnail: %s\n", path);
 }
 
 Evas_Object *
@@ -514,7 +514,7 @@ ephoto_thumb_add(Ephoto *ephoto, Evas_Object *parent, const char *path)
 }
 
 void
-ephoto_thumb_path_set(Evas_Object *o, const char *path)
+ephoto_thumb_path_set(Evas_Object *obj, const char *path)
 {
    Ethumb_Thumb_Format format = ETHUMB_THUMB_FDO;
    const char *group = NULL;
@@ -535,17 +535,17 @@ ephoto_thumb_path_set(Evas_Object *o, const char *path)
                   group = eina_list_data_get(g);
                   edje_file_collection_list_free(g);
                }
-             elm_image_file_set(o, path, group);
-             evas_object_data_set(o, "ephoto_format", NULL);
+             elm_image_file_set(obj, path, group);
+             evas_object_data_set(obj, "ephoto_format", NULL);
              return;
           }
      }
-   elm_thumb_format_set(o, format);
-   evas_object_data_set(o, "ephoto_format", (void*)(long)format);
-   elm_thumb_crop_align_set(o, 0.5, 0.5);
-   elm_thumb_aspect_set(o, ETHUMB_THUMB_CROP);
-   elm_thumb_orientation_set(o, ETHUMB_THUMB_ORIENT_ORIGINAL);
-   elm_thumb_file_set(o, path, group);
+   elm_thumb_format_set(obj, format);
+   evas_object_data_set(obj, "ephoto_format", (void*)(long)format);
+   elm_thumb_crop_align_set(obj, 0.5, 0.5);
+   elm_thumb_aspect_set(obj, ETHUMB_THUMB_CROP);
+   elm_thumb_orientation_set(obj, ETHUMB_THUMB_ORIENT_ORIGINAL);
+   elm_thumb_file_set(obj, path, group);
 }
 
 Ephoto_Entry *
diff --git a/src/bin/ephoto_single_browser.c b/src/bin/ephoto_single_browser.c
index 1b745bf..2a17da3 100644
--- a/src/bin/ephoto_single_browser.c
+++ b/src/bin/ephoto_single_browser.c
@@ -64,8 +64,8 @@ _image_create_icon(void *data, Evas_Object *parent, Evas_Coord *xoff, Evas_Coord
    evas_object_show(ic);
 
    evas_pointer_canvas_xy_get(evas_object_evas_get(io), &xm, &ym);
-   if (xoff) *xoff = xm - 30;
-   if (yoff) *yoff = ym - 30;
+   if (xoff) *xoff = xm-30;
+   if (yoff) *yoff = ym-30;
 
    return ic;
 }
@@ -85,7 +85,7 @@ _1s_hold_time(void *data)
                   _image_create_icon, io,
                   NULL, NULL, NULL, NULL, NULL, NULL);
    _1s_hold = NULL;
-   
+
    return ECORE_CALLBACK_CANCEL;
 }
 
@@ -93,7 +93,7 @@ static void
 _image_mouse_down_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    Evas_Object *io = data;
- 
+
    _1s_hold = ecore_timer_add(0.5, _1s_hold_time, io);
 }
 
@@ -132,7 +132,7 @@ _viewer_add(Evas_Object *parent, const char *path)
           }
        }
    obj = v->scroller = elm_scroller_add(parent);
-   EINA_SAFETY_ON_NULL_GOTO(obj, error);  
+   EINA_SAFETY_ON_NULL_GOTO(obj, error);
    evas_object_size_hint_weight_set(obj, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(obj, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_data_set(obj, "viewer", v);
@@ -171,7 +171,7 @@ _viewer_add(Evas_Object *parent, const char *path)
    ERR("could not load image '%s': %s", path, evas_load_error_str(err));
  error:
    evas_object_event_callback_del(obj, EVAS_CALLBACK_DEL, _viewer_del);
-   evas_object_data_del(obj, "viewer"); 
+   evas_object_data_del(obj, "viewer");
    free(v);
    return NULL;
 }
@@ -212,8 +212,8 @@ _viewer_zoom_fit_apply(Ephoto_Viewer *v)
    EINA_SAFETY_ON_TRUE_RETURN(iw <= 0);
    EINA_SAFETY_ON_TRUE_RETURN(ih <= 0);
 
-   zx = (double)cw / (double)iw;
-   zy = (double)ch / (double)ih;
+   zx = (double)cw/(double)iw;
+   zy = (double)ch/(double)ih;
 
    zoom = (zx < zy) ? zx : zy;
    _viewer_zoom_apply(v, zoom);
@@ -267,7 +267,7 @@ static void
 _orient_apply(Ephoto_Single_Browser *sb)
 {
    Ephoto_Viewer *v = evas_object_data_get(sb->viewer, "viewer");
-   int w, h; 
+   int w, h;
    EINA_SAFETY_ON_NULL_RETURN(v);
 
    switch (sb->orient)
@@ -318,7 +318,7 @@ _rotate_counterclock(Ephoto_Single_Browser *sb)
 {
    switch (sb->orient)
      {
-      case EPHOTO_ORIENT_0:  
+      case EPHOTO_ORIENT_0:
          sb->orient = EPHOTO_ORIENT_270;
          break;
       case EPHOTO_ORIENT_90:
@@ -354,7 +354,7 @@ _rotate_clock(Ephoto_Single_Browser *sb)
 {
    switch (sb->orient)
      {
-      case EPHOTO_ORIENT_0:  
+      case EPHOTO_ORIENT_0:
          sb->orient = EPHOTO_ORIENT_90;
          break;
       case EPHOTO_ORIENT_90:
@@ -390,7 +390,7 @@ _flip_horiz(Ephoto_Single_Browser *sb)
 {
    switch (sb->orient)
      {
-      case EPHOTO_ORIENT_0:  
+      case EPHOTO_ORIENT_0:
          sb->orient = EPHOTO_ORIENT_FLIP_HORIZ;
          break;
       case EPHOTO_ORIENT_90:
@@ -426,7 +426,7 @@ _flip_vert(Ephoto_Single_Browser *sb)
 {
    switch (sb->orient)
      {
-      case EPHOTO_ORIENT_0:  
+      case EPHOTO_ORIENT_0:
          sb->orient = EPHOTO_ORIENT_FLIP_VERT;
          break;
       case EPHOTO_ORIENT_90:
@@ -458,7 +458,7 @@ _flip_vert(Ephoto_Single_Browser *sb)
 }
 
 static void
-_mouse_wheel(void *data, Evas *e EINA_UNUSED, Evas_Object *o EINA_UNUSED, void *event_info)
+_mouse_wheel(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info)
 {
    Ephoto_Single_Browser *sb = data;
    Evas_Event_Mouse_Wheel *ev = event_info;
@@ -565,7 +565,7 @@ _ephoto_single_browser_recalc(Ephoto_Single_Browser *sb)
 
                   ic = elm_icon_add(sb->botbox);
                   evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
-                  elm_icon_standard_set(ic, "document-save");   
+                  elm_icon_standard_set(ic, "document-save");
                   button = elm_button_add(sb->botbox);
                   elm_object_text_set(button, "Apply");
                   elm_object_part_content_set(button, "icon", ic);
@@ -575,7 +575,7 @@ _ephoto_single_browser_recalc(Ephoto_Single_Browser *sb)
 
                   ic = elm_icon_add(sb->botbox);
                   evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
-                  elm_icon_standard_set(ic, "window-close"); 
+                  elm_icon_standard_set(ic, "window-close");
                   button = elm_button_add(sb->botbox);
                   elm_object_text_set(button, "Cancel");
                   elm_object_part_content_set(button, "icon", ic);
@@ -586,9 +586,9 @@ _ephoto_single_browser_recalc(Ephoto_Single_Browser *sb)
              else
                {
                   evas_object_image_size_get(elm_image_object_get(v->image), &w, &h);
-                  snprintf(image_info, PATH_MAX, 
-                           "<b>Type:</b> %s        <b>Resolution:</b> %dx%d        <b>File Size: </b>%s", 
-                           efreet_mime_type_get(sb->entry->path), w, h, 
+                  snprintf(image_info, PATH_MAX,
+                           "<b>Type:</b> %s        <b>Resolution:</b> %dx%d        <b>File Size: </b>%s",
+                           efreet_mime_type_get(sb->entry->path), w, h,
                            _ephoto_get_file_size(sb->entry->path));
                   sb->botbox = evas_object_rectangle_add(evas_object_evas_get(sb->table));
                   evas_object_color_set(sb->botbox, 0, 0, 0, 0);
@@ -642,40 +642,40 @@ _zoom_fit(Ephoto_Single_Browser *sb)
 static void
 _zoom_in(Ephoto_Single_Browser *sb)
 {
-   double change = (1.0 + ZOOM_STEP);
+   double change = (1.0+ZOOM_STEP);
    _viewer_zoom_set(sb->viewer, _viewer_zoom_get(sb->viewer) * change);
 }
 
 static void
 _zoom_out(Ephoto_Single_Browser *sb)
 {
-   double change = (1.0 - ZOOM_STEP);
+   double change = (1.0-ZOOM_STEP);
    _viewer_zoom_set(sb->viewer, _viewer_zoom_get(sb->viewer) * change);
 }
 
 static void
-_zoom_in_cb(void *data, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
+_zoom_in_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    Ephoto_Single_Browser *sb = data;
    _zoom_in(sb);
 }
 
 static void
-_zoom_out_cb(void *data, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
+_zoom_out_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    Ephoto_Single_Browser *sb = data;
    _zoom_out(sb);
 }
 
 static void
-_zoom_1_cb(void *data, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
+_zoom_1_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    Ephoto_Single_Browser *sb = data;
    _zoom_set(sb, 1.0);
 }
 
 static void
-_zoom_fit_cb(void *data, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
+_zoom_fit_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    Ephoto_Single_Browser *sb = data;
    _zoom_fit(sb);
@@ -752,7 +752,7 @@ static void _apply_crop(void *data, Evas_Object *obj EINA_UNUSED, void *event_in
 
    const char *path, *key, *type;;
    char tmp_path[PATH_MAX], image_info[PATH_MAX];
-   int x, y, w, h, cx, cy, cw, ch, iw, ih; 
+   int x, y, w, h, cx, cy, cw, ch, iw, ih;
    int nx, ny, nw, nh, i, j, tmpx, tmpy, ind, index;
    double scalex, scaley, scalew, scaleh;
    unsigned int *idata, *idata_new;
@@ -794,7 +794,7 @@ static void _apply_crop(void *data, Evas_Object *obj EINA_UNUSED, void *event_in
    evas_object_image_size_set(crop, nw, nh);
    evas_object_image_data_set(crop, idata_new);
    evas_object_image_data_update_add(crop, 0, 0, nw, nh);
-   
+
    type = strrchr(sb->entry->basename, '.');
    snprintf(tmp_path, PATH_MAX, "%s/.config/ephoto/tmp%s", getenv("HOME"), type);
    if (ecore_file_exists(tmp_path))
@@ -809,9 +809,9 @@ static void _apply_crop(void *data, Evas_Object *obj EINA_UNUSED, void *event_in
    evas_object_show(sb->viewer);
 
    evas_object_del(sb->botbox);
-   snprintf(image_info, PATH_MAX, 
-             "<b>Type:</b> %s        <b>Resolution:</b> %dx%d        <b>File Size: </b>%s", 
-             efreet_mime_type_get(tmp_path), nw, nh, 
+   snprintf(image_info, PATH_MAX,
+             "<b>Type:</b> %s        <b>Resolution:</b> %dx%d        <b>File Size: </b>%s",
+             efreet_mime_type_get(tmp_path), nw, nh,
              _ephoto_get_file_size(tmp_path));
    sb->botbox = evas_object_rectangle_add(evas_object_evas_get(sb->table));
    evas_object_color_set(sb->botbox, 0, 0, 0, 0);
@@ -840,7 +840,7 @@ static void _cancel_crop(void *data, Evas_Object *obj EINA_UNUSED, void *event_i
 }
 
 static void
-_crop_image(void *data, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
+_crop_image(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    Ephoto_Single_Browser *sb = data;
    sb->cropping = 1;
@@ -848,63 +848,63 @@ _crop_image(void *data, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED
 }
 
 static void
-_go_first(void *data, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
+_go_first(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    Ephoto_Single_Browser *sb = data;
    _first_entry(sb);
 }
 
 static void
-_go_prev(void *data, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
+_go_prev(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    Ephoto_Single_Browser *sb = data;
    _prev_entry(sb);
 }
 
 static void
-_go_next(void *data, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
+_go_next(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    Ephoto_Single_Browser *sb = data;
    _next_entry(sb);
 }
 
 static void
-_go_last(void *data, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
+_go_last(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    Ephoto_Single_Browser *sb = data;
    _last_entry(sb);
 }
 
 static void
-_go_rotate_counterclock(void *data, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
+_go_rotate_counterclock(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    Ephoto_Single_Browser *sb = data;
    _rotate_counterclock(sb);
 }
 
 static void
-_go_rotate_clock(void *data, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
+_go_rotate_clock(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    Ephoto_Single_Browser *sb = data;
    _rotate_clock(sb);
 }
 
 static void
-_go_flip_horiz(void *data, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
+_go_flip_horiz(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    Ephoto_Single_Browser *sb = data;
    _flip_horiz(sb);
 }
 
 static void
-_go_flip_vert(void *data, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
+_go_flip_vert(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    Ephoto_Single_Browser *sb = data;
    _flip_vert(sb);
 }
 
 static void
-_slideshow(void *data, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
+_slideshow(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    Ephoto_Single_Browser *sb = data;
    if (sb->entry)
@@ -912,14 +912,14 @@ _slideshow(void *data, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
 }
 
 static void
-_back(void *data, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
+_back(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    Ephoto_Single_Browser *sb = data;
    evas_object_smart_callback_call(sb->main, "back", sb->entry);
 }
 
 static void
-_settings(void *data, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
+_settings(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    Ephoto_Single_Browser *sb = data;
 
@@ -928,7 +928,7 @@ _settings(void *data, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
 }
 
 static void
-_about(void *data, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
+_about(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    Ephoto_Single_Browser *sb = data;
 
@@ -937,7 +937,7 @@ _about(void *data, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
 }
 
 static void
-_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *o EINA_UNUSED, void *event_info)
+_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info)
 {
    Ephoto_Single_Browser *sb = data;
    Evas_Event_Key_Down *ev = event_info;
@@ -1001,7 +1001,7 @@ _entry_free(void *data, const Ephoto_Entry *entry EINA_UNUSED)
 }
 
 static void
-_main_del(void *data, Evas *e EINA_UNUSED, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
+_main_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    char tmp_path[PATH_MAX];
    Ephoto_Single_Browser *sb = data;
@@ -1019,7 +1019,7 @@ _main_del(void *data, Evas *e EINA_UNUSED, Evas_Object *o EINA_UNUSED, void *eve
    tmps = eina_file_stat_ls(tmp_path);
    EINA_ITERATOR_FOREACH(tmps, info)
      {
-        const char *bname = info->path + info->name_start;  
+        const char *bname = info->path + info->name_start;
         if (!strncmp(bname, "tmp", 3))
           ecore_file_unlink(info->path);
      }
@@ -1159,7 +1159,7 @@ ephoto_single_browser_entry_set(Evas_Object *obj, Ephoto_Entry *entry)
    sb->entry = entry;
 
    if (entry)
-     ephoto_entry_free_listener_add(entry, _entry_free, sb); 
+     ephoto_entry_free_listener_add(entry, _entry_free, sb);
 
    _ephoto_single_browser_recalc(sb);
 
diff --git a/src/bin/ephoto_slideshow.c b/src/bin/ephoto_slideshow.c
index 15ba3ca..36b1015 100644
--- a/src/bin/ephoto_slideshow.c
+++ b/src/bin/ephoto_slideshow.c
@@ -10,7 +10,7 @@ struct _Ephoto_Slideshow
 };
 
 static void
-_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *o EINA_UNUSED, void *event_info)
+_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info)
 {
    Ephoto_Slideshow *ss = data;
    Evas_Event_Key_Down *ev = event_info;
@@ -38,7 +38,7 @@ _key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *o EINA_UNUSED, void *eve
 }
 
 static void
-_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
+_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    Ephoto_Slideshow *ss = data;
    evas_object_smart_callback_call(ss->slideshow, "back", ss->entry);
diff --git a/src/bin/ephoto_thumb_browser.c b/src/bin/ephoto_thumb_browser.c
index d5c682a..f59f85c 100644
--- a/src/bin/ephoto_thumb_browser.c
+++ b/src/bin/ephoto_thumb_browser.c
@@ -244,7 +244,7 @@ _todo_items_process(void *data)
 }
 
 static void
-_ephoto_dir_selected(void *data, Evas_Object *o EINA_UNUSED, void *event_info)
+_ephoto_dir_selected(void *data, Evas_Object *obj EINA_UNUSED, void *event_info)
 {
    Ephoto_Thumb_Browser *tb = data;
    Elm_Object_Item *it = event_info;
@@ -255,7 +255,7 @@ _ephoto_dir_selected(void *data, Evas_Object *o EINA_UNUSED, void *event_info)
 }
 
 static void
-_ephoto_dir_go_home(void *data, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
+_ephoto_dir_go_home(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    Ephoto_Thumb_Browser *tb = data;
 
@@ -264,7 +264,7 @@ _ephoto_dir_go_home(void *data, Evas_Object *o EINA_UNUSED, void *event_info EIN
 }
 
 static void
-_ephoto_dir_go_up(void *data, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
+_ephoto_dir_go_up(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    Ephoto_Thumb_Browser *tb = data;
 
@@ -278,7 +278,7 @@ _ephoto_dir_go_up(void *data, Evas_Object *o EINA_UNUSED, void *event_info EINA_
 }
 
 static void
-_ephoto_thumb_selected(void *data, Evas_Object *o EINA_UNUSED, void *event_info)
+_ephoto_thumb_selected(void *data, Evas_Object *obj EINA_UNUSED, void *event_info)
 {
    Ephoto_Thumb_Browser *tb = data;
    Elm_Object_Item *it = event_info;
@@ -298,33 +298,33 @@ _zoom_set(Ephoto_Thumb_Browser *tb, int zoom)
    else if (zoom < ZOOM_MIN) zoom = ZOOM_MIN;
 
    ephoto_thumb_size_set(tb->ephoto, zoom);
-   elm_gengrid_item_size_set(tb->grid, zoom * scale, zoom * scale);
+   elm_gengrid_item_size_set(tb->grid, zoom*scale, zoom*scale);
 }
 
 static void
-_zoom_in(void *data, Evas_Object *o, void *event_info EINA_UNUSED)
+_zoom_in(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
 {
    Ephoto_Thumb_Browser *tb = data;
-   Evas_Object *min = evas_object_data_get(o, "min");
-   int zoom = tb->ephoto->config->thumb_size + ZOOM_STEP;
+   Evas_Object *min = evas_object_data_get(obj, "min");
+   int zoom = tb->ephoto->config->thumb_size+ZOOM_STEP;
    _zoom_set(tb, zoom);
-   if (zoom >= ZOOM_MAX) elm_object_disabled_set(o, EINA_TRUE);
+   if (zoom >= ZOOM_MAX) elm_object_disabled_set(obj, EINA_TRUE);
    if (zoom > ZOOM_MIN) elm_object_disabled_set(min, EINA_FALSE);
 }
 
 static void
-_zoom_out(void *data, Evas_Object *o, void *event_info EINA_UNUSED)
+_zoom_out(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
 {
    Ephoto_Thumb_Browser *tb = data;
-   Evas_Object *max = evas_object_data_get(o, "max");
-   int zoom = tb->ephoto->config->thumb_size - ZOOM_STEP;
+   Evas_Object *max = evas_object_data_get(obj, "max");
+   int zoom = tb->ephoto->config->thumb_size-ZOOM_STEP;
    _zoom_set(tb, zoom);
-   if (zoom <= ZOOM_MIN) elm_object_disabled_set(o, EINA_TRUE);
+   if (zoom <= ZOOM_MIN) elm_object_disabled_set(obj, EINA_TRUE);
    if (zoom < ZOOM_MAX) elm_object_disabled_set(max, EINA_FALSE);
 }
 
 static void
-_slideshow(void *data, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
+_slideshow(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    Ephoto_Thumb_Browser *tb = data;
    Elm_Object_Item *it = elm_gengrid_selected_item_get(tb->grid);
@@ -338,7 +338,7 @@ _slideshow(void *data, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
 }
 
 static void
-_settings(void *data, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
+_settings(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    Ephoto_Thumb_Browser *tb = data;
 
@@ -347,7 +347,7 @@ _settings(void *data, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
 }
 
 static void
-_about(void *data, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
+_about(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    Ephoto_Thumb_Browser *tb = data;
 
@@ -356,7 +356,7 @@ _about(void *data, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
 }
 
 static void
-_ephoto_dir_show_folders(void *data, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
+_ephoto_dir_show_folders(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    Ephoto_Thumb_Browser *tb = data;
 
@@ -372,7 +372,7 @@ _ephoto_dir_show_folders(void *data, Evas_Object *o EINA_UNUSED, void *event_inf
 }
 
 static void
-_ephoto_dir_hide_folders(void *data, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
+_ephoto_dir_hide_folders(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    Ephoto_Thumb_Browser *tb = data;
    Evas_Object *icon, *max, *min, *but, *ic;
@@ -382,7 +382,7 @@ _ephoto_dir_hide_folders(void *data, Evas_Object *o EINA_UNUSED, void *event_inf
 
    tb->bleftbox = elm_box_add(tb->main);
    evas_object_size_hint_weight_set(tb->bleftbox, 0.0, EVAS_HINT_EXPAND);
-   evas_object_size_hint_align_set(tb->bleftbox, EVAS_HINT_FILL, EVAS_HINT_FILL);  
+   evas_object_size_hint_align_set(tb->bleftbox, EVAS_HINT_FILL, EVAS_HINT_FILL);
    elm_box_pack_start(tb->main, tb->bleftbox);
    evas_object_show(tb->bleftbox);
 
@@ -424,7 +424,7 @@ _ephoto_dir_hide_folders(void *data, Evas_Object *o EINA_UNUSED, void *event_inf
 }
 
 static void
-_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *o EINA_UNUSED, void *event_info)
+_key_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info)
 {
    Ephoto_Thumb_Browser *tb = data;
    Evas_Event_Key_Down *ev = event_info;
@@ -501,9 +501,9 @@ _dnd_drag_data_build(Eina_List **items)
              e = elm_object_item_data_get(it);
              if (e->path)
                {
-                  strcat((char *) drag_data, FILESEP);
-                  strcat((char *) drag_data, e->path);
-                  strcat((char *) drag_data, "\n");
+                  strcat((char *)drag_data, FILESEP);
+                  strcat((char *)drag_data, e->path);
+                  strcat((char *)drag_data, "\n");
                }
           }
      }
@@ -523,8 +523,8 @@ _dnd_create_icon(void *data, Evas_Object *win, Evas_Coord *xoff, Evas_Coord *yof
         const char *g;
         elm_image_file_get(o, &f, &g);
         evas_pointer_canvas_xy_get(evas_object_evas_get(o), &xm, &ym);
-        if (xoff) *xoff = xm - (w/2);
-        if (yoff) *yoff = ym - (h/2);
+        if (xoff) *xoff = xm-(w/2);
+        if (yoff) *yoff = ym-(h/2);
         icon = elm_icon_add(win);
         elm_image_file_set(icon, f, g);
         evas_object_size_hint_align_set(icon, EVAS_HINT_FILL, EVAS_HINT_FILL);
@@ -585,7 +585,7 @@ _dnd_get_drag_data(Evas_Object *obj, Elm_Object_Item *it, Eina_List **items)
 
    *items = eina_list_clone(elm_gengrid_selected_items_get(obj));
    if (it)
-     {  
+     {
         void *p = eina_list_search_sorted(*items, _entry_cmp, it);
         if (!p)
           *items = eina_list_append(*items, it);
@@ -621,7 +621,7 @@ _dnd_item_data_get(Evas_Object *obj, Elm_Object_Item *it, Elm_Drag_User_Info *in
 }
 
 static void
-_main_del(void *data, Evas *e EINA_UNUSED, Evas_Object *o EINA_UNUSED, void *event_info EINA_UNUSED)
+_main_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
    Ephoto_Thumb_Browser *tb = data;
    Ecore_Event_Handler *handler;
@@ -721,7 +721,7 @@ _ephoto_thumb_populate_end(void *data, int type EINA_UNUSED, void *event EINA_UN
                     }
                }
           }
-        snprintf(image_info, PATH_MAX, "<b>Total:</b> %d images        <b>Size:</b> %s", 
+        snprintf(image_info, PATH_MAX, "<b>Total:</b> %d images        <b>Size:</b> %s",
                  tb->totimages, isize);
         elm_object_text_set(tb->infolabel, image_info);
      }
@@ -806,7 +806,7 @@ ephoto_thumb_browser_add(Ephoto *ephoto, Evas_Object *parent)
    elm_toolbar_shrink_mode_set(tb->bar, ELM_TOOLBAR_SHRINK_NONE);
    elm_toolbar_select_mode_set(tb->bar, ELM_OBJECT_SELECT_MODE_NONE);
    evas_object_size_hint_weight_set(tb->bar, EVAS_HINT_EXPAND, 0.0);
-   evas_object_size_hint_align_set(tb->bar, EVAS_HINT_FILL, EVAS_HINT_FILL);   
+   evas_object_size_hint_align_set(tb->bar, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
    icon = elm_toolbar_item_append(tb->bar, "zoom-in", "Zoom In", _zoom_in, tb);
    max = elm_object_item_widget_get(icon);