summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrephorm <rephorm>2005-12-28 01:16:26 +0000
committerrephorm <rephorm@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>2005-12-28 01:16:26 +0000
commited57000bf54248226d915bc7f9aaf91a7a545619 (patch)
tree8fb5b792e13258c7b267c9f10218e9b41f1a67ea
parent502c98d9936466f6095179063c125c9b1cabeead (diff)
don't call the callback on buttons that are disabled. this prevents some segfaults when clicking on disabled buttons.
also, clear up a few warnings. SVN revision: 19334
-rw-r--r--src/bin/e_widget_button.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/bin/e_widget_button.c b/src/bin/e_widget_button.c
index b6d25d479..9328e7d1e 100644
--- a/src/bin/e_widget_button.c
+++ b/src/bin/e_widget_button.c
@@ -122,9 +122,13 @@ _e_wid_disable_hook(Evas_Object *obj)
122static void 122static void
123_e_wid_signal_cb1(void *data, Evas_Object *obj, const char *emission, const char *source) 123_e_wid_signal_cb1(void *data, Evas_Object *obj, const char *emission, const char *source)
124{ 124{
125 e_widget_focus_steal(data); 125 Evas_Object *wid;
126 _e_wid_activate_hook(data); 126
127 e_widget_change(data); 127 wid = data;
128 if (!wid || e_widget_disabled_get(wid)) return;
129 e_widget_focus_steal(wid);
130 _e_wid_activate_hook(wid);
131 e_widget_change(wid);
128} 132}
129 133
130static void 134static void