summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniel Juyung Seo <seojuyung2@gmail.com>2013-11-15 22:51:10 +0900
committerDaniel Juyung Seo <seojuyung2@gmail.com>2013-11-15 22:51:10 +0900
commit95794e0810d8de70d0cb98d68a04aa473f1e6c02 (patch)
tree1185f0bd88aedc8ad92b579cf632a3bb170caffb /src
parent1588e4503d9a3dc909c1385e596ee2a6c3725435 (diff)
scroller, slider: fixed wrong changed I made by 6a683df1598a4c3293a33765cc60dd
I caused by c&p bug. Special thanks to stefan and coverity. This fixes coverity CID 1128353 and 1128354.
Diffstat (limited to 'src')
-rw-r--r--src/lib/elm_scroller.c2
-rw-r--r--src/lib/elm_slider.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/elm_scroller.c b/src/lib/elm_scroller.c
index 48ffa5cc4..67ae134b1 100644
--- a/src/lib/elm_scroller.c
+++ b/src/lib/elm_scroller.c
@@ -271,7 +271,7 @@ _elm_scroller_smart_activate(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
271 Evas_Coord page_y = 0; 271 Evas_Coord page_y = 0;
272 272
273 if (elm_widget_disabled_get(obj)) return; 273 if (elm_widget_disabled_get(obj)) return;
274 if (act != ELM_ACTIVATE_DEFAULT) return; 274 if (act == ELM_ACTIVATE_DEFAULT) return;
275 275
276 eo_do(obj, 276 eo_do(obj,
277 elm_scrollable_interface_content_pos_get(&x, &y), 277 elm_scrollable_interface_content_pos_get(&x, &y),
diff --git a/src/lib/elm_slider.c b/src/lib/elm_slider.c
index 8ae88e43a..86617d7f9 100644
--- a/src/lib/elm_slider.c
+++ b/src/lib/elm_slider.c
@@ -458,7 +458,7 @@ _elm_slider_smart_activate(Eo *obj, void *_pd, va_list *list)
458 Elm_Slider_Smart_Data *sd = _pd; 458 Elm_Slider_Smart_Data *sd = _pd;
459 459
460 if (elm_widget_disabled_get(obj)) return; 460 if (elm_widget_disabled_get(obj)) return;
461 if (act != ELM_ACTIVATE_DEFAULT) return; 461 if (act == ELM_ACTIVATE_DEFAULT) return;
462 462
463 if ((act == ELM_ACTIVATE_UP) || 463 if ((act == ELM_ACTIVATE_UP) ||
464 (act == ELM_ACTIVATE_RIGHT)) 464 (act == ELM_ACTIVATE_RIGHT))