1 files changed, 11 insertions, 11 deletions

diff --git a/src/bin/e_widget_button.c b/src/bin/e_widget_button.c
index 0d5acb0be4..629b3a8674 100644
--- a/src/bin/e_widget_button.c
+++ b/src/bin/e_widget_button.c
@@ -45,8 +45,8 @@ e_widget_button_add(Evas *evas, const char *label, const char *icon, void (*func
    wd->o_button = o;
    e_theme_edje_object_set(o, "base/theme/widgets",
 			   "widgets/button");
-   edje_object_signal_callback_add(o, "click", "", _e_wid_signal_cb1, obj);
-   edje_object_part_text_set(o, "label", label);
+   edje_object_signal_callback_add(o, "e,action,click", "", _e_wid_signal_cb1, obj);
+   edje_object_part_text_set(o, "e.text.label", label);
    evas_object_show(o);
    
    e_widget_sub_object_add(obj, o);
@@ -58,8 +58,8 @@ e_widget_button_add(Evas *evas, const char *label, const char *icon, void (*func
 	o = edje_object_add(evas);
 	wd->o_icon = o;
 	e_util_edje_icon_set(o, icon);
-	edje_object_part_swallow(wd->o_button, "icon_swallow", o);
-	edje_object_signal_emit(wd->o_button, "icon_visible", "");
+	edje_object_part_swallow(wd->o_button, "e.swallow.icon", o);
+	edje_object_signal_emit(wd->o_button, "e,action,show,icon", "e");
 	edje_object_message_signal_process(wd->o_button);
 	evas_object_show(o);
 	e_widget_sub_object_add(obj, o);
@@ -77,7 +77,7 @@ e_widget_button_label_set(Evas_Object *obj, const char *label)
    E_Widget_Data *wd;
 
    wd = e_widget_data_get(obj);
-   edje_object_part_text_set(wd->o_button, "label", label);
+   edje_object_part_text_set(wd->o_button, "e.text.label", label);
 }
 
 EAPI void
@@ -87,8 +87,8 @@ e_widget_button_icon_set(Evas_Object *obj, Evas_Object *icon)
 
    wd = e_widget_data_get(obj);
    wd->o_icon = icon;
-   edje_object_part_swallow(wd->o_button, "icon_swallow", icon);
-   edje_object_signal_emit(wd->o_button, "icon_visible", "");
+   edje_object_part_swallow(wd->o_button, "e.swallow.icon", icon);
+   edje_object_signal_emit(wd->o_button, "e,action,show,icon", "e");
    edje_object_message_signal_process(wd->o_button);
    evas_object_pass_events_set(icon, 1);
    evas_object_show(icon);
@@ -112,12 +112,12 @@ _e_wid_focus_hook(Evas_Object *obj)
    wd = e_widget_data_get(obj);
    if (e_widget_focus_get(obj))
      {
-	edje_object_signal_emit(wd->o_button, "focus_in", "");
+	edje_object_signal_emit(wd->o_button, "e,state,focused", "e");
 	evas_object_focus_set(wd->o_button, 1);
      }
    else
      {
-	edje_object_signal_emit(wd->o_button, "focus_out", "");
+	edje_object_signal_emit(wd->o_button, "e,state,unfocused", "e");
 	evas_object_focus_set(wd->o_button, 0);
      }
 }
@@ -138,9 +138,9 @@ _e_wid_disable_hook(Evas_Object *obj)
    
    wd = e_widget_data_get(obj);
    if (e_widget_disabled_get(obj))
-     edje_object_signal_emit(wd->o_button, "disabled", "");
+     edje_object_signal_emit(wd->o_button, "e,state,disabled", "e");
    else
-     edje_object_signal_emit(wd->o_button, "enabled", "");
+     edje_object_signal_emit(wd->o_button, "e,state,enabled", "e");
 }
 
 static void