[EGIT] [core/elementary] master 01/01: els_tooltip: compiler portability (use full ternary operator)

[Daniel Kolesa]

q66 pushed a commit to branch master.

http://git.enlightenment.org/core/elementary.git/commit/?id=a4ff8986576949a8202cb7242d07281bc08749c0

commit a4ff8986576949a8202cb7242d07281bc08749c0
Author: Daniel Kolesa <d.kol...@samsung.com>
Date:   Fri Feb 13 14:22:28 2015 +0000

    els_tooltip: compiler portability (use full ternary operator)
---
 src/lib/els_tooltip.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/lib/els_tooltip.c b/src/lib/els_tooltip.c
index c938589..08cf9c9 100644
--- a/src/lib/els_tooltip.c
+++ b/src/lib/els_tooltip.c
@@ -214,7 +214,7 @@ _elm_tooltip_hide(Elm_Tooltip *tt)
    evas_object_event_callback_del_full
      (tt->eventarea, EVAS_CALLBACK_MOUSE_MOVE, 
(Evas_Object_Event_Cb)_elm_tooltip_obj_mouse_move_cb, tt);
 
-   del = tt->tt_win ?: tt->tooltip;
+   del = tt->tt_win ? tt->tt_win : tt->tooltip;
 
    tt->tt_win = NULL;
    tt->tt_evas = NULL;
@@ -412,7 +412,7 @@ _elm_tooltip_reconfigure(Elm_Tooltip *tt)
           elm_win_screen_size_get(elm_widget_top_get(tt->owner), NULL, NULL, 
&cw, &ch);
      }
    if (!cw)
-     evas_output_size_get(tt->tt_evas ?: tt->evas, &cw, &ch);
+     evas_output_size_get(tt->tt_evas ? tt->tt_evas : tt->evas, &cw, &ch);
    TTDBG("SCREEN:  cw=%d,ch=%d\n", cw, ch);
 
    evas_object_geometry_get(tt->eventarea, &ox, &oy, &ow, &oh);
@@ -541,8 +541,8 @@ _elm_tooltip_reconfigure(Elm_Tooltip *tt)
           {
              int ax, ay;
 
-             ax = tt->pad.x ?: 1;
-             ay = tt->pad.y ?: 1;
+             ax = tt->pad.x ? tt->pad.x : 1;
+             ay = tt->pad.y ? tt->pad.y : 1;
              if (!INSIDE(px, py, tx, ty + (py - ty) + ay, tw, th))
                ty += py - ty + ay;
              else if (!INSIDE(px, py, tx + (px - tx) + ax, ty, tw, th))

--