Fix API Inconsistency in regards to e_widget_min_size_* . Renamed to

e_widget_size_min_* . This Large commit should fix everything in svn that is
using those functions.



SVN revision: 42152

src/bin/e_color_dialog.c

@@ -40,7 +40,7 @@ e_color_dialog_new(E_Container *con, const E_Color *color)
 
    o = e_widget_csel_add(dia->dia->win->evas, dia->color);
    evas_object_show(o);
-   e_widget_min_size_get(o, &mw, &mh);
+   e_widget_size_min_get(o, &mw, &mh);
    e_dialog_content_set(dia->dia, o, 460, 260);
    e_widget_on_change_hook_set(o, _e_color_dialog_cb_csel_change, dia);
 

src/bin/e_config.c

@@ -11,7 +11,7 @@
 
 EAPI E_Config *e_config = NULL;
 
-static int _e_config_revisions = 9;
+static int _e_config_revisions = 0;
 
 /* local subsystem functions */
 static void _e_config_save_cb(void *data);

src/bin/e_config_dialog.c

@@ -197,7 +197,7 @@ _e_config_dialog_go(E_Config_Dialog *cfd, E_Config_Dialog_CFData_Type type)
 	     ob = cfd->view->basic.create_widgets(cfd, evas, cfd->cfdata);
 	     if (cfd->view->scroll)
 	       {
-		  e_widget_min_size_resize(ob);
+		  e_widget_size_min_resize(ob);
 		  sf = e_widget_scrollframe_simple_add(evas, ob);
 		  e_widget_list_object_append(o, sf, 1, 1, 0.0);
 	       }
@@ -213,7 +213,7 @@ _e_config_dialog_go(E_Config_Dialog *cfd, E_Config_Dialog_CFData_Type type)
 	     o = cfd->view->basic.create_widgets(cfd, evas, cfd->cfdata);
 	     if (cfd->view->scroll)
 	       {
-		  e_widget_min_size_resize(o);
+		  e_widget_size_min_resize(o);
 		  o = e_widget_scrollframe_simple_add(evas, o);
 	       }
 	  }
@@ -226,7 +226,7 @@ _e_config_dialog_go(E_Config_Dialog *cfd, E_Config_Dialog_CFData_Type type)
 	     ob = cfd->view->advanced.create_widgets(cfd, evas, cfd->cfdata);
 	     if (cfd->view->scroll)
 	       {
-		  e_widget_min_size_resize(ob);
+		  e_widget_size_min_resize(ob);
 		  sf = e_widget_scrollframe_simple_add(evas, ob);
 		  e_widget_list_object_append(o, sf, 1, 1, 0.0);
 	       }
@@ -242,13 +242,13 @@ _e_config_dialog_go(E_Config_Dialog *cfd, E_Config_Dialog_CFData_Type type)
 	     o = cfd->view->advanced.create_widgets(cfd, evas, cfd->cfdata);
 	     if (cfd->view->scroll)
 	       {
-		  e_widget_min_size_resize(o);
+		  e_widget_size_min_resize(o);
 		  o = e_widget_scrollframe_simple_add(evas, o);
 	       }
 	  }
      }
 
-   e_widget_min_size_get(o, &mw, &mh);
+   e_widget_size_min_get(o, &mw, &mh);
    e_widget_on_change_hook_set(o, _e_config_dialog_cb_changed, cfd);
    e_dialog_content_set(cfd->dia, o, mw, mh);
 

src/bin/e_dialog.c

@@ -234,7 +234,7 @@ e_dialog_show(E_Dialog *dia)
      }
 
    o = dia->box_object;
-   e_widget_min_size_get(o, &mw, &mh);
+   e_widget_size_min_get(o, &mw, &mh);
    edje_extern_object_min_size_set(o, mw, mh);
    edje_object_part_swallow(dia->bg_object, "e.swallow.buttons", o);
    

src/bin/e_eap_editor.c

@@ -463,7 +463,7 @@ _e_desktop_edit_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_
      e_widget_button_add(evas, "", NULL, _e_desktop_editor_cb_icon_select, 
 			 cfdata, editor);
    _e_desktop_editor_icon_update(cfdata);
-   e_widget_min_size_set(editor->img_widget, 48, 48);
+   e_widget_size_min_set(editor->img_widget, 48, 48);
    e_widget_frametable_object_append(o, editor->img_widget, 
 				     0, 0, 1, 1, 0, 0, 1, 1);
 
@@ -474,7 +474,7 @@ _e_desktop_edit_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_
 				     0, 0, 1, 1, 1, 1, 1, 1);
 
    entry = e_widget_entry_add(evas, &(cfdata->name), NULL, NULL, NULL);
-   e_widget_min_size_set(entry, 100, 1);
+   e_widget_size_min_set(entry, 100, 1);
    e_widget_frametable_object_append(o, entry, 1, 0, 1, 1, 1, 1, 1, 1);
    e_widget_frametable_object_append(o, e_widget_label_add(evas, _("Executable")),
 				     0, 1, 1, 1, 1, 1, 1, 1);
@@ -606,7 +606,7 @@ _e_desktop_editor_cb_icon_select(void *data1, void *data2)
    
    evas_object_show(o);
    editor->icon_fsel = o;
-   e_widget_min_size_get(o, &mw, &mh);
+   e_widget_size_min_get(o, &mw, &mh);
    e_dialog_content_set(dia, o, mw, mh);
 
    /* buttons at the bottom */
@@ -670,7 +670,7 @@ _e_desktop_editor_cb_exec_select(void *data1, void *data2)
    
    evas_object_show(o);
    editor->exec_fsel = o;
-   e_widget_min_size_get(o, &mw, &mh);
+   e_widget_size_min_get(o, &mw, &mh);
    e_dialog_content_set(dia, o, mw, mh);
 
    /* buttons at the bottom */

src/bin/e_entry_dialog.c

@@ -56,7 +56,7 @@ e_entry_dialog_show(const char *title, const char *icon, const char *text,
    ed->entry = e_widget_entry_add(dia->win->evas, &(ed->text), NULL, NULL, NULL);
    evas_object_smart_callback_add(ed->entry, "key_down", _e_entry_cb_key_down, ed);
    e_widget_list_object_append(o, ed->entry, 1, 1, 0.5);
-   e_widget_min_size_get(o, &w, &h);
+   e_widget_size_min_get(o, &w, &h);
    e_dialog_content_set(dia, o, w, h);
    
    e_dialog_button_add(dia, !button_text ? _("OK") : button_text, NULL, _e_entry_dialog_ok, ed);

src/bin/e_exec.c

@@ -598,7 +598,7 @@ _dialog_scrolltext_create(Evas *evas, char *title, Ecore_Exe_Event_Data_Line *li
 
 	e_widget_textblock_plain_set(obj, text);
      }
-   e_widget_min_size_set(obj, 240, 120);
+   e_widget_size_min_set(obj, 240, 120);
 
    e_widget_framelist_object_append(os, obj);
 

src/bin/e_fm.c

@@ -8560,7 +8560,7 @@ _e_fm2_view_image_sel(E_Fm2_Smart_Data *sd, const char *title,
    
    o = e_widget_fsel_add(dia->win->evas, "/", sd->realpath, NULL, NULL, NULL, sd, NULL, sd, 1);
    evas_object_show(o);
-   e_widget_min_size_get(o, &w, &h);
+   e_widget_size_min_get(o, &w, &h);
    e_dialog_content_set(dia, o, w, h);
    dia->data = o;
 

src/bin/e_fm_prop.c

@@ -337,28 +337,28 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
    ob = e_widget_label_add(evas, _("File:"));
    e_widget_table_object_append(ot, ob, 0, 0, 1, 1, 1, 0, 1, 0);
    ob = e_widget_entry_add(evas, &(cfdata->file), NULL, NULL, NULL);
-   e_widget_min_size_set(ob, 140, -1);
+   e_widget_size_min_set(ob, 140, -1);
    e_widget_entry_readonly_set(ob, 1);
    e_widget_table_object_append(ot, ob, 1, 0, 1, 1, 1, 0, 1, 0);
    
    ob = e_widget_label_add(evas, _("Size:"));
    e_widget_table_object_append(ot, ob, 0, 1, 1, 1, 1, 0, 1, 0);
    ob = e_widget_entry_add(evas, &(cfdata->size), NULL, NULL, NULL);
-   e_widget_min_size_set(ob, 140, -1);
+   e_widget_size_min_set(ob, 140, -1);
    e_widget_entry_readonly_set(ob, 1);
    e_widget_table_object_append(ot, ob, 1, 1, 1, 1, 1, 0, 1, 0);
 
    ob = e_widget_label_add(evas, _("Last Modified:"));
    e_widget_table_object_append(ot, ob, 0, 2, 1, 1, 1, 0, 1, 0);
    ob = e_widget_entry_add(evas, &(cfdata->mod_date), NULL, NULL, NULL);
-   e_widget_min_size_set(ob, 140, -1);
+   e_widget_size_min_set(ob, 140, -1);
    e_widget_entry_readonly_set(ob, 1);
    e_widget_table_object_append(ot, ob, 1, 2, 1, 1, 1, 0, 1, 0);
 
    ob = e_widget_label_add(evas, _("File Type:"));
    e_widget_table_object_append(ot, ob, 0, 3, 1, 1, 1, 0, 1, 0);
    ob = e_widget_entry_add(evas, &(cfdata->mime), NULL, NULL, NULL);
-   e_widget_min_size_set(ob, 140, -1);
+   e_widget_size_min_set(ob, 140, -1);
    e_widget_entry_readonly_set(ob, 1);
    e_widget_table_object_append(ot, ob, 1, 3, 1, 1, 1, 0, 1, 0);
 
@@ -366,7 +366,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
    ob = e_widget_label_add(evas, _("Owner:"));
    e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 1, 1, 1);
    ob = e_widget_entry_add(evas, &(cfdata->owner), NULL, NULL, NULL);
-   e_widget_min_size_set(ob, 60, -1);
+   e_widget_size_min_set(ob, 60, -1);
    e_widget_entry_readonly_set(ob, 1);
    e_widget_frametable_object_append(of, ob, 1, 0, 1, 1, 1, 1, 1, 1);
    ob = e_widget_check_add(evas, _("Others can read"), &(cfdata->others_read));
@@ -506,7 +506,7 @@ _cb_icon_sel(void *data, void *data2)
    
    cfdata->gui.fsel_wid = o;
    evas_object_show(o);
-   e_widget_min_size_get(o, &w, &h);
+   e_widget_size_min_get(o, &w, &h);
    e_dialog_content_set(dia, o, w, h);
    
    e_dialog_button_add(dia, _("OK"), NULL, _cb_fsel_ok, cfdata);

src/bin/e_gadcon_popup.c

@@ -148,7 +148,7 @@ _e_gadcon_popup_size_recalc(E_Gadcon_Popup *pop, Evas_Object *obj)
 {
    Evas_Coord w = 0, h = 0;
 
-   e_widget_min_size_get(obj, &w, &h);
+   e_widget_size_min_get(obj, &w, &h);
    if ((!w) || (!h)) evas_object_size_hint_min_get(obj, &w, &h);
    if ((!w) || (!h))
      {

src/bin/e_int_border_prop.c

@@ -373,7 +373,7 @@ _bd_go(void *data, void *data2)
    
    e_widget_list_object_append(c, ob, 0, 0, 1.0);
    
-   e_widget_min_size_get(c, &w, &h);
+   e_widget_size_min_get(c, &w, &h);
    e_dialog_content_set(dia, c, w, h);
    e_dialog_show(dia);
 }
@@ -387,8 +387,8 @@ _bd_go(void *data, void *data2)
       ob = e_widget_entry_add(evas, &(cfdata->val), NULL, NULL, NULL); \
       if (!cfdata->val) e_widget_disabled_set(ob, 1); \
       e_widget_entry_readonly_set(ob, 1); \
-      e_widget_min_size_get(ob, &mw, &mh); \
-      e_widget_min_size_set(ob, 160, mh); \
+      e_widget_size_min_get(ob, &mw, &mh); \
+      e_widget_size_min_set(ob, 160, mh); \
       e_widget_frametable_object_append(of, ob, x + 1, y, 1, 1,    1, 1, 1, 1); \
    }
 #define CHK_ENTRY(label, x, y, val) \

src/bin/e_int_config_modules.c

@@ -206,7 +206,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
    e_widget_table_object_append(o, of, 1, 0, 1, 1, 1, 1, 1, 1);
 
    ol = e_widget_textblock_add(evas);
-   e_widget_min_size_set(ol, 200, 70);
+   e_widget_size_min_set(ol, 200, 70);
    cfdata->o_desc = ol;
    e_widget_textblock_markup_set(ol, _("Description: Unavailable"));
    e_widget_table_object_append(o, ol, 0, 1, 2, 1, 1, 0, 1, 0);
@@ -338,8 +338,8 @@ _fill_list(Evas_Object *obj, int enabled)
      }
 
    e_widget_ilist_go(obj);
-   e_widget_min_size_get(obj, &w, NULL);
-   e_widget_min_size_set(obj, w > 180 ? w : 180, 200);
+   e_widget_size_min_get(obj, &w, NULL);
+   e_widget_size_min_set(obj, w > 180 ? w : 180, 200);
    e_widget_ilist_thaw(obj);
    edje_thaw();
    evas_event_thaw(evas);

src/bin/e_int_gadcon_config.c

@@ -144,7 +144,7 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
    e_widget_table_object_append(o, of, 1, 0, 1, 1, 1, 1, 1, 1);
 
    ow = e_widget_textblock_add(evas);
-   e_widget_min_size_set(ow, 200, 70);
+   e_widget_size_min_set(ow, 200, 70);
    e_widget_textblock_markup_set(ow, _("Description: Unavailable"));
    cfdata->o_desc = ow;
    e_widget_table_object_append(o, ow, 0, 1, 2, 1, 1, 1, 1, 0);
@@ -244,9 +244,9 @@ _load_avail_gadgets(void *data)
                               (void *)cc->name, NULL);
      }
    e_widget_ilist_go(cfdata->o_avail);
-   e_widget_min_size_get(cfdata->o_avail, &w, NULL);
+   e_widget_size_min_get(cfdata->o_avail, &w, NULL);
    if (w < 200) w = 200;
-   e_widget_min_size_set(cfdata->o_avail, w, 250);
+   e_widget_size_min_set(cfdata->o_avail, w, 250);
    e_widget_ilist_thaw(cfdata->o_avail);
    edje_thaw();
    evas_event_thaw(evas);
@@ -289,9 +289,9 @@ _load_sel_gadgets(void *data)
           }
      }
    e_widget_ilist_go(cfdata->o_sel);
-   e_widget_min_size_get(cfdata->o_sel, &w, NULL);
+   e_widget_size_min_get(cfdata->o_sel, &w, NULL);
    if (w < 200) w = 200;
-   e_widget_min_size_set(cfdata->o_sel, w, 250);
+   e_widget_size_min_set(cfdata->o_sel, w, 250);
    e_widget_ilist_thaw(cfdata->o_sel);
    edje_thaw();
    evas_event_thaw(evas);

src/bin/e_int_shelf_config.c

@@ -664,8 +664,8 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
 	if (!strcmp(cfdata->es->style, style)) sel = n;
 	n++;
      }
-   e_widget_min_size_get(oi, &wmw, &wmh);
-   e_widget_min_size_set(oi, wmw, 160);
+   e_widget_size_min_get(oi, &wmw, &wmh);
+   e_widget_size_min_set(oi, wmw, 160);
    
    e_widget_ilist_go(oi);
    e_widget_ilist_selected_set(oi, sel);
@@ -730,8 +730,8 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
    cfdata->desk_sel_list = ob;
    e_widget_ilist_multi_select_set(ob, 1);
    _desk_sel_list_load(cfdata);
-   e_widget_min_size_get(ob, &wmw, &wmh);
-   e_widget_min_size_set(ob, wmw, 64);
+   e_widget_size_min_get(ob, &wmw, &wmh);
+   e_widget_size_min_set(ob, wmw, 64);
    e_widget_framelist_object_append(of, ob);
 
    e_widget_list_object_append(o2, of, 1, 1, 0.5);

src/bin/e_ipc_codec.c

@@ -42,13 +42,13 @@ _e_ipc_codec_eina_hash_add(void *hash, const void *key, void *data)
 
 #define E_IPC_DD_NEW(str, typ) \
    eet_data_descriptor_new(str, sizeof(typ), \
-			      (void *(*) (void *))eina_list_next, \
-			      (void *(*) (void *, void *))eina_list_append, \
-			      (void *(*) (void *))eina_list_data_get, \
-			      (void *(*) (void *))eina_list_free, \
+                              (void *(*) (void *))eina_list_next, \
+                              (void *(*) (void *, void *))eina_list_append, \
+                              (void *(*) (void *))eina_list_data_get, \
+                              (void *(*) (void *))eina_list_free, \
                               (void  (*) (void *, int (*) (void *, const char *, void *, void *), void *))eina_hash_foreach, \
-			      (void *(*) (void *, const char *, void *))_e_ipc_codec_eina_hash_add, \
-			      (void  (*) (void *))eina_hash_free)
+                              (void *(*) (void *, const char *, void *))_e_ipc_codec_eina_hash_add, \
+                              (void  (*) (void *))eina_hash_free)
 
 /* externally accessible functions */
 EAPI int

src/bin/e_test.c

@@ -548,7 +548,7 @@ _e_test_internal(E_Container *con)
    of = e_widget_scrollframe_pan_add(dia->win->evas, ofm,
 				     e_fm2_pan_set, e_fm2_pan_get,
 				     e_fm2_pan_max_get, e_fm2_pan_child_size_get);
-   e_widget_min_size_set(of, 128, 128);
+   e_widget_size_min_set(of, 128, 128);
    e_widget_table_object_append(ot, of, 1, 1, 1, 1, 1, 1, 1, 1);
    evas_object_show(ofm);
    evas_object_show(of);
@@ -583,14 +583,14 @@ _e_test_internal(E_Container *con)
    of = e_widget_scrollframe_pan_add(dia->win->evas, ofm,
 				     e_fm2_pan_set, e_fm2_pan_get,
 				     e_fm2_pan_max_get, e_fm2_pan_child_size_get);
-   e_widget_min_size_set(of, 128, 128);
+   e_widget_size_min_set(of, 128, 128);
    e_widget_table_object_append(ot, of, 0, 1, 1, 1, 0, 1, 0, 1);
    evas_object_show(ofm);
    evas_object_show(of);
    
    /* show and pack table */
    evas_object_show(ot);
-   e_widget_min_size_get(ot, &mw, &mh);
+   e_widget_size_min_get(ot, &mw, &mh);
    e_dialog_content_set(dia, ot, mw, mh);
    
    /* buttons at the bottom */
@@ -629,7 +629,7 @@ _e_test_internal(E_Container *con)
 			 _e_test_cb_selected, dia,
 			 _e_test_cb_changed, dia, 0);
    evas_object_show(o);
-   e_widget_min_size_get(o, &mw, &mh);
+   e_widget_size_min_get(o, &mw, &mh);
    e_dialog_content_set(dia, o, mw, mh);
    
    /* buttons at the bottom */
@@ -715,7 +715,7 @@ _e_test_internal(E_Container *con)
 
    e_scrollframe_child_set(of, ob);
    evas_object_show(ob);
-//   e_widget_min_size_get(o, &mw, &mh);
+//   e_widget_size_min_get(o, &mw, &mh);
    mw = 300; mh = 300;
    e_dialog_content_set(dia, of, mw, mh);
    evas_object_show(of);
@@ -782,7 +782,7 @@ _e_test_timer(void *data)
    e_widget_toolbar_item_select(o, 1);
    
    /* fixme... more */
-   e_widget_min_size_get(o, &mw, &mh);
+   e_widget_size_min_get(o, &mw, &mh);
    e_dialog_content_set(dia, o, mw, mh);
    evas_object_show(o);
    
@@ -849,7 +849,7 @@ _e_test_timer(void *data)
    e_widget_toolbar_item_select(o, 1);
    
    /* fixme... more */
-   e_widget_min_size_get(o, &mw, &mh);
+   e_widget_size_min_get(o, &mw, &mh);
    e_dialog_content_set(dia, o, mw, mh);
    evas_object_show(o);
    

src/bin/e_widget.c

@@ -10,24 +10,23 @@ typedef struct _E_Smart_Data E_Smart_Data;
 
 struct _E_Smart_Data
 { 
-   Evas_Object   *parent_obj;
-   Evas_Coord     x, y, w, h;
-   Evas_Coord     minw, minh;
-   Eina_List     *subobjs;
-   Evas_Object   *resize_obj;
-   void         (*del_func) (Evas_Object *obj);
-   void         (*focus_func) (Evas_Object *obj);
-   void         (*activate_func) (Evas_Object *obj);
-   void         (*disable_func) (Evas_Object *obj);
-   void         (*on_focus_func) (void *data, Evas_Object *obj);
-   void          *on_focus_data;
-   void         (*on_change_func) (void *data, Evas_Object *obj);
-   void          *on_change_data;
-   void          *data;
-   unsigned char  can_focus : 1;
-   unsigned char  child_can_focus : 1;
-   unsigned char  focused : 1;
-   unsigned char  disabled : 1;
+   Evas_Object *parent_obj;
+   Evas_Coord x, y, w, h, minw, minh;
+   Eina_List *subobjs;
+   Evas_Object *resize_obj;
+   void (*del_func) (Evas_Object *obj);
+   void (*focus_func) (Evas_Object *obj);
+   void (*activate_func) (Evas_Object *obj);
+   void (*disable_func) (Evas_Object *obj);
+   void (*on_focus_func) (void *data, Evas_Object *obj);
+   void *on_focus_data;
+   void (*on_change_func) (void *data, Evas_Object *obj);
+   void *on_change_data;
+   void *data;
+   unsigned char can_focus : 1;
+   unsigned char child_can_focus : 1;
+   unsigned char focused : 1;
+   unsigned char disabled : 1;
 };
 
 /* local subsystem functions */
@@ -113,7 +112,7 @@ e_widget_data_get(Evas_Object *obj)
 }
 
 EAPI void
-e_widget_min_size_set(Evas_Object *obj, Evas_Coord minw, Evas_Coord minh)
+e_widget_size_min_set(Evas_Object *obj, Evas_Coord minw, Evas_Coord minh)
 {
    API_ENTRY return;
    if (minw >= 0) sd->minw = minw;
@@ -121,7 +120,7 @@ e_widget_min_size_set(Evas_Object *obj, Evas_Coord minw, Evas_Coord minh)
 }
 
 EAPI void
-e_widget_min_size_get(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh)
+e_widget_size_min_get(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh)
 {
    API_ENTRY return;
    if (minw) *minw = sd->minw;
@@ -463,7 +462,7 @@ e_widget_pointer_get(Evas_Object *obj)
 }
 
 EAPI void
-e_widget_min_size_resize(Evas_Object *obj)
+e_widget_size_min_resize(Evas_Object *obj)
 {
    API_ENTRY return;
    evas_object_resize(obj, sd->minw, sd->minh);

src/bin/e_widget.h

@@ -15,8 +15,8 @@ EAPI void e_widget_on_focus_hook_set(Evas_Object *obj, void (*func) (void *data,
 EAPI void e_widget_on_change_hook_set(Evas_Object *obj, void (*func) (void *data, Evas_Object *obj), void *data);
 EAPI void e_widget_data_set(Evas_Object *obj, void *data);
 EAPI void *e_widget_data_get(Evas_Object *obj);
-EAPI void e_widget_min_size_set(Evas_Object *obj, Evas_Coord minw, Evas_Coord minh);
-EAPI void e_widget_min_size_get(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh);
+EAPI void e_widget_size_min_set(Evas_Object *obj, Evas_Coord minw, Evas_Coord minh);
+EAPI void e_widget_size_min_get(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh);
 EAPI void e_widget_sub_object_add(Evas_Object *obj, Evas_Object *sobj);
 EAPI void e_widget_sub_object_del(Evas_Object *obj, Evas_Object *sobj);  
 EAPI void e_widget_resize_object_set(Evas_Object *obj, Evas_Object *sobj);
@@ -34,7 +34,7 @@ EAPI void e_widget_change(Evas_Object *obj);
 EAPI void e_widget_disabled_set(Evas_Object *obj, int disabled);
 EAPI int  e_widget_disabled_get(Evas_Object *obj);
 EAPI E_Pointer *e_widget_pointer_get(Evas_Object *obj);
-EAPI void e_widget_min_size_resize(Evas_Object *obj);
+EAPI void e_widget_size_min_resize(Evas_Object *obj);
 
 #endif
 #endif

src/bin/e_widget_aspect.c

@@ -125,8 +125,8 @@ e_widget_aspect_child_set(Evas_Object *obj, Evas_Object *child)
    if (!wd) return;
 
    wd->child = child;
-   e_widget_min_size_get(child, &mw, &mh);
-   e_widget_min_size_set(obj, mw, mh);
+   e_widget_size_min_get(child, &mw, &mh);
+   e_widget_size_min_set(obj, mw, mh);
    e_widget_sub_object_add(obj, child);
    _e_wid_reconfigure(wd);
 }

src/bin/e_widget_button.c

@@ -81,7 +81,7 @@ e_widget_button_add(Evas *evas, const char *label, const char *icon, void (*func
 
    _e_wid_button_state_send(wd);
    edje_object_size_min_calc(wd->o_button, &mw, &mh);
-   e_widget_min_size_set(obj, mw, mh);
+   e_widget_size_min_set(obj, mw, mh);
 
    return obj;
 }

src/bin/e_widget_check.c

@@ -47,7 +47,7 @@ e_widget_check_add(Evas *evas, const char *label, int *val)
    edje_object_part_text_set(o, "e.text.label", label);
    evas_object_show(o);
    edje_object_size_min_calc(o, &mw, &mh);
-   e_widget_min_size_set(obj, mw, mh);
+   e_widget_size_min_set(obj, mw, mh);
    if (wd->valptr)
      {
 	if (*(wd->valptr)) edje_object_signal_emit(o, "e,state,checked", "e");
@@ -138,7 +138,7 @@ e_widget_check_icon_add(Evas *evas, const char *label, const char *icon, int ico
      }
    
    edje_object_size_min_calc(o, &mw, &mh);
-   e_widget_min_size_set(obj, mw, mh);
+   e_widget_size_min_set(obj, mw, mh);
    if (wd->valptr)
      {
 	if (*(wd->valptr)) edje_object_signal_emit(o, "e,state,checked", "e");

src/bin/e_widget_color_well.c

@@ -152,7 +152,7 @@ e_widget_color_well_add(Evas *evas, E_Color *color, int show_color_dialog)
    evas_object_show(o); 
    wd->o_edje = o;
 
-   e_widget_min_size_set(obj, 50, 50);
+   e_widget_size_min_set(obj, 50, 50);
 
    o = evas_object_rectangle_add(evas);
    e_widget_sub_object_add(obj, o);

src/bin/e_widget_config_list.c

@@ -57,7 +57,7 @@ e_widget_config_list_add(Evas *evas, Evas_Object* (*func_entry_add) (Evas *evas,
    o = func_entry_add(evas, &(wd->cur_entry), NULL, NULL, NULL);
    wd->gui.entry = o;
    e_widget_disabled_set(o, 1);
-   e_widget_min_size_set(o, 100, 25);
+   e_widget_size_min_set(o, 100, 25);
    e_widget_table_object_append(wd->gui.table, o, 0, 2, 2, 1, 1, 0, 1, 0);
 
    o = e_widget_button_add(evas, _("Add"), "list-add", _button_cb_add,
@@ -75,7 +75,7 @@ e_widget_config_list_add(Evas *evas, Evas_Object* (*func_entry_add) (Evas *evas,
    o = e_widget_ilist_add(evas, 0, 0, NULL);
    wd->gui.list = o;
    e_widget_disabled_set(o, 1);
-   e_widget_min_size_set(o, 80, 40);
+   e_widget_size_min_set(o, 80, 40);
    e_widget_on_change_hook_set(o, _list_cb_change, wd);
    e_widget_ilist_go(o);
    e_widget_table_object_append(wd->gui.table, o, 0, 4, 2, 1, 1, 1, 1, 1);
@@ -92,8 +92,8 @@ e_widget_config_list_add(Evas *evas, Evas_Object* (*func_entry_add) (Evas *evas,
    e_widget_disabled_set(o, 1);
    e_widget_table_object_append(wd->gui.table, o, 1, 5, 1, 1, 1, 0, 1, 0);
 
-   e_widget_min_size_get(wd->gui.table, &mw, &mh);
-   e_widget_min_size_set(obj, mw, mh);
+   e_widget_size_min_get(wd->gui.table, &mw, &mh);
+   e_widget_size_min_set(obj, mw, mh);
    e_widget_resize_object_set(obj, wd->gui.table);
 
    return obj;
@@ -150,8 +150,8 @@ e_widget_config_list_object_append(Evas_Object *obj, Evas_Object *sobj, int col,
    e_widget_table_object_append(wd->gui.table, sobj, col, row, 
 				colspan, rowspan, fill_w, fill_h, 
 				expand_w, expand_h);
-   e_widget_min_size_get(wd->gui.table, &mw, &mh);
-   e_widget_min_size_set(obj, mw, mh);
+   e_widget_size_min_get(wd->gui.table, &mw, &mh);
+   e_widget_size_min_set(obj, mw, mh);
 }
 
 /* Private Function defs */

src/bin/e_widget_csel.c

@@ -266,7 +266,7 @@ e_widget_csel_add(Evas *evas, E_Color *color)
    o = e_widget_cslider_add(evas, wd->mode, wd->cv, 1, 1);
    e_widget_sub_object_add(obj, o);
    e_widget_on_change_hook_set(o, _e_wid_cb_color_changed, wd);
-   e_widget_min_size_set(o, 30, 50);
+   e_widget_size_min_set(o, 30, 50);
    evas_object_show(o);
    wd->vert = o;
    e_widget_table_object_append(table, o, 2, 1, 1, 1, 0, 1, 0, 1);

src/bin/e_widget_cslider.c

@@ -67,7 +67,7 @@ e_widget_cslider_add(Evas *evas, E_Color_Component mode, E_Color *color, int ver
      edje_object_signal_emit(o, "e,state,direction,h", "e");
    evas_object_show(o);
    edje_object_size_min_calc(o, &mw, &mh);
-   e_widget_min_size_set(obj, mw, mh);
+   e_widget_size_min_set(obj, mw, mh);
 
    e_widget_sub_object_add(obj, o);
    evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, _e_wid_focus_steal, obj);

src/bin/e_widget_desk_preview.c

@@ -171,7 +171,7 @@ _e_wid_reconfigure(E_Widget_Data *wd)
 	E_Widget_Desk_Data *dd = e_widget_data_get(dw);
 	if (dd->x < nx && dd->y < ny)
 	  {
-	     e_widget_min_size_set(dw, mw, mh);
+	     e_widget_size_min_set(dw, mw, mh);
 	     e_widget_table_object_repack(wd->table, dw, dd->x, dd->y, 1, 1, 1, 1, 1, 1);
 	     e_thumb_icon_size_set(dd->thumb, tw, th);
 	     e_thumb_icon_rethumb(dd->thumb); 
@@ -198,7 +198,7 @@ _e_wid_reconfigure(E_Widget_Data *wd)
 	     Evas_Object *dw;
 
 	     dw = e_widget_deskpreview_desk_add(evas_object_evas_get(wd->obj), zone, x, y, tw, th);
-	     e_widget_min_size_set(dw, mw, mh);
+	     e_widget_size_min_set(dw, mw, mh);
 
 	     e_widget_table_object_append(wd->table, dw, x, y, 1, 1, 1, 1, 1, 1);
 	     wd->desks = eina_list_append(wd->desks, dw);

src/bin/e_widget_entry.c

@@ -64,7 +64,7 @@ EAPI Evas_Object
      e_entry_text_set(o, *text_location);
    
    e_entry_min_size_get(o, &minw, &minh);
-   e_widget_min_size_set(obj, minw, minh);
+   e_widget_size_min_set(obj, minw, minh);
 
    wd->func = func;
    wd->data = data;

src/bin/e_widget_flist.c

@@ -80,7 +80,7 @@ e_widget_flist_add(Evas *evas)
                                   _e_wid_cb_selected, obj);
 
    evas_object_resize(obj, 32, 32);
-   e_widget_min_size_set(obj, 32, 32);
+   e_widget_size_min_set(obj, 32, 32);
    return obj;
 }
 

src/bin/e_widget_font_preview.c

@@ -50,7 +50,7 @@ e_widget_font_preview_add(Evas *evas, const char *text)
    edje_object_part_text_set(wd->o_text, "e.fontpreview.text", text);
 
    evas_object_resize(obj, 40, 40);  
-   e_widget_min_size_set(obj, 40, 40);
+   e_widget_size_min_set(obj, 40, 40);
    
    return obj;
 }

src/bin/e_widget_framelist.c

@@ -47,7 +47,7 @@ e_widget_framelist_add(Evas *evas, const char *label, int horiz)
    evas_object_show(o);
    
    edje_object_size_min_calc(wd->o_frame, &mw, &mh);
-   e_widget_min_size_set(obj, mw, mh);
+   e_widget_size_min_set(obj, mw, mh);
    
    return obj;
 }
@@ -61,7 +61,7 @@ e_widget_framelist_object_append(Evas_Object *obj, Evas_Object *sobj)
    wd = e_widget_data_get(obj);
    
    e_box_pack_end(wd->o_box, sobj);
-   e_widget_min_size_get(sobj, &mw, &mh);
+   e_widget_size_min_get(sobj, &mw, &mh);
    e_box_pack_options_set(sobj,
 			  1, 1, /* fill */
 			  1, 1, /* expand */
@@ -73,7 +73,7 @@ e_widget_framelist_object_append(Evas_Object *obj, Evas_Object *sobj)
    edje_extern_object_min_size_set(wd->o_box, mw, mh);
    edje_object_part_swallow(wd->o_frame, "e.swallow.content", wd->o_box);
    edje_object_size_min_calc(wd->o_frame, &mw, &mh);
-   e_widget_min_size_set(obj, mw, mh);
+   e_widget_size_min_set(obj, mw, mh);
    e_widget_sub_object_add(obj, sobj);
    evas_object_show(sobj);
 }

src/bin/e_widget_frametable.c

@@ -46,7 +46,7 @@ e_widget_frametable_add(Evas *evas, const char *label, int homogenous)
    evas_object_show(o);
    
    edje_object_size_min_calc(wd->o_frame, &mw, &mh);
-   e_widget_min_size_set(obj, mw, mh);
+   e_widget_size_min_set(obj, mw, mh);
    
    return obj;
 }
@@ -60,7 +60,7 @@ e_widget_frametable_object_append(Evas_Object *obj, Evas_Object *sobj, int col,
    wd = e_widget_data_get(obj);
    
    e_table_pack(wd->o_table, sobj, col, row, colspan, rowspan);
-   e_widget_min_size_get(sobj, &mw, &mh);
+   e_widget_size_min_get(sobj, &mw, &mh);
    e_table_pack_options_set(sobj,
 			  fill_w, fill_h, /* fill */
 			  expand_w, expand_h, /* expand */
@@ -72,7 +72,7 @@ e_widget_frametable_object_append(Evas_Object *obj, Evas_Object *sobj, int col,
    edje_extern_object_min_size_set(wd->o_table, mw, mh);
    edje_object_part_swallow(wd->o_frame, "e.swallow.content", wd->o_table);
    edje_object_size_min_calc(wd->o_frame, &mw, &mh);
-   e_widget_min_size_set(obj, mw, mh);
+   e_widget_size_min_set(obj, mw, mh);
    e_widget_sub_object_add(obj, sobj);
    evas_object_show(sobj);
 }

src/bin/e_widget_fsel.c

@@ -335,7 +335,7 @@ e_widget_fsel_add(Evas *evas, const char *dev, const char *path, char *selected,
 	e_widget_entry_readonly_set(o, 1);
         wd->o_preview_size_entry = o;
         e_widget_sub_object_add(obj, o);
-        e_widget_min_size_set(o, 100, -1);
+        e_widget_size_min_set(o, 100, -1);
         e_widget_table_object_append(wd->o_preview_table,
 				     wd->o_preview_size_entry,
 				     1, 0, 1, 1, 1, 1, 1, 1);
@@ -351,7 +351,7 @@ e_widget_fsel_add(Evas *evas, const char *dev, const char *path, char *selected,
 	e_widget_entry_readonly_set(o, 1);
         wd->o_preview_owner_entry = o;
         e_widget_sub_object_add(obj, o);
-        e_widget_min_size_set(o, 100, -1);
+        e_widget_size_min_set(o, 100, -1);
         e_widget_table_object_append(wd->o_preview_table,
 				     wd->o_preview_owner_entry, 
 				     1, 1, 1, 1, 1, 1, 1, 1);
@@ -367,7 +367,7 @@ e_widget_fsel_add(Evas *evas, const char *dev, const char *path, char *selected,
 	e_widget_entry_readonly_set(o, 1);
         wd->o_preview_perms_entry = o;
         e_widget_sub_object_add(obj, o);
-        e_widget_min_size_set(o, 100, -1);
+        e_widget_size_min_set(o, 100, -1);
         e_widget_table_object_append(wd->o_preview_table,
 				     wd->o_preview_perms_entry,
 				     1, 2, 1, 1, 1, 1, 1, 1);
@@ -383,7 +383,7 @@ e_widget_fsel_add(Evas *evas, const char *dev, const char *path, char *selected,
 	e_widget_entry_readonly_set(o, 1);
         wd->o_preview_time_entry = o;
         e_widget_sub_object_add(obj, o); 
-        e_widget_min_size_set(o, 100, -1);
+        e_widget_size_min_set(o, 100, -1);
         e_widget_table_object_append(wd->o_preview_table,
 				     wd->o_preview_time_entry,
 				     1, 3, 1, 1, 1, 1, 1, 1);
@@ -428,7 +428,7 @@ e_widget_fsel_add(Evas *evas, const char *dev, const char *path, char *selected,
    
    wd->o_favorites_frame = o;
    e_widget_sub_object_add(obj, o);
-   e_widget_min_size_set(o, 128, 128);
+   e_widget_size_min_set(o, 128, 128);
    e_widget_table_object_append(wd->o_table2, o, 0, 1, 1, 1, 1, 1, 0, 1);
 
    o = e_fm2_add(evas);
@@ -470,7 +470,7 @@ e_widget_fsel_add(Evas *evas, const char *dev, const char *path, char *selected,
    
    wd->o_files_frame = o;
    e_widget_sub_object_add(obj, o);
-   e_widget_min_size_set(o, 128, 128);
+   e_widget_size_min_set(o, 128, 128);
    e_widget_table_object_append(wd->o_table2, o, 1, 1, 1, 1, 1, 1, 1, 1);
 
    o = e_widget_entry_add(evas, &(wd->entry_text), NULL, NULL, NULL);
@@ -495,8 +495,8 @@ e_widget_fsel_add(Evas *evas, const char *dev, const char *path, char *selected,
    e_widget_table_object_append(wd->o_table, wd->o_entry,
                                 0, 1, 1, 1, 1, 0, 1, 0);
 
-   e_widget_min_size_get(wd->o_table, &mw, &mh);
-   e_widget_min_size_set(obj, mw, mh);
+   e_widget_size_min_get(wd->o_table, &mw, &mh);
+   e_widget_size_min_set(obj, mw, mh);
   
    evas_object_show(wd->o_favorites_add); 
    evas_object_show(wd->o_up_button);

src/bin/e_widget_ilist.c

@@ -286,7 +286,7 @@ e_widget_ilist_add(Evas *evas, int icon_w, int icon_h, const char **value)
    evas_object_smart_callback_add(o, "selected", _e_wid_cb_selected, obj);
 
    evas_object_resize(obj, 32, 32);
-   e_widget_min_size_set(obj, 32, 32);
+   e_widget_size_min_set(obj, 32, 32);
    return obj;
 }
 
@@ -457,8 +457,8 @@ e_widget_ilist_go(Evas_Object *obj)
      {
 	Evas_Coord wmw, wmh;
 
-	e_widget_min_size_get(obj, &wmw, &wmh);
-	e_widget_min_size_set(obj, mw + (w - vw), wmh);
+	e_widget_size_min_get(obj, &wmw, &wmh);
+	e_widget_size_min_set(obj, mw + (w - vw), wmh);
      }
    else if (mw < vw)
      evas_object_resize(wd->o_ilist, vw,mh);

src/bin/e_widget_image.c

@@ -37,9 +37,9 @@ e_widget_image_add_from_object(Evas *evas, Evas_Object *object, int minw, int mi
    wd->minh = minh <= 0 ? minh : 0;
    edje_object_size_min_get(object, &mw, &mh);
    if (minw || minh)
-     e_widget_min_size_set(obj, minw, minh);
+     e_widget_size_min_set(obj, minw, minh);
    else
-     e_widget_min_size_set(obj, mw, mh);
+     e_widget_size_min_set(obj, mw, mh);
    e_widget_sub_object_add(obj, o);
    e_widget_resize_object_set(obj, o);
       
@@ -65,7 +65,7 @@ e_widget_image_add_from_file(Evas *evas, const char *file, int minw, int minh)
    evas_object_show(o);
    e_widget_data_set(obj, wd);   
    e_widget_can_focus_set(obj, 0);
-   e_widget_min_size_set(obj, minw, minh);
+   e_widget_size_min_set(obj, minw, minh);
    e_widget_sub_object_add(obj, o);
    e_widget_resize_object_set(obj, o);
    
@@ -112,9 +112,9 @@ e_widget_image_object_set(Evas_Object *obj, Evas_Object *o)
    e_icon_object_set(wd->img, o);
    edje_object_size_min_get(o, &mw, &mh);
    if (wd->minw || wd->minh)
-     e_widget_min_size_set(obj, wd->minw, wd->minh);
+     e_widget_size_min_set(obj, wd->minw, wd->minh);
    else
-     e_widget_min_size_set(obj, mw, mh);
+     e_widget_size_min_set(obj, mw, mh);
    evas_object_show(wd->img);
 }
 

src/bin/e_widget_label.c

@@ -35,7 +35,7 @@ e_widget_label_add(Evas *evas, const char *label)
    evas_object_show(o);
    edje_object_size_min_calc(o, &mw, &mh);
    e_widget_can_focus_set(obj, 0);
-   e_widget_min_size_set(obj, mw, mh);
+   e_widget_size_min_set(obj, mw, mh);
    e_widget_sub_object_add(obj, o);
    e_widget_resize_object_set(obj, o);
       

src/bin/e_widget_list.c

@@ -47,7 +47,7 @@ e_widget_list_object_append(Evas_Object *obj, Evas_Object *sobj, int fill, int e
    
    e_box_pack_end(wd->o_box, sobj);
    mw = mh = 0;
-   e_widget_min_size_get(sobj, &mw, &mh);
+   e_widget_size_min_get(sobj, &mw, &mh);
    if (e_box_orientation_get(wd->o_box) == 1)
      e_box_pack_options_set(sobj,
 			    1, fill, /* fill */
@@ -65,7 +65,7 @@ e_widget_list_object_append(Evas_Object *obj, Evas_Object *sobj, int fill, int e
 			    99999, 99999 /* max */
 			    );
    e_box_min_size_get(wd->o_box, &mw, &mh);
-   e_widget_min_size_set(obj, mw, mh);
+   e_widget_size_min_set(obj, mw, mh);
    e_widget_sub_object_add(obj, sobj);
    evas_object_show(sobj);
 }

src/bin/e_widget_preview.c

@@ -47,7 +47,7 @@ e_widget_preview_add(Evas *evas, int minw, int minh)
    e_widget_data_set(obj, wd);   
    e_widget_can_focus_set(obj, 0);
    edje_object_size_min_calc(wd->o_frame, &mw, &mh);
-   e_widget_min_size_set(obj, mw, mh);
+   e_widget_size_min_set(obj, mw, mh);
    e_widget_sub_object_add(obj, o);
 
    return obj;
@@ -137,7 +137,7 @@ _e_wid_preview_thumb_gen(void *data, Evas_Object *obj, void *event_info)
    /* edje_extern_object_max_size_set(wd->img, w, h); */
    edje_object_part_swallow(wd->o_frame, "e.swallow.content", wd->img);
    edje_object_size_min_calc(wd->o_frame, &w, &h);
-   e_widget_min_size_set(wd->obj, w, h);
+   e_widget_size_min_set(wd->obj, w, h);
    evas_object_resize(wd->obj, w, h);
    evas_object_smart_callback_call(wd->obj, "preview_update", NULL);
 }

src/bin/e_widget_radio.c

@@ -64,7 +64,7 @@ e_widget_radio_add(Evas *evas, const char *label, int valnum, E_Radio_Group *gro
    edje_object_part_text_set(o, "e.text.label", label);
    evas_object_show(o);
    edje_object_size_min_calc(o, &mw, &mh);
-   e_widget_min_size_set(obj, mw, mh);
+   e_widget_size_min_set(obj, mw, mh);
    if ((wd->group) && (wd->group->valptr))
      {
 	if (*(wd->group->valptr) == valnum) edje_object_signal_emit(o, "e,state,on", "e");
@@ -125,7 +125,7 @@ e_widget_radio_icon_add(Evas *evas, const char *label, const char *icon, int ico
      }
   
    edje_object_size_min_calc(o, &mw, &mh);
-   e_widget_min_size_set(obj, mw, mh);
+   e_widget_size_min_set(obj, mw, mh);
    if ((wd->group) && (wd->group->valptr))
      {
 	if (*(wd->group->valptr) == valnum) edje_object_signal_emit(o, "e,state,on", "e");

src/bin/e_widget_scrollframe.c

@@ -165,7 +165,7 @@ _e_wid_cb_scrollframe_resize(void *data, Evas *e, Evas_Object *obj, void *event_
    Evas_Coord mw, mh, vw, vh, w, h;    
 
    e_scrollframe_child_viewport_size_get(obj, &vw, &vh);
-   e_widget_min_size_get(data, &mw, &mh);
+   e_widget_size_min_get(data, &mw, &mh);
    evas_object_geometry_get(data, NULL, NULL, &w, &h);
    if (vw >= mw)
      {

src/bin/e_widget_slider.c

@@ -52,9 +52,9 @@ e_widget_slider_add(Evas *evas, int horiz, int rev, const char *fmt, double min,
    
    e_slider_min_size_get(o, &mw, &mh);
    if (horiz)
-     e_widget_min_size_set(obj, mw + size, mh);
+     e_widget_size_min_set(obj, mw + size, mh);
    else
-     e_widget_min_size_set(obj, mw, mh + size);
+     e_widget_size_min_set(obj, mw, mh + size);
    
    wd->dval = dval;
    wd->ival = ival;

src/bin/e_widget_spectrum.c

@@ -58,7 +58,7 @@ e_widget_spectrum_add(Evas *evas, E_Color_Component mode, E_Color *cv)
 
    evas_object_show(o);
    edje_object_size_min_calc(o, &mw, &mh);
-   e_widget_min_size_set(obj, mw, mh);
+   e_widget_size_min_set(obj, mw, mh);
 
    e_widget_sub_object_add(obj, o);
    evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, _e_wid_focus_steal, obj);

src/bin/e_widget_table.c

@@ -54,7 +54,7 @@ e_widget_table_object_align_append(Evas_Object *obj, Evas_Object *sobj, int col,
    wd = e_widget_data_get(obj);
    
    e_table_pack(wd->o_table, sobj, col, row, colspan, rowspan);
-   e_widget_min_size_get(sobj, &mw, &mh);
+   e_widget_size_min_get(sobj, &mw, &mh);
    e_table_pack_options_set(sobj,
 			  fill_w, fill_h, /* fill */
 			  expand_w, expand_h, /* expand */
@@ -63,7 +63,7 @@ e_widget_table_object_align_append(Evas_Object *obj, Evas_Object *sobj, int col,
 			  99999, 99999 /* max */
 			  );
    e_table_min_size_get(wd->o_table, &mw, &mh);
-   e_widget_min_size_set(obj, mw, mh);
+   e_widget_size_min_set(obj, mw, mh);
    e_widget_sub_object_add(obj, sobj);
    evas_object_show(sobj);
 }
@@ -78,7 +78,7 @@ e_widget_table_object_repack(Evas_Object *obj, Evas_Object *sobj, int col, int r
    
    e_table_unpack(sobj);
    e_table_pack(wd->o_table, sobj, col, row, colspan, rowspan);
-   e_widget_min_size_get(sobj, &mw, &mh);
+   e_widget_size_min_get(sobj, &mw, &mh);
    e_table_pack_options_set(sobj,
 			    fill_w, fill_h, /* fill */
 			    expand_w, expand_h, /* expand */
@@ -87,7 +87,7 @@ e_widget_table_object_repack(Evas_Object *obj, Evas_Object *sobj, int col, int r
 			    99999, 99999 /* max */
 			    );
    e_table_min_size_get(wd->o_table, &mw, &mh);
-   e_widget_min_size_set(obj, mw, mh);
+   e_widget_size_min_set(obj, mw, mh);
 }
 
 EAPI void