aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/elementary/elm_color_class.c
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-06-20 15:31:31 +0100
committerTom Hacohen <tom@stosb.com>2016-06-20 18:02:00 +0100
commit6202cc7485a54dea6f02a2668e7c907247902dd1 (patch)
tree7a1fa2b61175b1ef75a9bff7299a0ce3daa45216 /src/lib/elementary/elm_color_class.c
parentEo event callbacks: Change the way callbacks are stopped. (diff)
downloadefl-6202cc7485a54dea6f02a2668e7c907247902dd1.tar.gz
Adjust the code according to the eo event stop changes.
This was changed in the previous commit.
Diffstat (limited to 'src/lib/elementary/elm_color_class.c')
-rw-r--r--src/lib/elementary/elm_color_class.c18
1 files changed, 10 insertions, 8 deletions
diff --git a/src/lib/elementary/elm_color_class.c b/src/lib/elementary/elm_color_class.c
index 02c2d25b1b..979d3e171b 100644
--- a/src/lib/elementary/elm_color_class.c
+++ b/src/lib/elementary/elm_color_class.c
@@ -127,7 +127,7 @@ _colorclass_select(void *data, Evas_Object *obj EINA_UNUSED, const char *sig, co
cc->current->color[cc->num].b, cc->current->color[cc->num].a);
}
-static Eina_Bool
+static void
_colorclass_changed(void *data, const Eo_Event *event EINA_UNUSED)
{
Colorclass_UI *cc = data;
@@ -148,16 +148,19 @@ _colorclass_changed(void *data, const Eo_Event *event EINA_UNUSED)
_colorclass_cc_update(cc, cc->num);
cc->change_reset = 0;
cc->changed = 1;
- return EINA_TRUE;
}
-static Eina_Bool
+static void
_colorclass_reset(void *data, const Eo_Event *event EINA_UNUSED)
{
Colorclass_UI *cc = data;
Colorclass color;
- if (!cc->current) return EINA_FALSE;
+ if (!cc->current)
+ {
+ eo_event_callback_stop(event->object);
+ return;
+ }
//if (cc->winid && remote_iface)
//{
//Eldbus_Message *msg;
@@ -167,7 +170,8 @@ _colorclass_reset(void *data, const Eo_Event *event EINA_UNUSED)
//eldbus_message_arguments_append(msg, "s", cc->current->name);
//eldbus_service_signal_send(remote_iface, msg);
//cc->change_reset = 1;
- //return EINA_FALSE;
+ //eo_event_callback_stop(event->object);
+ //return;
//}
edje_color_class_del(cc->current->name);
edje_color_class_get(cc->current->name,
@@ -186,10 +190,9 @@ _colorclass_reset(void *data, const Eo_Event *event EINA_UNUSED)
_colorclass_cc_update(cc, 0);
_colorclass_cc_update(cc, 1);
_colorclass_cc_update(cc, 2);
- return EINA_TRUE;
}
-static Eina_Bool
+static void
_colorclass_activate(void *data, const Eo_Event *event)
{
Colorclass_UI *cc = data;
@@ -226,7 +229,6 @@ _colorclass_activate(void *data, const Eo_Event *event)
elm_colorselector_color_set(cc->cs, cc->current->color[0].r, cc->current->color[0].g,
cc->current->color[0].b, cc->current->color[0].a);
elm_layout_signal_emit(cc->ly, "elm,colors,show", "elm");
- return EINA_TRUE;
}
static void