aboutsummaryrefslogtreecommitdiffstats
path: root/legacy/elementary/src/lib/elm_color_class.c
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2015-04-13 13:05:40 -0400
committerMike Blumenkrantz <zmike@osg.samsung.com>2015-04-13 13:05:40 -0400
commitc80f7775518193eefc3bb899f68e777c0e94f7b0 (patch)
tree63018620c49f373c6d919c36d0456ab8b1885c9e /legacy/elementary/src/lib/elm_color_class.c
parentcolorclass: add reset signal for correctly managing remote colorclass resets (diff)
downloadefl-c80f7775518193eefc3bb899f68e777c0e94f7b0.tar.gz
colorclass: only perform remote actions if current editor is remote
should fix case of editing local + remote simultaneously
Diffstat (limited to 'legacy/elementary/src/lib/elm_color_class.c')
-rw-r--r--legacy/elementary/src/lib/elm_color_class.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/legacy/elementary/src/lib/elm_color_class.c b/legacy/elementary/src/lib/elm_color_class.c
index e6b8f0cc3c..d26a5308b7 100644
--- a/legacy/elementary/src/lib/elm_color_class.c
+++ b/legacy/elementary/src/lib/elm_color_class.c
@@ -134,7 +134,7 @@ _colorclass_changed(void *data, Evas_Object *obj EINA_UNUSED, void *event_info E
elm_colorselector_color_get(cc->cs, (int*)&cc->current->color[cc->num].r, (int*)&cc->current->color[cc->num].g,
(int*)&cc->current->color[cc->num].b, (int*)&cc->current->color[cc->num].a);
- if (remote_iface)
+ if (cc->winid && remote_iface)
_dbus_signal_changed(cc);
else
edje_color_class_set(cc->current->name,
@@ -157,7 +157,7 @@ _colorclass_reset(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EIN
Colorclass color;
if (!cc->current) return;
- if (remote_iface)
+ if (cc->winid && remote_iface)
{
Eldbus_Message *msg;
@@ -185,8 +185,6 @@ _colorclass_reset(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EIN
_colorclass_cc_update(cc, 0);
_colorclass_cc_update(cc, 1);
_colorclass_cc_update(cc, 2);
- if (remote_iface)
- _dbus_signal_changed(cc);
}
static void
@@ -283,7 +281,7 @@ _colorclass_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, v
_colorclass_save(cc);
if (cc->winid)
remote_ccuis = eina_inlist_remove(remote_ccuis, EINA_INLIST_GET(cc));
- if (remote_iface && (!remote_ccuis))
+ if (cc->winid && remote_iface && (!remote_ccuis))
{
Eldbus_Connection *conn;
@@ -325,7 +323,7 @@ _dbus_request_name_cb(void *data, const Eldbus_Message *msg, Eldbus_Pending *pen
elm_object_signal_emit(cc->ly, "elm,state,info", "elm");
return;
}
- if (remote_ccuis)
+ if (cc->winid && remote_ccuis)
eldbus_service_signal_emit(remote_iface, COLORCLASS_SIGNAL_EDIT, cc->winid);
}