elm: Unified eina critical manro to CRI.

Being annoyed by different types of eina critical macros - CRI, CRIT,
 CRITICAL -, I concluded to unify them to one. Discussed on IRC and
 finally, CRI was chosen to meet the consistency with other macros -
 ERR, WRN, INF, DBG - in terms of the number of characters.
If there is any missing bits, please let me know.

diff --git a/src/bin/elm_prefs_cc.h b/src/bin/elm_prefs_cc.h
index bc895b9..d138f00 100644 (file)
--- a/src/bin/elm_prefs_cc.h
+++ b/src/bin/elm_prefs_cc.h
@@ -34,10 +34,10 @@ extern int _elm_prefs_cc_log_dom;
 # undef WRN
 #endif
 #define WRN(...) EINA_LOG_DOM_WARN(_elm_prefs_cc_log_dom, __VA_ARGS__)
-#ifdef CRIT
-# undef CRIT
+#ifdef CRI
+# undef CRI
 #endif
-#define CRIT(...) EINA_LOG_DOM_CRIT(_elm_prefs_cc_log_dom, __VA_ARGS__)
+#define CRI(...) EINA_LOG_DOM_CRIT(_elm_prefs_cc_log_dom, __VA_ARGS__)
 #ifdef DBG
 # undef DBG
 #endif

diff --git a/src/bin/quicklaunch.c b/src/bin/quicklaunch.c
index f79770c..6ca0a3c 100644 (file)
--- a/src/bin/quicklaunch.c
+++ b/src/bin/quicklaunch.c
@@ -42,7 +42,7 @@ static struct sigaction old_sigbus;
 static struct sigaction old_sigabrt;
 static int _log_dom = -1;
 
-#define CRITICAL(...) EINA_LOG_DOM_CRIT(_log_dom, __VA_ARGS__)
+#define CRI(...) EINA_LOG_DOM_CRIT(_log_dom, __VA_ARGS__)
 #define ERR(...) EINA_LOG_DOM_ERR(_log_dom, __VA_ARGS__)
 #define WRN(...) EINA_LOG_DOM_WARN(_log_dom, __VA_ARGS__)
 #define INF(...) EINA_LOG_DOM_INFO(_log_dom, __VA_ARGS__)
@@ -87,7 +87,7 @@ crash_handler(int x EINA_UNUSED, siginfo_t *info EINA_UNUSED, void *data EINA_UN
    t = ecore_time_get();
    if ((t - restart_time) <= 2.0)
      {
-        CRITICAL("crash too fast - less than 2 seconds. abort restart");
+        CRI("crash too fast - less than 2 seconds. abort restart");
         exit(-1);
      }
    ecore_app_restart();
@@ -109,7 +109,7 @@ handle_run(int fd, unsigned long bytes)
    buf = alloca(bytes);
    if (read(fd, buf, bytes) != (int)bytes)
      {
-        CRITICAL("cannot read %i bytes of args and environment data", (int)bytes);
+        CRI("cannot read %i bytes of args and environment data", (int)bytes);
         close(fd);
         return;
      }
@@ -120,7 +120,7 @@ handle_run(int fd, unsigned long bytes)
 
    if (argc <= 0)
      {
-        CRITICAL("no executable specified");
+        CRI("no executable specified");
         return;
      }
 
@@ -188,7 +188,7 @@ main(int argc, char **argv)
         ret = mkdir(buf, S_IRUSR | S_IWUSR | S_IXUSR);
         if (ret < 0)
           {
-             CRITICAL("cannot create directory '%s'", buf);
+             CRI("cannot create directory '%s'", buf);
              exit(-1);
           }
      }
@@ -197,13 +197,13 @@ main(int argc, char **argv)
    sock = socket(AF_UNIX, SOCK_STREAM, 0);
    if (sock < 0)
      {
-        CRITICAL("cannot create socket for socket for '%s': %s",
+        CRI("cannot create socket for socket for '%s': %s",
                  buf, strerror(errno));
         exit(-1);
      }
    if (fcntl(sock, F_SETFD, FD_CLOEXEC) < 0)
      {
-        CRITICAL("cannot set close on exec socket for '%s' (fd=%d): %s",
+        CRI("cannot set close on exec socket for '%s' (fd=%d): %s",
                  buf, sock, strerror(errno));
         exit(-1);
      }
@@ -211,7 +211,7 @@ main(int argc, char **argv)
    lin.l_linger = 0;
    if (setsockopt(sock, SOL_SOCKET, SO_LINGER, &lin, sizeof(struct linger)) < 0)
      {
-        CRITICAL("cannot set linger for socket for '%s' (fd=%d): %s",
+        CRI("cannot set linger for socket for '%s' (fd=%d): %s",
                  buf, sock, strerror(errno));
         exit(-1);
      }
@@ -220,13 +220,13 @@ main(int argc, char **argv)
    socket_unix_len = LENGTH_OF_SOCKADDR_UN(&socket_unix);
    if (bind(sock, (struct sockaddr *)&socket_unix, socket_unix_len) < 0)
      {
-        CRITICAL("cannot bind socket for '%s' (fd=%d): %s",
+        CRI("cannot bind socket for '%s' (fd=%d): %s",
                  buf, sock, strerror(errno));
         exit(-1);
      }
    if (listen(sock, 4096) < 0)
      {
-        CRITICAL("listen(sock=%d, 4096): %s", sock, strerror(errno));
+        CRI("listen(sock=%d, 4096): %s", sock, strerror(errno));
         exit(-1);
      }
    elm_quicklaunch_mode_set(EINA_TRUE);

diff --git a/src/bin/test.h b/src/bin/test.h
index b492c08..1b34c95 100644 (file)
--- a/src/bin/test.h
+++ b/src/bin/test.h
@@ -20,7 +20,7 @@
 
 extern int _log_domain;
 
-#define CRITICAL(...) EINA_LOG_DOM_CRIT(_log_domain, _VA_ARGS__)
+#define CRI(...) EINA_LOG_DOM_CRIT(_log_domain, _VA_ARGS__)
 #define ERR(...)      EINA_LOG_DOM_ERR(_log_domain, __VA_ARGS__)
 #define WRN(...)      EINA_LOG_DOM_WARN(_log_domain, __VA_ARGS__)
 #define INF(...)      EINA_LOG_DOM_INFO(_log_domain, __VA_ARGS__)

diff --git a/src/edje_externals/private.h b/src/edje_externals/private.h
index 4d63b0c..43dea73 100644 (file)
--- a/src/edje_externals/private.h
+++ b/src/edje_externals/private.h
@@ -4,13 +4,13 @@
 #include "Elementary.h"
 #include "elm_priv.h"
 
-#undef CRITICAL
+#undef CRI
 #undef ERR
 #undef WRN
 #undef INF
 #undef DBG
 
-#define CRITICAL(...) EINA_LOG_DOM_CRIT(_elm_ext_log_dom, __VA_ARGS__)
+#define CRI(...) EINA_LOG_DOM_CRIT(_elm_ext_log_dom, __VA_ARGS__)
 #define ERR(...)      EINA_LOG_DOM_ERR (_elm_ext_log_dom, __VA_ARGS__)
 #define WRN(...)      EINA_LOG_DOM_WARN(_elm_ext_log_dom, __VA_ARGS__)
 #define INF(...)      EINA_LOG_DOM_INFO(_elm_ext_log_dom, __VA_ARGS__)

diff --git a/src/lib/elc_ctxpopup.c b/src/lib/elc_ctxpopup.c
index 05c9186..eed5ac5 100644 (file)
--- a/src/lib/elc_ctxpopup.c
+++ b/src/lib/elc_ctxpopup.c
@@ -1126,7 +1126,7 @@ _elm_ctxpopup_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
 
    if (!elm_layout_theme_set
        (obj, "ctxpopup", "base", elm_widget_style_get(obj)))
-     CRITICAL("Failed to set layout!");
+     CRI("Failed to set layout!");
 
    elm_layout_signal_callback_add
      (obj, "elm,action,hide,finished", "*", _hide_finished_cb, obj);

diff --git a/src/lib/elc_fileselector.c b/src/lib/elc_fileselector.c
index 198d2a4..e9d0c9c 100644 (file)
--- a/src/lib/elc_fileselector.c
+++ b/src/lib/elc_fileselector.c
@@ -1295,7 +1295,7 @@ _elm_fileselector_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
 
    if (!elm_layout_theme_set
        (obj, "fileselector", "base", elm_widget_style_get(obj)))
-     CRITICAL("Failed to set layout!");
+     CRI("Failed to set layout!");
 
    // up btn
    ic = elm_icon_add(obj);

diff --git a/src/lib/elc_fileselector_entry.c b/src/lib/elc_fileselector_entry.c
index ba41564..ba78501 100644 (file)
--- a/src/lib/elc_fileselector_entry.c
+++ b/src/lib/elc_fileselector_entry.c
@@ -351,7 +351,7 @@ _elm_fileselector_entry_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
 
    if (!elm_layout_theme_set
        (obj, "fileselector_entry", "base", elm_widget_style_get(obj)))
-     CRITICAL("Failed to set layout!");
+     CRI("Failed to set layout!");
 
    priv->button = elm_fileselector_button_add(obj);
    elm_widget_mirrored_automatic_set(priv->button, EINA_FALSE);

diff --git a/src/lib/elc_multibuttonentry.c b/src/lib/elc_multibuttonentry.c
index 760c6a4..700ac4e 100644 (file)
--- a/src/lib/elc_multibuttonentry.c
+++ b/src/lib/elc_multibuttonentry.c
@@ -1453,7 +1453,7 @@ _elm_multibuttonentry_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
 
    if (!elm_layout_theme_set
        (obj, "multibuttonentry", "base", elm_widget_style_get(obj)))
-     CRITICAL("Failed to set layout!");
+     CRI("Failed to set layout!");
 
    elm_widget_can_focus_set(obj, EINA_TRUE);
 

diff --git a/src/lib/elc_naviframe.c b/src/lib/elc_naviframe.c
index e71b165..22c6ee2 100644 (file)
--- a/src/lib/elc_naviframe.c
+++ b/src/lib/elc_naviframe.c
@@ -293,7 +293,7 @@ _item_style_set(Elm_Naviframe_Item *it,
 
    if (!elm_layout_theme_set(VIEW(it), "naviframe", buf,
                              elm_widget_style_get(WIDGET(it))))
-     CRITICAL("Failed to set layout!");
+     CRI("Failed to set layout!");
 
    if (sd->freeze_events)
      evas_object_freeze_events_set(VIEW(it), EINA_FALSE);

diff --git a/src/lib/elc_player.c b/src/lib/elc_player.c
index b921889..a8c06e1 100644 (file)
--- a/src/lib/elc_player.c
+++ b/src/lib/elc_player.c
@@ -632,7 +632,7 @@ _elm_player_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
    elm_widget_sub_object_parent_add(obj);
 
    if (!elm_layout_theme_set(obj, "player", "base", elm_widget_style_get(obj)))
-     CRITICAL("Failed to set layout!");
+     CRI("Failed to set layout!");
 
    priv->forward = _player_button_add(obj, "forward", _forward);
    priv->info = _player_button_add(obj, "info", _info);

diff --git a/src/lib/elc_popup.c b/src/lib/elc_popup.c
index c9256b4..ef32208 100644 (file)
--- a/src/lib/elc_popup.c
+++ b/src/lib/elc_popup.c
@@ -339,7 +339,7 @@ _elm_popup_smart_theme(Eo *obj, void *_pd, va_list *list)
      {
         snprintf(buf, sizeof(buf), "buttons%i", sd->last_button_number);
         if (!elm_layout_theme_set(sd->action_area, "popup", buf, style))
-          CRITICAL("Failed to set layout!");
+          CRI("Failed to set layout!");
         for (i = 0; i < ELM_POPUP_ACTION_BUTTON_MAX; i++)
           {
              if (!sd->buttons[i]) continue;
@@ -347,7 +347,7 @@ _elm_popup_smart_theme(Eo *obj, void *_pd, va_list *list)
           }
      }
    if (!elm_layout_theme_set(sd->content_area, "popup", "content", style))
-     CRITICAL("Failed to set layout!");
+     CRI("Failed to set layout!");
    if (sd->text_content_obj)
        elm_object_style_set(sd->text_content_obj, style);
    else if (sd->items)
@@ -355,7 +355,7 @@ _elm_popup_smart_theme(Eo *obj, void *_pd, va_list *list)
         EINA_LIST_FOREACH(sd->items, elist, it)
           {
              if (!elm_layout_theme_set(VIEW(it), "popup", "item", style))
-               CRITICAL("Failed to set layout!");
+               CRI("Failed to set layout!");
              else
                {
                   if (it->label)
@@ -591,7 +591,7 @@ _button_remove(Evas_Object *obj,
         snprintf(style, sizeof(style), "popup/%s", elm_widget_style_get(obj));
         snprintf(buf, sizeof(buf), "buttons%i", sd->last_button_number);
         if (!elm_layout_theme_set(sd->action_area, "popup", buf, style))
-          CRITICAL("Failed to set layout!");
+          CRI("Failed to set layout!");
      }
 }
 
@@ -867,7 +867,7 @@ _item_new(Elm_Popup_Item *it)
 
    snprintf(style, sizeof(style), "popup/%s", elm_widget_style_get(WIDGET(it)));
    if (!elm_layout_theme_set(VIEW(it), "popup", "item", style))
-     CRITICAL("Failed to set layout!");
+     CRI("Failed to set layout!");
    else
      {
         elm_layout_signal_callback_add(VIEW(it), "elm,action,click", "*",
@@ -1157,7 +1157,7 @@ _action_button_set(Evas_Object *obj,
 
    snprintf(style, sizeof(style), "popup/%s", elm_widget_style_get(obj));
    if (!elm_layout_theme_set(sd->action_area, "popup", buf, style))
-     CRITICAL("Failed to set layout!");
+     CRI("Failed to set layout!");
 
    snprintf(buf, sizeof(buf), "elm.swallow.content.button%i", idx + 1);
    elm_object_part_content_set
@@ -1508,7 +1508,7 @@ _elm_popup_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
 
    snprintf(style, sizeof(style), "%s", "default");
    if (!elm_layout_theme_set(obj, "popup", "base", style))
-     CRITICAL("Failed to set layout!");
+     CRI("Failed to set layout!");
 
    snprintf(style, sizeof(style), "popup/%s", "default");
 
@@ -1538,7 +1538,7 @@ _elm_popup_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
 
    priv->content_area = elm_layout_add(obj);
    if (!elm_layout_theme_set(priv->content_area, "popup", "content", style))
-     CRITICAL("Failed to set layout!");
+     CRI("Failed to set layout!");
    else
      evas_object_event_callback_add
         (priv->content_area, EVAS_CALLBACK_CHANGED_SIZE_HINTS,

diff --git a/src/lib/elm_actionslider.c b/src/lib/elm_actionslider.c
index 272841a..663da38 100644 (file)
--- a/src/lib/elm_actionslider.c
+++ b/src/lib/elm_actionslider.c
@@ -420,7 +420,7 @@ _elm_actionslider_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
 
    if (!elm_layout_theme_set
        (obj, "actionslider", "base", elm_widget_style_get(obj)))
-     CRITICAL("Failed to set layout!");
+     CRI("Failed to set layout!");
 
    elm_layout_content_set(obj, "elm.drag_button_base", priv->drag_button_base);
 

diff --git a/src/lib/elm_bg.c b/src/lib/elm_bg.c
index d0a8690..174057d 100644 (file)
--- a/src/lib/elm_bg.c
+++ b/src/lib/elm_bg.c
@@ -115,7 +115,7 @@ _elm_bg_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
    evas_object_event_callback_add(obj, EVAS_CALLBACK_RESIZE, _on_resize, obj);
 
    if (!elm_layout_theme_set(obj, "bg", "base", elm_widget_style_get(obj)))
-     CRITICAL("Failed to set layout!");
+     CRI("Failed to set layout!");
 }
 
 static void

diff --git a/src/lib/elm_bubble.c b/src/lib/elm_bubble.c
index 5f4b365..46ca3a4 100644 (file)
--- a/src/lib/elm_bubble.c
+++ b/src/lib/elm_bubble.c
@@ -219,7 +219,7 @@ _elm_bubble_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
      (_elm_access_info_get(obj), ELM_ACCESS_INFO, _access_info_cb, NULL);
 
    if (!elm_layout_theme_set(obj, "bubble", "base", elm_widget_style_get(obj)))
-     CRITICAL("Failed to set layout!");
+     CRI("Failed to set layout!");
 
    elm_layout_sizing_eval(obj);
 

diff --git a/src/lib/elm_button.c b/src/lib/elm_button.c
index 3ebfe58..a0aa242 100644 (file)
--- a/src/lib/elm_button.c
+++ b/src/lib/elm_button.c
@@ -309,7 +309,7 @@ _elm_button_smart_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
 
    elm_widget_can_focus_set(obj, EINA_TRUE);
    if (!elm_layout_theme_set(obj, "button", "base", elm_widget_style_get(obj)))
-     CRITICAL("Failed to set layout!");
+     CRI("Failed to set layout!");
 }
 
 static void

diff --git a/src/lib/elm_calendar.c b/src/lib/elm_calendar.c
index 096cf12..0158638 100644 (file)
--- a/src/lib/elm_calendar.c
+++ b/src/lib/elm_calendar.c
@@ -1014,7 +1014,7 @@ _elm_calendar_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
 
    if (!elm_layout_theme_set(obj, "calendar", "base",
                              elm_object_style_get(obj)))
-     CRITICAL("Failed to set layout!");
+     CRI("Failed to set layout!");
 
    evas_object_smart_changed(obj);
 

diff --git a/src/lib/elm_check.c b/src/lib/elm_check.c
index 769a6b3..fc6035c 100644 (file)
--- a/src/lib/elm_check.c
+++ b/src/lib/elm_check.c
@@ -318,7 +318,7 @@ _elm_check_smart_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
    elm_widget_can_focus_set(obj, EINA_TRUE);
 
    if (!elm_layout_theme_set(obj, "check", "base", elm_widget_style_get(obj)))
-     CRITICAL("Failed to set layout!");
+     CRI("Failed to set layout!");
 
    elm_layout_sizing_eval(obj);
 }

diff --git a/src/lib/elm_clock.c b/src/lib/elm_clock.c
index d377d76..30b5dcb 100644 (file)
--- a/src/lib/elm_clock.c
+++ b/src/lib/elm_clock.c
@@ -368,22 +368,22 @@ _time_update(Evas_Object *obj)
         if ((sd->seconds) && (sd->am_pm))
           {
              if (!elm_layout_theme_set(obj, "clock", "base-all", style))
-               CRITICAL("Failed to set layout!");
+               CRI("Failed to set layout!");
           }
         else if (sd->seconds)
           {
              if (!elm_layout_theme_set(obj, "clock", "base-seconds", style))
-               CRITICAL("Failed to set layout!");
+               CRI("Failed to set layout!");
           }
         else if (sd->am_pm)
           {
              if (!elm_layout_theme_set(obj, "clock", "base-am_pm", style))
-               CRITICAL("Failed to set layout!");
+               CRI("Failed to set layout!");
           }
         else
           {
              if (!elm_layout_theme_set(obj, "clock", "base", style))
-               CRITICAL("Failed to set layout!");
+               CRI("Failed to set layout!");
           }
 
         edje_object_scale_set

diff --git a/src/lib/elm_colorselector.c b/src/lib/elm_colorselector.c
index b4fddc5..57920d3 100644 (file)
--- a/src/lib/elm_colorselector.c
+++ b/src/lib/elm_colorselector.c
@@ -1103,7 +1103,7 @@ _elm_colorselector_smart_theme(Eo *obj, void *_pd, va_list *list)
      {
         if (!elm_layout_theme_set
             (VIEW(item), "colorselector", "item", elm_widget_style_get(obj)))
-          CRITICAL("Failed to set layout!");
+          CRI("Failed to set layout!");
 
         elm_widget_theme_object_set
           (obj, item->color_obj, "colorselector", "item/color",
@@ -1391,7 +1391,7 @@ _item_new(Evas_Object *obj)
    VIEW(item) = elm_layout_add(obj);
    if (!elm_layout_theme_set
        (VIEW(item), "colorselector", "item", elm_widget_style_get(obj)))
-     CRITICAL("Failed to set layout!");
+     CRI("Failed to set layout!");
    evas_object_size_hint_weight_set
      (VIEW(item), EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(VIEW(item), EVAS_HINT_FILL, EVAS_HINT_FILL);
@@ -1498,7 +1498,7 @@ _elm_colorselector_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
 
    if (!elm_layout_theme_set
        (obj, "colorselector", "palette", elm_object_style_get(obj)))
-     CRITICAL("Failed to set layout!");
+     CRI("Failed to set layout!");
 
    priv->palette_box = elm_box_add(obj);
    elm_box_layout_set

diff --git a/src/lib/elm_conform.c b/src/lib/elm_conform.c
index 5fc424d..9c3312d 100644 (file)
--- a/src/lib/elm_conform.c
+++ b/src/lib/elm_conform.c
@@ -887,7 +887,7 @@ _elm_conformant_smart_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNU
 
    if (!elm_layout_theme_set
        (obj, "conformant", "base", elm_widget_style_get(obj)))
-     CRITICAL("Failed to set layout!");
+     CRI("Failed to set layout!");
 
    _conformant_parts_swallow(obj);
 

diff --git a/src/lib/elm_datetime.c b/src/lib/elm_datetime.c
index bc5eaf8..4dc0acc 100644 (file)
--- a/src/lib/elm_datetime.c
+++ b/src/lib/elm_datetime.c
@@ -805,7 +805,7 @@ _elm_datetime_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
 
    if (!elm_layout_theme_set(obj, "datetime", "base",
                              elm_widget_style_get(obj)))
-     CRITICAL("Failed to set layout!");
+     CRI("Failed to set layout!");
 
    // module - initialise module for datetime
    if (!dt_mod) dt_mod = _dt_mod_init();

diff --git a/src/lib/elm_dayselector.c b/src/lib/elm_dayselector.c
index e2e1da5..087c7a1 100644 (file)
--- a/src/lib/elm_dayselector.c
+++ b/src/lib/elm_dayselector.c
@@ -436,7 +436,7 @@ _elm_dayselector_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
 
    if (!elm_layout_theme_set(obj, "dayselector", "base",
                              elm_widget_style_get(obj)))
-     CRITICAL("Failed to set layout!");
+     CRI("Failed to set layout!");
 
    priv->week_start = _elm_config->week_start;
    priv->weekend_start = _elm_config->weekend_start;

diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index e285588..873cfd4 100644 (file)
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -3157,7 +3157,7 @@ _elm_entry_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
    priv->editable = EINA_TRUE;
 
    if (!elm_layout_theme_set(obj, "entry", "base", elm_widget_style_get(obj)))
-     CRITICAL("Failed to set layout!");
+     CRI("Failed to set layout!");
 
    priv->hit_rect = evas_object_rectangle_add(evas_object_evas_get(obj));
    evas_object_data_set(priv->hit_rect, "_elm_leaveme", obj);

diff --git a/src/lib/elm_flipselector.c b/src/lib/elm_flipselector.c
index 9b9ca27..b7ab713 100644 (file)
--- a/src/lib/elm_flipselector.c
+++ b/src/lib/elm_flipselector.c
@@ -557,7 +557,7 @@ _elm_flipselector_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
 
    if (!elm_layout_theme_set
        (obj, "flipselector", "base", elm_widget_style_get(obj)))
-     CRITICAL("Failed to set layout!");
+     CRI("Failed to set layout!");
 
    elm_layout_signal_callback_add
      (obj, "elm,action,up,start", "*", _signal_val_up_start, obj);

diff --git a/src/lib/elm_frame.c b/src/lib/elm_frame.c
index 28c86d2..4512ad7 100644 (file)
--- a/src/lib/elm_frame.c
+++ b/src/lib/elm_frame.c
@@ -187,7 +187,7 @@ _elm_frame_smart_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
    elm_widget_can_focus_set(obj, EINA_FALSE);
 
    if (!elm_layout_theme_set(obj, "frame", "base", elm_widget_style_get(obj)))
-     CRITICAL("Failed to set layout!");
+     CRI("Failed to set layout!");
 
    elm_layout_sizing_eval(obj);
 }

diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c
index 366dea4..bde798a 100644 (file)
--- a/src/lib/elm_gengrid.c
+++ b/src/lib/elm_gengrid.c
@@ -2401,7 +2401,7 @@ _elm_gengrid_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
 
    if (!elm_layout_theme_set(obj, "gengrid", "base",
                              elm_widget_style_get(obj)))
-     CRITICAL("Failed to set layout!");
+     CRI("Failed to set layout!");
 
    eo_do(obj, elm_scrollable_interface_objects_set(wd->resize_obj, priv->hit_rect));
 

diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index 3ca50eb..c97a001 100644 (file)
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -4909,7 +4909,7 @@ _elm_genlist_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
 
    if (!elm_layout_theme_set
        (obj, "genlist", "base", elm_widget_style_get(obj)))
-     CRITICAL("Failed to set layout!");
+     CRI("Failed to set layout!");
 
    eo_do(obj, elm_scrollable_interface_objects_set(wd->resize_obj, priv->hit_rect));
 

diff --git a/src/lib/elm_gesture_layer.c b/src/lib/elm_gesture_layer.c
index 274f81d..351d0be 100644 (file)
--- a/src/lib/elm_gesture_layer.c
+++ b/src/lib/elm_gesture_layer.c
@@ -64,7 +64,7 @@ _glayer_buf_dup(void *buf, size_t size)
   ELM_GESTURE_LAYER_DATA_GET(o, ptr);                \
   if (!ptr)                                          \
     {                                                \
-       CRITICAL("No widget data for object %p (%s)", \
+       CRI("No widget data for object %p (%s)", \
                 o, evas_object_type_get(o));         \
        return;                                       \
     }
@@ -73,7 +73,7 @@ _glayer_buf_dup(void *buf, size_t size)
   ELM_GESTURE_LAYER_DATA_GET(o, ptr);                         \
   if (!ptr)                                                   \
     {                                                         \
-       CRITICAL("No widget data for object %p (%s)",          \
+       CRI("No widget data for object %p (%s)",          \
                 o, evas_object_type_get(o));                  \
        return val;                                            \
     }

diff --git a/src/lib/elm_hover.c b/src/lib/elm_hover.c
index 4fb5e18..5f20fb1 100644 (file)
--- a/src/lib/elm_hover.c
+++ b/src/lib/elm_hover.c
@@ -552,7 +552,7 @@ _elm_hover_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
      priv->subs[i].swallow = _content_aliases[i].alias;
 
    if (!elm_layout_theme_set(obj, "hover", "base", elm_widget_style_get(obj)))
-     CRITICAL("Failed to set layout!");
+     CRI("Failed to set layout!");
 
    elm_layout_signal_callback_add
      (obj, "elm,action,dismiss", "*", _hov_dismiss_cb, obj);

diff --git a/src/lib/elm_index.c b/src/lib/elm_index.c
index f61caad..8e7f7d8 100644 (file)
--- a/src/lib/elm_index.c
+++ b/src/lib/elm_index.c
@@ -901,7 +901,7 @@ _elm_index_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
 
    if (!elm_layout_theme_set
        (obj, "index", "base/vertical", elm_widget_style_get(obj)))
-     CRITICAL("Failed to set layout!");
+     CRI("Failed to set layout!");
 
    evas_object_event_callback_add
      (obj, EVAS_CALLBACK_RESIZE, _index_resize_cb, NULL);

diff --git a/src/lib/elm_interface_scrollable.c b/src/lib/elm_interface_scrollable.c
index 496bf46..b092cf3 100644 (file)
--- a/src/lib/elm_interface_scrollable.c
+++ b/src/lib/elm_interface_scrollable.c
@@ -18,7 +18,7 @@ EAPI Eo_Op ELM_OBJ_PAN_BASE_ID = EO_NOOP;
   Elm_Pan_Smart_Data *ptr = eo_data_scope_get(o, MY_PAN_CLASS);       \
   if (!ptr)                                                     \
     {                                                           \
-       CRITICAL("No smart data for object %p (%s)",             \
+       CRI("No smart data for object %p (%s)",             \
                 o, evas_object_type_get(o));                    \
        return;                                                  \
     }
@@ -27,7 +27,7 @@ EAPI Eo_Op ELM_OBJ_PAN_BASE_ID = EO_NOOP;
   Elm_Pan_Smart_Data *ptr = eo_data_scope_get(o, MY_PAN_CLASS);       \
   if (!ptr)                                                     \
     {                                                           \
-       CRITICAL("No smart data for object %p (%s)",             \
+       CRI("No smart data for object %p (%s)",             \
                 o, evas_object_type_get(o));                    \
        return val;                                              \
     }
@@ -395,7 +395,7 @@ EAPI Eo_Op ELM_SCROLLABLE_INTERFACE_BASE_ID = EO_NOOP;
      eo_data_scope_get(o, MY_SCROLLABLE_INTERFACE));    \
   if (!ptr)                                             \
     {                                                   \
-       CRITICAL("No interface data for object %p (%s)", \
+       CRI("No interface data for object %p (%s)", \
                 o, evas_object_type_get(o));            \
        return;                                          \
     }
@@ -406,7 +406,7 @@ EAPI Eo_Op ELM_SCROLLABLE_INTERFACE_BASE_ID = EO_NOOP;
      eo_data_scope_get(o, MY_SCROLLABLE_INTERFACE));         \
   if (!ptr)                                                  \
     {                                                        \
-       CRITICAL("No interface data for object %p (%s)",      \
+       CRI("No interface data for object %p (%s)",      \
                 o, evas_object_type_get(o));                 \
        return val;                                           \
     }

diff --git a/src/lib/elm_inwin.c b/src/lib/elm_inwin.c
index c4e945b..11266f9 100644 (file)
--- a/src/lib/elm_inwin.c
+++ b/src/lib/elm_inwin.c
@@ -83,7 +83,7 @@ _elm_inwin_smart_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
    evas_object_size_hint_weight_set(obj, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(obj, EVAS_HINT_FILL, EVAS_HINT_FILL);
    if (!elm_layout_theme_set(obj, "win", "inwin", elm_object_style_get(obj)))
-     CRITICAL("Failed to set layout!");
+     CRI("Failed to set layout!");
 }
 
 static void

diff --git a/src/lib/elm_label.c b/src/lib/elm_label.c
index 5b81117..7881c18 100644 (file)
--- a/src/lib/elm_label.c
+++ b/src/lib/elm_label.c
@@ -410,7 +410,7 @@ _elm_label_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
      (_elm_access_info_get(obj), ELM_ACCESS_INFO, _access_info_cb, NULL);
 
    if (!elm_layout_theme_set(obj, "label", "base", elm_widget_style_get(obj)))
-     CRITICAL("Failed to set layout!");
+     CRI("Failed to set layout!");
 
    elm_layout_text_set(obj, NULL, "<br>");
    elm_layout_sizing_eval(obj);

diff --git a/src/lib/elm_list.c b/src/lib/elm_list.c
index 4ea1b08..e38bd32 100644 (file)
--- a/src/lib/elm_list.c
+++ b/src/lib/elm_list.c
@@ -1773,7 +1773,7 @@ _elm_list_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
    priv->mode = ELM_LIST_SCROLL;
 
    if (!elm_layout_theme_set(obj, "list", "base", elm_widget_style_get(obj)))
-     CRITICAL("Failed to set layout!");
+     CRI("Failed to set layout!");
 
    priv->hit_rect = evas_object_rectangle_add(evas_object_evas_get(obj));
    evas_object_data_set(priv->hit_rect, "_elm_leaveme", obj);

diff --git a/src/lib/elm_map.c b/src/lib/elm_map.c
index bf6b432..361da65 100644 (file)
--- a/src/lib/elm_map.c
+++ b/src/lib/elm_map.c
@@ -1524,7 +1524,7 @@ _overlay_default_layout_update(Overlay_Default *ovl)
         if (!elm_layout_theme_set
             (ovl->layout, "map/marker", "empty",
              elm_widget_style_get((ovl->wsd)->obj)))
-          CRITICAL("Failed to set layout!");
+          CRI("Failed to set layout!");
 
         elm_object_part_content_set(ovl->layout, "elm.icon", ovl->icon);
      }
@@ -1534,7 +1534,7 @@ _overlay_default_layout_update(Overlay_Default *ovl)
         if (!elm_layout_theme_set
             (ovl->layout, "map/marker", "empty",
              elm_widget_style_get((ovl->wsd)->obj)))
-          CRITICAL("Failed to set layout!");
+          CRI("Failed to set layout!");
 
         elm_object_part_content_set(ovl->layout, "elm.icon", ovl->clas_icon);
      }
@@ -1545,7 +1545,7 @@ _overlay_default_layout_update(Overlay_Default *ovl)
         if (!elm_layout_theme_set
             (ovl->layout, "map/marker", "radio",
              elm_widget_style_get((ovl->wsd)->obj)))
-          CRITICAL("Failed to set layout!");
+          CRI("Failed to set layout!");
      }
 }
 
@@ -1629,7 +1629,7 @@ _overlay_default_new(Elm_Map_Overlay *overlay,
    evas_object_stack_above(ovl->layout, ovl->wsd->sep_maps_overlays);
    if (!elm_layout_theme_set(ovl->layout, "map/marker", "radio",
                              elm_widget_style_get((ovl->wsd)->obj)))
-     CRITICAL("Failed to set layout!");
+     CRI("Failed to set layout!");
 
    evas_object_event_callback_add(ovl->layout, EVAS_CALLBACK_MOUSE_DOWN,
                                   _overlay_clicked_cb, overlay);
@@ -2322,7 +2322,7 @@ _overlay_circle_new(Elm_Map_Smart_Data *sd,
    evas_object_stack_above(ovl->obj, sd->sep_maps_overlays);
    if (!elm_layout_theme_set(ovl->obj, "map/circle", "base",
                              elm_widget_style_get(sd->obj)))
-     CRITICAL("Failed to set layout!");
+     CRI("Failed to set layout!");
 
    _overlay_circle_color_update(ovl, c);
 
@@ -2408,7 +2408,7 @@ _overlay_scale_new(Elm_Map_Smart_Data *sd,
    evas_object_stack_above(ovl->obj, sd->sep_maps_overlays);
    if (!elm_layout_theme_set(ovl->obj, "map/scale", "base",
                              elm_widget_style_get(sd->obj)))
-     CRITICAL("Failed to set layout!");
+     CRI("Failed to set layout!");
 
    s = edje_object_data_get(elm_layout_edje_get(ovl->obj), "size_w");
 

diff --git a/src/lib/elm_menu.c b/src/lib/elm_menu.c
index a476a7f..fd0cd8f 100644 (file)
--- a/src/lib/elm_menu.c
+++ b/src/lib/elm_menu.c
@@ -215,7 +215,7 @@ _elm_menu_smart_theme(Eo *obj, void *_pd, va_list *list)
                {
                   if (!elm_layout_theme_set(VIEW(item), "menu", "separator",
                                             elm_widget_style_get(obj)))
-                    CRITICAL("Failed to set layout!");
+                    CRI("Failed to set layout!");
                }
              else if (item->submenu.bx)
                {
@@ -224,7 +224,7 @@ _elm_menu_smart_theme(Eo *obj, void *_pd, va_list *list)
 
                   if (!elm_layout_theme_set(VIEW(item), "menu", s,
                                             elm_widget_style_get(obj)))
-                    CRITICAL("Failed to set layout!");
+                    CRI("Failed to set layout!");
 
                   elm_object_item_text_set((Elm_Object_Item *)item,
                                            item->label);
@@ -236,7 +236,7 @@ _elm_menu_smart_theme(Eo *obj, void *_pd, va_list *list)
                {
                   if (!elm_layout_theme_set(VIEW(item), "menu", "item",
                                             elm_widget_style_get(obj)))
-                    CRITICAL("Failed to set layout!");
+                    CRI("Failed to set layout!");
 
                   elm_object_item_text_set((Elm_Object_Item *)item,
                                            item->label);
@@ -495,7 +495,7 @@ _item_obj_create(Elm_Menu_Item *item)
    evas_object_size_hint_fill_set(VIEW(item), EVAS_HINT_FILL, EVAS_HINT_FILL);
    if (!elm_layout_theme_set(VIEW(item), "menu", "item",
                         elm_widget_style_get(WIDGET(item))))
-     CRITICAL("Failed to set layout!");
+     CRI("Failed to set layout!");
    else
      {
         elm_layout_signal_callback_add(VIEW(item), "elm,action,click", "*",
@@ -518,7 +518,7 @@ _item_separator_obj_create(Elm_Menu_Item *item)
    evas_object_size_hint_fill_set(VIEW(item), EVAS_HINT_FILL, EVAS_HINT_FILL);
    if (!elm_layout_theme_set(VIEW(item), "menu", "separator",
                              elm_widget_style_get(WIDGET(item))))
-     CRITICAL("Failed to set layout!");
+     CRI("Failed to set layout!");
    else
      {
         elm_layout_signal_callback_add
@@ -561,14 +561,14 @@ _item_submenu_obj_create(Elm_Menu_Item *item)
         if (!elm_layout_theme_set(VIEW(item), "menu",
                                   "main_menu_submenu",
                                   elm_widget_style_get(WIDGET(item))))
-          CRITICAL("Failed to set layout!");
+          CRI("Failed to set layout!");
      }
    else
      {
         if (!elm_layout_theme_set(VIEW(item), "menu",
                                   "item_with_submenu",
                                   elm_widget_style_get(WIDGET(item))))
-          CRITICAL("Failed to set layout!");
+          CRI("Failed to set layout!");
      }
 
    elm_object_item_text_set((Elm_Object_Item *)item, item->label);

diff --git a/src/lib/elm_notify.c b/src/lib/elm_notify.c
index cefc49d..459a3f7 100644 (file)
--- a/src/lib/elm_notify.c
+++ b/src/lib/elm_notify.c
@@ -94,7 +94,7 @@ _block_events_theme_apply(Evas_Object *obj)
 
    if (!elm_layout_theme_set
        (sd->block_events, "notify", "block_events", style))
-     CRITICAL("Failed to set layout!");
+     CRI("Failed to set layout!");
 }
 
 static void

diff --git a/src/lib/elm_panel.c b/src/lib/elm_panel.c
index 3dfac24..13d8c3f 100644 (file)
--- a/src/lib/elm_panel.c
+++ b/src/lib/elm_panel.c
@@ -68,13 +68,13 @@ _orient_set_do(Evas_Object *obj)
       case ELM_PANEL_ORIENT_TOP:
         if (!elm_layout_theme_set
               (obj, "panel", "top", elm_widget_style_get(obj)))
-          CRITICAL("Failed to set layout!");
+          CRI("Failed to set layout!");
         break;
 
       case ELM_PANEL_ORIENT_BOTTOM:
         if (!elm_layout_theme_set
               (obj, "panel", "bottom", elm_widget_style_get(obj)))
-          CRITICAL("Failed to set layout!");
+          CRI("Failed to set layout!");
         break;
 
       case ELM_PANEL_ORIENT_LEFT:
@@ -82,13 +82,13 @@ _orient_set_do(Evas_Object *obj)
           {
              if (!elm_layout_theme_set
                    (obj, "panel", "left", elm_widget_style_get(obj)))
-               CRITICAL("Failed to set layout!");
+               CRI("Failed to set layout!");
           }
         else
           {
              if (!elm_layout_theme_set
                    (obj, "panel", "right", elm_widget_style_get(obj)))
-               CRITICAL("Failed to set layout!");
+               CRI("Failed to set layout!");
           }
         break;
 
@@ -97,13 +97,13 @@ _orient_set_do(Evas_Object *obj)
           {
              if (!elm_layout_theme_set
                    (obj, "panel", "right", elm_widget_style_get(obj)))
-               CRITICAL("Failed to set layout!");
+               CRI("Failed to set layout!");
           }
         else
           {
              if (!elm_layout_theme_set
                    (obj, "panel", "left", elm_widget_style_get(obj)))
-               CRITICAL("Failed to set layout!");
+               CRI("Failed to set layout!");
           }
         break;
      }
@@ -361,7 +361,7 @@ _elm_panel_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
 
    /* just to bootstrap and have theme hook to work */
    if (!elm_layout_theme_set(obj, "panel", "top", elm_widget_style_get(obj)))
-     CRITICAL("Failed to set layout!");
+     CRI("Failed to set layout!");
 
    eo_do(obj, elm_wdg_theme(NULL));
 

diff --git a/src/lib/elm_panes.c b/src/lib/elm_panes.c
index 1bb0d73..c837fd7 100644 (file)
--- a/src/lib/elm_panes.c
+++ b/src/lib/elm_panes.c
@@ -202,7 +202,7 @@ _elm_panes_smart_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
 
    if (!elm_layout_theme_set
        (obj, "panes", "vertical", elm_widget_style_get(obj)))
-     CRITICAL("Failed to set layout!");
+     CRI("Failed to set layout!");
 
    elm_panes_content_left_size_set(obj, 0.5);
 

diff --git a/src/lib/elm_priv.h b/src/lib/elm_priv.h
index e99a60b..a8757c3 100644 (file)
--- a/src/lib/elm_priv.h
+++ b/src/lib/elm_priv.h
@@ -47,7 +47,7 @@
 # include <langinfo.h>
 #endif
 
-#define CRITICAL(...) EINA_LOG_DOM_CRIT(_elm_log_dom, __VA_ARGS__)
+#define CRI(...) EINA_LOG_DOM_CRIT(_elm_log_dom, __VA_ARGS__)
 #define ERR(...)      EINA_LOG_DOM_ERR(_elm_log_dom, __VA_ARGS__)
 #define WRN(...)      EINA_LOG_DOM_WARN(_elm_log_dom, __VA_ARGS__)
 #define INF(...)      EINA_LOG_DOM_INFO(_elm_log_dom, __VA_ARGS__)

diff --git a/src/lib/elm_progressbar.c b/src/lib/elm_progressbar.c
index 89e86ed..5606946 100644 (file)
--- a/src/lib/elm_progressbar.c
+++ b/src/lib/elm_progressbar.c
@@ -275,7 +275,7 @@ _elm_progressbar_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
 
    if (!elm_layout_theme_set
        (obj, "progressbar", "horizontal", elm_widget_style_get(obj)))
-     CRITICAL("Failed to set layout!");
+     CRI("Failed to set layout!");
 
    priv->spacer = evas_object_rectangle_add(evas_object_evas_get(obj));
    evas_object_color_set(priv->spacer, 0, 0, 0, 0);

diff --git a/src/lib/elm_radio.c b/src/lib/elm_radio.c
index 4696445..4895a91 100644 (file)
--- a/src/lib/elm_radio.c
+++ b/src/lib/elm_radio.c
@@ -279,7 +279,7 @@ _elm_radio_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
    elm_widget_sub_object_parent_add(obj);
 
    if (!elm_layout_theme_set(obj, "radio", "base", elm_widget_style_get(obj)))
-     CRITICAL("Failed to set layout!");
+     CRI("Failed to set layout!");
 
    elm_layout_signal_callback_add
      (obj, "elm,action,radio,toggle", "*", _radio_on_cb, obj);

diff --git a/src/lib/elm_scroller.c b/src/lib/elm_scroller.c
index edfc9b8..93d5a07 100644 (file)
--- a/src/lib/elm_scroller.c
+++ b/src/lib/elm_scroller.c
@@ -746,7 +746,7 @@ _elm_scroller_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
 
    if (!elm_layout_theme_set
        (obj, "scroller", "base", elm_widget_style_get(obj)))
-     CRITICAL("Failed to set layout!");
+     CRI("Failed to set layout!");
 
    priv->hit_rect = evas_object_rectangle_add(evas_object_evas_get(obj));
    evas_object_smart_member_add(priv->hit_rect, obj);

diff --git a/src/lib/elm_segment_control.c b/src/lib/elm_segment_control.c
index 6fb8a15..1bc7fa3 100644 (file)
--- a/src/lib/elm_segment_control.c
+++ b/src/lib/elm_segment_control.c
@@ -613,7 +613,7 @@ _elm_segment_control_smart_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list EIN
 
    if (!elm_layout_theme_set
        (obj, "segment_control", "base", elm_widget_style_get(obj)))
-     CRITICAL("Failed to set layout!");
+     CRI("Failed to set layout!");
 
    evas_object_event_callback_add
      (obj, EVAS_CALLBACK_RESIZE, _on_move_resize, obj);

diff --git a/src/lib/elm_separator.c b/src/lib/elm_separator.c
index 2b42560..91c9252 100644 (file)
--- a/src/lib/elm_separator.c
+++ b/src/lib/elm_separator.c
@@ -57,7 +57,7 @@ _elm_separator_smart_add(Eo *obj, void *_pd __UNUSED__,
 
    if (!elm_layout_theme_set
        (obj, "separator", "vertical", elm_widget_style_get(obj)))
-     CRITICAL("Failed to set layout!");
+     CRI("Failed to set layout!");
 
    elm_layout_sizing_eval(obj);
 }

diff --git a/src/lib/elm_slider.c b/src/lib/elm_slider.c
index 02519c1..495ddf7 100644 (file)
--- a/src/lib/elm_slider.c
+++ b/src/lib/elm_slider.c
@@ -833,7 +833,7 @@ _elm_slider_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
 
    if (!elm_layout_theme_set
        (obj, "slider", "horizontal", elm_widget_style_get(obj)))
-     CRITICAL("Failed to set layout!");
+     CRI("Failed to set layout!");
 
    elm_layout_signal_callback_add(obj, "drag", "*", _drag, obj);
    elm_layout_signal_callback_add(obj, "drag,start", "*", _drag_start, obj);

diff --git a/src/lib/elm_slideshow.c b/src/lib/elm_slideshow.c
index acfcaf5..eb3cf0e 100644 (file)
--- a/src/lib/elm_slideshow.c
+++ b/src/lib/elm_slideshow.c
@@ -317,7 +317,7 @@ _elm_slideshow_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
 
    if (!elm_layout_theme_set
        (obj, "slideshow", "base", elm_widget_style_get(obj)))
-     CRITICAL("Failed to set layout!");
+     CRI("Failed to set layout!");
 
    priv->transitions = elm_widget_stringlist_get
        (edje_object_data_get(wd->resize_obj,

diff --git a/src/lib/elm_spinner.c b/src/lib/elm_spinner.c
index 79b924b..da0272d 100644 (file)
--- a/src/lib/elm_spinner.c
+++ b/src/lib/elm_spinner.c
@@ -684,7 +684,7 @@ _elm_spinner_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
 
    if (!elm_layout_theme_set(obj, "spinner", "base",
                              elm_widget_style_get(obj)))
-     CRITICAL("Failed to set layout!");
+     CRI("Failed to set layout!");
 
    elm_layout_signal_callback_add(obj, "drag", "*", _drag_cb, obj);
    elm_layout_signal_callback_add(obj, "drag,start", "*", _drag_start_cb, obj);
@@ -756,7 +756,7 @@ _elm_spinner_smart_theme(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
                               elm_widget_style_get(obj));
    if (ret) *ret = int_ret;
 
-   if (!int_ret) CRITICAL("Failed to set layout!");
+   if (!int_ret) CRI("Failed to set layout!");
 
    if (_elm_config->access_mode)
      _access_spinner_register(obj, EINA_TRUE);

diff --git a/src/lib/elm_thumb.c b/src/lib/elm_thumb.c
index 8981a78..013d7fc 100644 (file)
--- a/src/lib/elm_thumb.c
+++ b/src/lib/elm_thumb.c
@@ -550,7 +550,7 @@ _elm_thumb_smart_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
    elm_widget_sub_object_parent_add(obj);
 
    if (!elm_layout_theme_set(obj, "thumb", "base", elm_widget_style_get(obj)))
-     CRITICAL("Failed to set layout!");
+     CRI("Failed to set layout!");
 
    evas_object_event_callback_add
      (obj, EVAS_CALLBACK_MOUSE_DOWN, _mouse_down_cb, obj);

diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c
index 1feb29f..5ac9bc2 100644 (file)
--- a/src/lib/elm_toolbar.c
+++ b/src/lib/elm_toolbar.c
@@ -1167,7 +1167,7 @@ _elm_toolbar_smart_theme(Eo *obj, void *_pd, va_list *list)
 
    if (!elm_layout_theme_set
        (sd->more, "toolbar", "more", elm_widget_style_get(obj)))
-     CRITICAL("Failed to set layout!");
+     CRI("Failed to set layout!");
    if (sd->vertical)
      edje_object_signal_emit(sd->more, "elm,orient,vertical", "elm");
    else
@@ -2535,7 +2535,7 @@ _elm_toolbar_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
 
    priv->more = elm_layout_add(obj);
    if (!elm_layout_theme_set(priv->more, "toolbar", "more", "default"))
-     CRITICAL("Failed to set layout!");
+     CRI("Failed to set layout!");
    if (priv->vertical)
      edje_object_signal_emit(priv->more, "elm,orient,vertical", "elm");
    else

diff --git a/src/lib/elm_transit.c b/src/lib/elm_transit.c
index 77d2a0e..c124aa6 100644 (file)
--- a/src/lib/elm_transit.c
+++ b/src/lib/elm_transit.c
@@ -9,7 +9,7 @@
 #define ELM_TRANSIT_CHECK_OR_RETURN(transit, ...) \
    do { \
       if (!transit) { \
-         CRITICAL("Elm_Transit " # transit " is NULL!"); \
+         CRI("Elm_Transit " # transit " is NULL!"); \
          return __VA_ARGS__; \
       } \
       if (!EINA_MAGIC_CHECK(transit, ELM_TRANSIT_MAGIC)) { \

diff --git a/src/lib/elm_video.c b/src/lib/elm_video.c
index 7428195..c602838 100644 (file)
--- a/src/lib/elm_video.c
+++ b/src/lib/elm_video.c
@@ -226,7 +226,7 @@ _elm_video_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
    emotion_object_init(priv->emotion, NULL);
 
    if (!elm_layout_theme_set(obj, "video", "base", elm_widget_style_get(obj)))
-     CRITICAL("Failed to set layout!");
+     CRI("Failed to set layout!");
 
    elm_layout_content_set(obj, "elm.swallow.video", priv->emotion);
 

diff --git a/src/lib/elm_web.c b/src/lib/elm_web.c
index 3575c1f..4e2cf3f 100644 (file)
--- a/src/lib/elm_web.c
+++ b/src/lib/elm_web.c
@@ -806,7 +806,7 @@ _view_add(Evas_Object *parent)
         smart = evas_smart_class_new(&api.sc);
         if (!smart)
           {
-             CRITICAL("Could not create smart class");
+             CRI("Could not create smart class");
              return NULL;
           }
      }

diff --git a/src/lib/elm_web2.c b/src/lib/elm_web2.c
index b911a55..fb2cbd9 100644 (file)
--- a/src/lib/elm_web2.c
+++ b/src/lib/elm_web2.c
@@ -81,7 +81,7 @@ _view_add(Evas_Object *parent)
         smart = evas_smart_class_new(&api.sc);
         if (!smart)
           {
-             CRITICAL("Could not create smart class");
+             CRI("Could not create smart class");
              return NULL;
           }
      }

diff --git a/src/lib/elm_widget.c b/src/lib/elm_widget.c
index 44559d1..5d253dc 100644 (file)
--- a/src/lib/elm_widget.c
+++ b/src/lib/elm_widget.c
@@ -707,7 +707,7 @@ elm_widget_api_check(int ver)
 {
    if (ver != ELM_INTERNAL_API_VERSION)
      {
-        CRITICAL("Elementary widget api versions do not match");
+        CRI("Elementary widget api versions do not match");
         return EINA_FALSE;
      }
    return EINA_TRUE;

diff --git a/src/lib/elm_widget.h b/src/lib/elm_widget.h
index 6992fbf..31cd870 100644 (file)
--- a/src/lib/elm_widget.h
+++ b/src/lib/elm_widget.h
@@ -799,7 +799,7 @@ EAPI void             elm_widget_tree_dot_dump(const Evas_Object *top, FILE *out
         NULL);                                      \
   if (!ptr)                                         \
     {                                                \
-       CRITICAL("no widget data for object %p (%s)", \
+       CRI("no widget data for object %p (%s)", \
                 o, evas_object_type_get(o));        \
        return __VA_ARGS__;                           \
     }
@@ -1042,7 +1042,7 @@ EAPI void             elm_widget_tree_dot_dump(const Evas_Object *top, FILE *out
 #define ELM_WIDGET_ITEM_CHECK_OR_RETURN(item, ...)              \
    do {                                                         \
         if (!item) {                                            \
-             CRITICAL("Elm_Widget_Item " # item " is NULL");    \
+             CRI("Elm_Widget_Item " # item " is NULL");    \
              return __VA_ARGS__;                                \
         }                                                       \
        if (!EINA_MAGIC_CHECK(item, ELM_WIDGET_ITEM_MAGIC)) {    \
@@ -1054,7 +1054,7 @@ EAPI void             elm_widget_tree_dot_dump(const Evas_Object *top, FILE *out
 #define ELM_WIDGET_ITEM_CHECK_OR_GOTO(item, label)              \
   do {                                                          \
         if (!item) {                                            \
-             CRITICAL("Elm_Widget_Item " # item " is NULL");    \
+             CRI("Elm_Widget_Item " # item " is NULL");    \
              goto label;                                        \
         }                                                       \
        if (!EINA_MAGIC_CHECK(item, ELM_WIDGET_ITEM_MAGIC)) {    \

diff --git a/src/lib/elm_widget_actionslider.h b/src/lib/elm_widget_actionslider.h
index 2d72a64..61bb2d0 100644 (file)
--- a/src/lib/elm_widget_actionslider.h
+++ b/src/lib/elm_widget_actionslider.h
@@ -39,7 +39,7 @@ struct _Elm_Actionslider_Smart_Data
   ELM_ACTIONSLIDER_DATA_GET(o, ptr);                    \
   if (!ptr)                                          \
     {                                                \
-       CRITICAL("No widget data for object %p (%s)", \
+       CRI("No widget data for object %p (%s)", \
                 o, evas_object_type_get(o));         \
        return;                                       \
     }
@@ -48,7 +48,7 @@ struct _Elm_Actionslider_Smart_Data
   ELM_ACTIONSLIDER_DATA_GET(o, ptr);                         \
   if (!ptr)                                               \
     {                                                     \
-       CRITICAL("No widget data for object %p (%s)",      \
+       CRI("No widget data for object %p (%s)",      \
                 o, evas_object_type_get(o));              \
        return val;                                        \
     }

diff --git a/src/lib/elm_widget_bg.h b/src/lib/elm_widget_bg.h
index 2f34eea..8174eac 100644 (file)
--- a/src/lib/elm_widget_bg.h
+++ b/src/lib/elm_widget_bg.h
@@ -48,7 +48,7 @@ struct _Elm_Bg_Smart_Data
   ELM_BG_DATA_GET(o, ptr);                           \
   if (!ptr)                                          \
     {                                                \
-       CRITICAL("No widget data for object %p (%s)", \
+       CRI("No widget data for object %p (%s)", \
                 o, evas_object_type_get(o));         \
        return;                                       \
     }
@@ -57,7 +57,7 @@ struct _Elm_Bg_Smart_Data
   ELM_BG_DATA_GET(o, ptr);                           \
   if (!ptr)                                          \
     {                                                \
-       CRITICAL("No widget data for object %p (%s)", \
+       CRI("No widget data for object %p (%s)", \
                 o, evas_object_type_get(o));         \
        return val;                                   \
     }

diff --git a/src/lib/elm_widget_box.h b/src/lib/elm_widget_box.h
index 4a498bb..92f39f4 100644 (file)
--- a/src/lib/elm_widget_box.h
+++ b/src/lib/elm_widget_box.h
@@ -70,7 +70,7 @@ struct _Transition_Animation_Data
   ELM_BOX_DATA_GET(o, ptr);                          \
   if (!ptr)                                          \
     {                                                \
-       CRITICAL("No widget data for object %p (%s)", \
+       CRI("No widget data for object %p (%s)", \
                 o, evas_object_type_get(o));         \
        return;                                       \
     }
@@ -79,7 +79,7 @@ struct _Transition_Animation_Data
   ELM_BOX_DATA_GET(o, ptr);                          \
   if (!ptr)                                          \
     {                                                \
-       CRITICAL("No widget data for object %p (%s)", \
+       CRI("No widget data for object %p (%s)", \
                 o, evas_object_type_get(o));         \
        return val;                                   \
     }

diff --git a/src/lib/elm_widget_bubble.h b/src/lib/elm_widget_bubble.h
index 5620f06..c78ee89 100644 (file)
--- a/src/lib/elm_widget_bubble.h
+++ b/src/lib/elm_widget_bubble.h
@@ -35,7 +35,7 @@ struct _Elm_Bubble_Smart_Data
   ELM_BUBBLE_DATA_GET(o, ptr);                       \
   if (!ptr)                                          \
     {                                                \
-       CRITICAL("No widget data for object %p (%s)", \
+       CRI("No widget data for object %p (%s)", \
                 o, evas_object_type_get(o));         \
        return;                                       \
     }
@@ -44,7 +44,7 @@ struct _Elm_Bubble_Smart_Data
   ELM_BUBBLE_DATA_GET(o, ptr);                         \
   if (!ptr)                                            \
     {                                                  \
-       CRITICAL("No widget data for object %p (%s)",   \
+       CRI("No widget data for object %p (%s)",   \
                 o, evas_object_type_get(o));           \
        return val;                                     \
     }

diff --git a/src/lib/elm_widget_button.h b/src/lib/elm_widget_button.h
index b768111..cedb864 100644 (file)
--- a/src/lib/elm_widget_button.h
+++ b/src/lib/elm_widget_button.h
@@ -41,7 +41,7 @@ typedef struct _Elm_Button_Smart_Data
   ELM_BUTTON_DATA_GET(o, ptr);                       \
   if (!ptr)                                          \
     {                                                \
-       CRITICAL("No widget data for object %p (%s)", \
+       CRI("No widget data for object %p (%s)", \
                 o, evas_object_type_get(o));         \
        return;                                       \
     }
@@ -50,7 +50,7 @@ typedef struct _Elm_Button_Smart_Data
   ELM_BUTTON_DATA_GET(o, ptr);                         \
   if (!ptr)                                            \
     {                                                  \
-       CRITICAL("No widget data for object %p (%s)",   \
+       CRI("No widget data for object %p (%s)",   \
                 o, evas_object_type_get(o));           \
        return val;                                     \
     }

diff --git a/src/lib/elm_widget_check.h b/src/lib/elm_widget_check.h
index 4a17964..e5b05d7 100644 (file)
--- a/src/lib/elm_widget_check.h
+++ b/src/lib/elm_widget_check.h
@@ -35,7 +35,7 @@ struct _Elm_Check_Smart_Data
   ELM_CHECK_DATA_GET(o, ptr);                        \
   if (!ptr)                                          \
     {                                                \
-       CRITICAL("No widget data for object %p (%s)", \
+       CRI("No widget data for object %p (%s)", \
                 o, evas_object_type_get(o));         \
        return;                                       \
     }
@@ -44,7 +44,7 @@ struct _Elm_Check_Smart_Data
   ELM_CHECK_DATA_GET(o, ptr);                         \
   if (!ptr)                                           \
     {                                                 \
-       CRITICAL("No widget data for object %p (%s)",  \
+       CRI("No widget data for object %p (%s)",  \
                 o, evas_object_type_get(o));          \
        return val;                                    \
     }

diff --git a/src/lib/elm_widget_clock.h b/src/lib/elm_widget_clock.h
index b91297a..9a06d6d 100644 (file)
--- a/src/lib/elm_widget_clock.h
+++ b/src/lib/elm_widget_clock.h
@@ -58,7 +58,7 @@ struct _Elm_Clock_Smart_Data
   ELM_CLOCK_DATA_GET(o, ptr);                        \
   if (!ptr)                                          \
     {                                                \
-       CRITICAL("No widget data for object %p (%s)", \
+       CRI("No widget data for object %p (%s)", \
                 o, evas_object_type_get(o));         \
        return;                                       \
     }
@@ -67,7 +67,7 @@ struct _Elm_Clock_Smart_Data
   ELM_CLOCK_DATA_GET(o, ptr);                         \
   if (!ptr)                                           \
     {                                                 \
-       CRITICAL("No widget data for object %p (%s)",  \
+       CRI("No widget data for object %p (%s)",  \
                 o, evas_object_type_get(o));          \
        return val;                                    \
     }

diff --git a/src/lib/elm_widget_colorselector.h b/src/lib/elm_widget_colorselector.h
index 680b208..d610872 100644 (file)
--- a/src/lib/elm_widget_colorselector.h
+++ b/src/lib/elm_widget_colorselector.h
@@ -102,7 +102,7 @@ struct _Elm_Color_Item
   ELM_COLORSELECTOR_DATA_GET(o, ptr);                \
   if (!ptr)                                          \
     {                                                \
-       CRITICAL("No widget data for object %p (%s)", \
+       CRI("No widget data for object %p (%s)", \
                 o, evas_object_type_get(o));         \
        return;                                       \
     }
@@ -111,7 +111,7 @@ struct _Elm_Color_Item
   ELM_COLORSELECTOR_DATA_GET(o, ptr);                         \
   if (!ptr)                                                   \
     {                                                         \
-       CRITICAL("No widget data for object %p (%s)",          \
+       CRI("No widget data for object %p (%s)",          \
                 o, evas_object_type_get(o));                  \
        return val;                                            \
     }

diff --git a/src/lib/elm_widget_conform.h b/src/lib/elm_widget_conform.h
index db8bb34..e1826c5 100644 (file)
--- a/src/lib/elm_widget_conform.h
+++ b/src/lib/elm_widget_conform.h
@@ -68,7 +68,7 @@ enum _Conformant_Part_Type
   ELM_CONFORMANT_DATA_GET(o, ptr);                   \
   if (!ptr)                                          \
     {                                                \
-       CRITICAL("No widget data for object %p (%s)", \
+       CRI("No widget data for object %p (%s)", \
                 o, evas_object_type_get(o));         \
        return;                                       \
     }
@@ -77,7 +77,7 @@ enum _Conformant_Part_Type
   ELM_CONFORMANT_DATA_GET(o, ptr);                         \
   if (!ptr)                                                \
     {                                                      \
-       CRITICAL("No widget data for object %p (%s)",       \
+       CRI("No widget data for object %p (%s)",       \
                 o, evas_object_type_get(o));               \
        return val;                                         \
     }

diff --git a/src/lib/elm_widget_ctxpopup.h b/src/lib/elm_widget_ctxpopup.h
index bdd5921..2ab8bbc 100644 (file)
--- a/src/lib/elm_widget_ctxpopup.h
+++ b/src/lib/elm_widget_ctxpopup.h
@@ -66,7 +66,7 @@ struct _Elm_Ctxpopup_Smart_Data
   ELM_CTXPOPUP_DATA_GET(o, ptr);                     \
   if (!ptr)                                          \
     {                                                \
-       CRITICAL("No widget data for object %p (%s)", \
+       CRI("No widget data for object %p (%s)", \
                 o, evas_object_type_get(o));         \
        return;                                       \
     }
@@ -75,7 +75,7 @@ struct _Elm_Ctxpopup_Smart_Data
   ELM_CTXPOPUP_DATA_GET(o, ptr);                         \
   if (!ptr)                                              \
     {                                                    \
-       CRITICAL("No widget data for object %p (%s)",     \
+       CRI("No widget data for object %p (%s)",     \
                 o, evas_object_type_get(o));             \
        return val;                                       \
     }

diff --git a/src/lib/elm_widget_datetime.h b/src/lib/elm_widget_datetime.h
index 44a3901..68d6ca6 100644 (file)
--- a/src/lib/elm_widget_datetime.h
+++ b/src/lib/elm_widget_datetime.h
@@ -85,7 +85,7 @@ struct _Format_Map
   ELM_DATETIME_DATA_GET(o, ptr);                     \
   if (!ptr)                                          \
     {                                                \
-       CRITICAL("No widget data for object %p (%s)", \
+       CRI("No widget data for object %p (%s)", \
                 o, evas_object_type_get(o));         \
        return;                                       \
     }
@@ -94,7 +94,7 @@ struct _Format_Map
   ELM_DATETIME_DATA_GET(o, ptr);                         \
   if (!ptr)                                              \
     {                                                    \
-       CRITICAL("No widget data for object %p (%s)",     \
+       CRI("No widget data for object %p (%s)",     \
                 o, evas_object_type_get(o));             \
        return val;                                       \
     }

diff --git a/src/lib/elm_widget_dayselector.h b/src/lib/elm_widget_dayselector.h
index 0006868..9207164 100644 (file)
--- a/src/lib/elm_widget_dayselector.h
+++ b/src/lib/elm_widget_dayselector.h
@@ -46,7 +46,7 @@ struct _Elm_Dayselector_Item
   ELM_DAYSELECTOR_DATA_GET(o, ptr);                  \
   if (!ptr)                                          \
     {                                                \
-       CRITICAL("No widget data for object %p (%s)", \
+       CRI("No widget data for object %p (%s)", \
                 o, evas_object_type_get(o));         \
        return;                                       \
     }
@@ -55,7 +55,7 @@ struct _Elm_Dayselector_Item
   ELM_DAYSELECTOR_DATA_GET(o, ptr);                         \
   if (!ptr)                                                 \
     {                                                       \
-       CRITICAL("No widget data for object %p (%s)",        \
+       CRI("No widget data for object %p (%s)",        \
                 o, evas_object_type_get(o));                \
        return val;                                          \
     }

diff --git a/src/lib/elm_widget_diskselector.h b/src/lib/elm_widget_diskselector.h
index 68c95b7..42813b1 100644 (file)
--- a/src/lib/elm_widget_diskselector.h
+++ b/src/lib/elm_widget_diskselector.h
@@ -71,7 +71,7 @@ struct _Elm_Diskselector_Item
   ELM_DISKSELECTOR_DATA_GET(o, ptr);                 \
   if (!ptr)                                          \
     {                                                \
-       CRITICAL("No widget data for object %p (%s)", \
+       CRI("No widget data for object %p (%s)", \
                 o, evas_object_type_get(o));         \
        return;                                       \
     }
@@ -80,7 +80,7 @@ struct _Elm_Diskselector_Item
   ELM_DISKSELECTOR_DATA_GET(o, ptr);                         \
   if (!ptr)                                                  \
     {                                                        \
-       CRITICAL("No widget data for object %p (%s)",         \
+       CRI("No widget data for object %p (%s)",         \
                 o, evas_object_type_get(o));                 \
        return val;                                           \
     }

diff --git a/src/lib/elm_widget_entry.h b/src/lib/elm_widget_entry.h
index 6548781..4e37a10 100644 (file)
--- a/src/lib/elm_widget_entry.h
+++ b/src/lib/elm_widget_entry.h
@@ -149,7 +149,7 @@ typedef enum _Length_Unit
   ELM_ENTRY_DATA_GET(o, ptr);                        \
   if (!ptr)                                          \
     {                                                \
-       CRITICAL("No widget data for object %p (%s)", \
+       CRI("No widget data for object %p (%s)", \
                 o, evas_object_type_get(o));         \
        return;                                       \
     }
@@ -158,7 +158,7 @@ typedef enum _Length_Unit
   ELM_ENTRY_DATA_GET(o, ptr);                         \
   if (!ptr)                                           \
     {                                                 \
-       CRITICAL("No widget data for object %p (%s)",  \
+       CRI("No widget data for object %p (%s)",  \
                 o, evas_object_type_get(o));          \
        return val;                                    \
     }

diff --git a/src/lib/elm_widget_fileselector.h b/src/lib/elm_widget_fileselector.h
index bcc10bc..c52948d 100644 (file)
--- a/src/lib/elm_widget_fileselector.h
+++ b/src/lib/elm_widget_fileselector.h
@@ -117,7 +117,7 @@ struct _Elm_Fileselector_Filter
   ELM_FILESELECTOR_DATA_GET(o, ptr);                 \
   if (!ptr)                                          \
     {                                                \
-       CRITICAL("No widget data for object %p (%s)", \
+       CRI("No widget data for object %p (%s)", \
                 o, evas_object_type_get(o));         \
        return;                                       \
     }
@@ -126,7 +126,7 @@ struct _Elm_Fileselector_Filter
   ELM_FILESELECTOR_DATA_GET(o, ptr);                         \
   if (!ptr)                                                  \
     {                                                        \
-       CRITICAL("No widget data for object %p (%s)",         \
+       CRI("No widget data for object %p (%s)",         \
                 o, evas_object_type_get(o));                 \
        return val;                                           \
     }

diff --git a/src/lib/elm_widget_fileselector_button.h b/src/lib/elm_widget_fileselector_button.h
index d27aeb9..d47222a 100644 (file)
--- a/src/lib/elm_widget_fileselector_button.h
+++ b/src/lib/elm_widget_fileselector_button.h
@@ -51,7 +51,7 @@ struct _Elm_Fileselector_Button_Smart_Data
   ELM_FILESELECTOR_BUTTON_DATA_GET(o, ptr);                \
   if (!ptr)                                                \
     {                                                      \
-       CRITICAL("No widget data for object %p (%s)",       \
+       CRI("No widget data for object %p (%s)",       \
                 o, evas_object_type_get(o));               \
        return;                                             \
     }
@@ -60,7 +60,7 @@ struct _Elm_Fileselector_Button_Smart_Data
   ELM_FILESELECTOR_BUTTON_DATA_GET(o, ptr);                         \
   if (!ptr)                                                         \
     {                                                               \
-       CRITICAL("No widget data for object %p (%s)",                \
+       CRI("No widget data for object %p (%s)",                \
                 o, evas_object_type_get(o));                        \
        return val;                                                  \
     }

diff --git a/src/lib/elm_widget_fileselector_entry.h b/src/lib/elm_widget_fileselector_entry.h
index 7c3a2c8..4cac805 100644 (file)
--- a/src/lib/elm_widget_fileselector_entry.h
+++ b/src/lib/elm_widget_fileselector_entry.h
@@ -41,7 +41,7 @@ struct _Elm_Fileselector_Entry_Smart_Data
   ELM_FILESELECTOR_ENTRY_DATA_GET(o, ptr);                \
   if (!ptr)                                               \
     {                                                     \
-       CRITICAL("No widget data for object %p (%s)",      \
+       CRI("No widget data for object %p (%s)",      \
                 o, evas_object_type_get(o));              \
        return;                                            \
     }
@@ -50,7 +50,7 @@ struct _Elm_Fileselector_Entry_Smart_Data
   ELM_FILESELECTOR_ENTRY_DATA_GET(o, ptr);                         \
   if (!ptr)                                                        \
     {                                                              \
-       CRITICAL("No widget data for object %p (%s)",               \
+       CRI("No widget data for object %p (%s)",               \
                 o, evas_object_type_get(o));                       \
        return val;                                                 \
     }

diff --git a/src/lib/elm_widget_flip.h b/src/lib/elm_widget_flip.h
index bf6aeec..a7cd670 100644 (file)
--- a/src/lib/elm_widget_flip.h
+++ b/src/lib/elm_widget_flip.h
@@ -82,7 +82,7 @@ struct _Vertex3
   ELM_FLIP_DATA_GET(o, ptr);                         \
   if (!ptr)                                          \
     {                                                \
-       CRITICAL("No widget data for object %p (%s)", \
+       CRI("No widget data for object %p (%s)", \
                 o, evas_object_type_get(o));         \
        return;                                       \
     }
@@ -91,7 +91,7 @@ struct _Vertex3
   ELM_FLIP_DATA_GET(o, ptr);                         \
   if (!ptr)                                          \
     {                                                \
-       CRITICAL("No widget data for object %p (%s)", \
+       CRI("No widget data for object %p (%s)", \
                 o, evas_object_type_get(o));         \
        return val;                                   \
     }

diff --git a/src/lib/elm_widget_flipselector.h b/src/lib/elm_widget_flipselector.h
index 8b14e08..0b76e31 100644 (file)
--- a/src/lib/elm_widget_flipselector.h
+++ b/src/lib/elm_widget_flipselector.h
@@ -53,7 +53,7 @@ struct _Elm_Flipselector_Item
   ELM_FLIPSELECTOR_DATA_GET(o, ptr);                 \
   if (!ptr)                                          \
     {                                                \
-       CRITICAL("No widget data for object %p (%s)", \
+       CRI("No widget data for object %p (%s)", \
                 o, evas_object_type_get(o));         \
        return;                                       \
     }
@@ -62,7 +62,7 @@ struct _Elm_Flipselector_Item
   ELM_FLIPSELECTOR_DATA_GET(o, ptr);                         \
   if (!ptr)                                                  \
     {                                                        \
-       CRITICAL("No widget data for object %p (%s)",         \
+       CRI("No widget data for object %p (%s)",         \
                 o, evas_object_type_get(o));                 \
        return val;                                           \
     }

diff --git a/src/lib/elm_widget_frame.h b/src/lib/elm_widget_frame.h
index b726da2..e2ee9f0 100644 (file)
--- a/src/lib/elm_widget_frame.h
+++ b/src/lib/elm_widget_frame.h
@@ -36,7 +36,7 @@ struct _Elm_Frame_Smart_Data
   ELM_FRAME_DATA_GET(o, ptr);                        \
   if (!ptr)                                          \
     {                                                \
-       CRITICAL("No widget data for object %p (%s)", \
+       CRI("No widget data for object %p (%s)", \
                 o, evas_object_type_get(o));         \
        return;                                       \
     }
@@ -45,7 +45,7 @@ struct _Elm_Frame_Smart_Data
   ELM_FRAME_DATA_GET(o, ptr);                         \
   if (!ptr)                                           \
     {                                                 \
-       CRITICAL("No widget data for object %p (%s)",  \
+       CRI("No widget data for object %p (%s)",  \
                 o, evas_object_type_get(o));          \
        return val;                                    \
     }

diff --git a/src/lib/elm_widget_gengrid.h b/src/lib/elm_widget_gengrid.h
index e5ea80c..f04e0d4 100644 (file)
--- a/src/lib/elm_widget_gengrid.h
+++ b/src/lib/elm_widget_gengrid.h
@@ -145,7 +145,7 @@ struct _Elm_Gengrid_Pan_Smart_Data
   ELM_GENGRID_DATA_GET(o, ptr);                      \
   if (!ptr)                                          \
     {                                                \
-       CRITICAL("No widget data for object %p (%s)", \
+       CRI("No widget data for object %p (%s)", \
                 o, evas_object_type_get(o));         \
        return;                                       \
     }
@@ -154,7 +154,7 @@ struct _Elm_Gengrid_Pan_Smart_Data
   ELM_GENGRID_DATA_GET(o, ptr);                         \
   if (!ptr)                                             \
     {                                                   \
-       CRITICAL("No widget data for object %p (%s)",    \
+       CRI("No widget data for object %p (%s)",    \
                 o, evas_object_type_get(o));            \
        return val;                                      \
     }

diff --git a/src/lib/elm_widget_genlist.h b/src/lib/elm_widget_genlist.h
index db87119..734f545 100644 (file)
--- a/src/lib/elm_widget_genlist.h
+++ b/src/lib/elm_widget_genlist.h
@@ -296,7 +296,7 @@ struct _Elm_Genlist_Pan_Smart_Data
   ELM_GENLIST_DATA_GET(o, ptr);                      \
   if (!ptr)                                          \
     {                                                \
-       CRITICAL("No widget data for object %p (%s)", \
+       CRI("No widget data for object %p (%s)", \
                 o, evas_object_type_get(o));         \
        return;                                       \
     }
@@ -305,7 +305,7 @@ struct _Elm_Genlist_Pan_Smart_Data
   ELM_GENLIST_DATA_GET(o, ptr);                         \
   if (!ptr)                                             \
     {                                                   \
-       CRITICAL("No widget data for object %p (%s)",    \
+       CRI("No widget data for object %p (%s)",    \
                 o, evas_object_type_get(o));            \
        return val;                                      \
     }

diff --git a/src/lib/elm_widget_glview.h b/src/lib/elm_widget_glview.h
index e310d84..5f5ba5e 100644 (file)
--- a/src/lib/elm_widget_glview.h
+++ b/src/lib/elm_widget_glview.h
@@ -53,7 +53,7 @@ struct _Elm_Glview_Smart_Data
   ELM_GLVIEW_DATA_GET(o, ptr);                          \
   if (!ptr)                                          \
     {                                                \
-       CRITICAL("No widget data for object %p (%s)", \
+       CRI("No widget data for object %p (%s)", \
                 o, evas_object_type_get(o));         \
        return;                                       \
     }
@@ -62,7 +62,7 @@ struct _Elm_Glview_Smart_Data
   ELM_GLVIEW_DATA_GET(o, ptr);                          \
   if (!ptr)                                          \
     {                                                \
-       CRITICAL("No widget data for object %p (%s)", \
+       CRI("No widget data for object %p (%s)", \
                 o, evas_object_type_get(o));         \
        return val;                                   \
     }

diff --git a/src/lib/elm_widget_hover.h b/src/lib/elm_widget_hover.h
index db4868e..dcfd30e 100644 (file)
--- a/src/lib/elm_widget_hover.h
+++ b/src/lib/elm_widget_hover.h
@@ -53,7 +53,7 @@ struct _Elm_Hover_Smart_Data
   ELM_HOVER_DATA_GET(o, ptr);                        \
   if (!ptr)                                          \
     {                                                \
-       CRITICAL("No widget data for object %p (%s)", \
+       CRI("No widget data for object %p (%s)", \
                 o, evas_object_type_get(o));         \
        return;                                       \
     }
@@ -62,7 +62,7 @@ struct _Elm_Hover_Smart_Data
   ELM_HOVER_DATA_GET(o, ptr);                         \
   if (!ptr)                                           \
     {                                                 \
-       CRITICAL("No widget data for object %p (%s)",  \
+       CRI("No widget data for object %p (%s)",  \
                 o, evas_object_type_get(o));          \
        return val;                                    \
     }

diff --git a/src/lib/elm_widget_hoversel.h b/src/lib/elm_widget_hoversel.h
index 5a2b7b5..3552088 100644 (file)
--- a/src/lib/elm_widget_hoversel.h
+++ b/src/lib/elm_widget_hoversel.h
@@ -56,7 +56,7 @@ struct _Elm_Hoversel_Item
   ELM_HOVERSEL_DATA_GET(o, ptr);                     \
   if (!ptr)                                          \
     {                                                \
-       CRITICAL("No widget data for object %p (%s)", \
+       CRI("No widget data for object %p (%s)", \
                 o, evas_object_type_get(o));         \
        return;                                       \
     }
@@ -65,7 +65,7 @@ struct _Elm_Hoversel_Item
   ELM_HOVERSEL_DATA_GET(o, ptr);                         \
   if (!ptr)                                              \
     {                                                    \
-       CRITICAL("No widget data for object %p (%s)",     \
+       CRI("No widget data for object %p (%s)",     \
                 o, evas_object_type_get(o));             \
        return val;                                       \
     }

diff --git a/src/lib/elm_widget_icon.h b/src/lib/elm_widget_icon.h
index 6dd0e3e..64509a6 100644 (file)
--- a/src/lib/elm_widget_icon.h
+++ b/src/lib/elm_widget_icon.h
@@ -62,7 +62,7 @@ struct _Elm_Icon_Smart_Data
   ELM_ICON_DATA_GET(o, ptr);                         \
   if (!ptr)                                          \
     {                                                \
-       CRITICAL("No widget data for object %p (%s)", \
+       CRI("No widget data for object %p (%s)", \
                 o, evas_object_type_get(o));         \
        return;                                       \
     }
@@ -71,7 +71,7 @@ struct _Elm_Icon_Smart_Data
   ELM_ICON_DATA_GET(o, ptr);                         \
   if (!ptr)                                          \
     {                                                \
-       CRITICAL("No widget data for object %p (%s)", \
+       CRI("No widget data for object %p (%s)", \
                 o, evas_object_type_get(o));         \
        return val;                                   \
     }

diff --git a/src/lib/elm_widget_image.h b/src/lib/elm_widget_image.h
index 16ec392..7a2674d 100644 (file)
--- a/src/lib/elm_widget_image.h
+++ b/src/lib/elm_widget_image.h
@@ -73,7 +73,7 @@ struct _Elm_Image_Smart_Data
   ELM_IMAGE_DATA_GET(o, ptr);                        \
   if (!ptr)                                          \
     {                                                \
-       CRITICAL("No widget data for object %p (%s)", \
+       CRI("No widget data for object %p (%s)", \
                 o, evas_object_type_get(o));         \
        return;                                       \
     }
@@ -82,7 +82,7 @@ struct _Elm_Image_Smart_Data
   ELM_IMAGE_DATA_GET(o, ptr);                         \
   if (!ptr)                                           \
     {                                                 \
-       CRITICAL("No widget data for object %p (%s)",  \
+       CRI("No widget data for object %p (%s)",  \
                 o, evas_object_type_get(o));          \
        return val;                                    \
     }

diff --git a/src/lib/elm_widget_index.h b/src/lib/elm_widget_index.h
index 288a610..cf5ea72 100644 (file)
--- a/src/lib/elm_widget_index.h
+++ b/src/lib/elm_widget_index.h
@@ -74,7 +74,7 @@ struct _Elm_Index_Omit
   ELM_INDEX_DATA_GET(o, ptr);                        \
   if (!ptr)                                          \
     {                                                \
-       CRITICAL("No widget data for object %p (%s)", \
+       CRI("No widget data for object %p (%s)", \
                 o, evas_object_type_get(o));         \
        return;                                       \
     }
@@ -83,7 +83,7 @@ struct _Elm_Index_Omit
   ELM_INDEX_DATA_GET(o, ptr);                         \
   if (!ptr)                                           \
     {                                                 \
-       CRITICAL("No widget data for object %p (%s)",  \
+       CRI("No widget data for object %p (%s)",  \
                 o, evas_object_type_get(o));          \
        return val;                                    \
     }

diff --git a/src/lib/elm_widget_inwin.h b/src/lib/elm_widget_inwin.h
index 2c90ee3..1623b47 100644 (file)
--- a/src/lib/elm_widget_inwin.h
+++ b/src/lib/elm_widget_inwin.h
@@ -33,7 +33,7 @@ struct _Elm_Inwin_Smart_Data
   ELM_INWIN_DATA_GET(o, ptr);                        \
   if (!ptr)                                          \
     {                                                \
-       CRITICAL("No widget data for object %p (%s)", \
+       CRI("No widget data for object %p (%s)", \
                 o, evas_object_type_get(o));         \
        return;                                       \
     }
@@ -42,7 +42,7 @@ struct _Elm_Inwin_Smart_Data
   ELM_INWIN_DATA_GET(o, ptr);                         \
   if (!ptr)                                           \
     {                                                 \
-       CRITICAL("No widget data for object %p (%s)",  \
+       CRI("No widget data for object %p (%s)",  \
                 o, evas_object_type_get(o));          \
        return val;                                    \
     }

diff --git a/src/lib/elm_widget_label.h b/src/lib/elm_widget_label.h
index 7cc9998..3d627d0 100644 (file)
--- a/src/lib/elm_widget_label.h
+++ b/src/lib/elm_widget_label.h
@@ -29,7 +29,7 @@ struct _Elm_Label_Smart_Data
   ELM_LABEL_DATA_GET(o, ptr);                        \
   if (!ptr)                                          \
     {                                                \
-       CRITICAL("No widget data for object %p (%s)", \
+       CRI("No widget data for object %p (%s)", \
                 o, evas_object_type_get(o));         \
        return;                                       \
     }
@@ -38,7 +38,7 @@ struct _Elm_Label_Smart_Data
   ELM_LABEL_DATA_GET(o, ptr);                         \
   if (!ptr)                                           \
     {                                                 \
-       CRITICAL("No widget data for object %p (%s)",  \
+       CRI("No widget data for object %p (%s)",  \
                 o, evas_object_type_get(o));          \
        return val;                                    \
     }

diff --git a/src/lib/elm_widget_list.h b/src/lib/elm_widget_list.h
index c04d41d..2c21c96 100644 (file)
--- a/src/lib/elm_widget_list.h
+++ b/src/lib/elm_widget_list.h
@@ -89,7 +89,7 @@ struct _Elm_List_Item
   ELM_LIST_DATA_GET(o, ptr);                         \
   if (!ptr)                                          \
     {                                                \
-       CRITICAL("No widget data for object %p (%s)", \
+       CRI("No widget data for object %p (%s)", \
                 o, evas_object_type_get(o));         \
        return;                                       \
     }
@@ -98,7 +98,7 @@ struct _Elm_List_Item
   ELM_LIST_DATA_GET(o, ptr);                         \
   if (!ptr)                                          \
     {                                                \
-       CRITICAL("No widget data for object %p (%s)", \
+       CRI("No widget data for object %p (%s)", \
                 o, evas_object_type_get(o));         \
        return val;                                   \
     }

diff --git a/src/lib/elm_widget_map.h b/src/lib/elm_widget_map.h
index c6639cd..1d98e4f 100644 (file)
--- a/src/lib/elm_widget_map.h
+++ b/src/lib/elm_widget_map.h
@@ -498,7 +498,7 @@ struct _Elm_Map_Pan_Smart_Data
   ELM_MAP_DATA_GET(o, ptr);                     \
   if (!ptr)                                          \
     {                                                \
-       CRITICAL("No widget data for object %p (%s)", \
+       CRI("No widget data for object %p (%s)", \
                 o, evas_object_type_get(o));         \
        return;                                       \
     }
@@ -507,7 +507,7 @@ struct _Elm_Map_Pan_Smart_Data
   ELM_MAP_DATA_GET(o, ptr);                         \
   if (!ptr)                                              \
     {                                                    \
-       CRITICAL("No widget data for object %p (%s)",     \
+       CRI("No widget data for object %p (%s)",     \
                 o, evas_object_type_get(o));             \
        return val;                                       \
     }

diff --git a/src/lib/elm_widget_mapbuf.h b/src/lib/elm_widget_mapbuf.h
index 0d2bb3b..97435ef 100644 (file)
--- a/src/lib/elm_widget_mapbuf.h
+++ b/src/lib/elm_widget_mapbuf.h
@@ -46,7 +46,7 @@ struct _Elm_Mapbuf_Smart_Data
   ELM_MAPBUF_DATA_GET(o, ptr);                       \
   if (!ptr)                                          \
     {                                                \
-       CRITICAL("No widget data for object %p (%s)", \
+       CRI("No widget data for object %p (%s)", \
                 o, evas_object_type_get(o));         \
        return;                                       \
     }
@@ -55,7 +55,7 @@ struct _Elm_Mapbuf_Smart_Data
   ELM_MAPBUF_DATA_GET(o, ptr);                         \
   if (!ptr)                                            \
     {                                                  \
-       CRITICAL("No widget data for object %p (%s)",   \
+       CRI("No widget data for object %p (%s)",   \
                 o, evas_object_type_get(o));           \
        return val;                                     \
     }

diff --git a/src/lib/elm_widget_menu.h b/src/lib/elm_widget_menu.h
index 2bde15b..50b97e1 100644 (file)
--- a/src/lib/elm_widget_menu.h
+++ b/src/lib/elm_widget_menu.h
@@ -66,7 +66,7 @@ struct _Elm_Menu_Item
   ELM_MENU_DATA_GET(o, ptr);                         \
   if (!ptr)                                          \
     {                                                \
-       CRITICAL("No widget data for object %p (%s)", \
+       CRI("No widget data for object %p (%s)", \
                 o, evas_object_type_get(o));         \
        return;                                       \
     }
@@ -75,7 +75,7 @@ struct _Elm_Menu_Item
   ELM_MENU_DATA_GET(o, ptr);                         \
   if (!ptr)                                          \
     {                                                \
-       CRITICAL("No widget data for object %p (%s)", \
+       CRI("No widget data for object %p (%s)", \
                 o, evas_object_type_get(o));         \
        return val;                                   \
     }

diff --git a/src/lib/elm_widget_multibuttonentry.h b/src/lib/elm_widget_multibuttonentry.h
index c1e66fc..62ce097 100644 (file)
--- a/src/lib/elm_widget_multibuttonentry.h
+++ b/src/lib/elm_widget_multibuttonentry.h
@@ -106,7 +106,7 @@ struct _Elm_Multibuttonentry_Smart_Data
   Elm_Multibuttonentry_Smart_Data *ptr = eo_data_scope_get(o, ELM_OBJ_MULTIBUTTONENTRY_CLASS); \
   if (!ptr)                                             \
     {                                                   \
-       CRITICAL("No widget data for object %p (%s)",    \
+       CRI("No widget data for object %p (%s)",    \
                 o, evas_object_type_get(o));            \
        return;                                          \
     }
@@ -115,7 +115,7 @@ struct _Elm_Multibuttonentry_Smart_Data
   Elm_Multibuttonentry_Smart_Data * ptr = eo_data_scope_get(o, ELM_OBJ_MULTIBUTTONENTRY_CLASS); \
   if (!ptr)                                                      \
     {                                                            \
-       CRITICAL("No widget data for object %p (%s)",             \
+       CRI("No widget data for object %p (%s)",             \
                 o, evas_object_type_get(o));                     \
        return val;                                               \
     }

diff --git a/src/lib/elm_widget_naviframe.h b/src/lib/elm_widget_naviframe.h
index 284b9b4..b5ea65f 100644 (file)
--- a/src/lib/elm_widget_naviframe.h
+++ b/src/lib/elm_widget_naviframe.h
@@ -86,7 +86,7 @@ struct _Elm_Naviframe_Text_Item_Pair
   ELM_NAVIFRAME_DATA_GET(o, ptr);                    \
   if (!ptr)                                          \
     {                                                \
-       CRITICAL("No widget data for object %p (%s)", \
+       CRI("No widget data for object %p (%s)", \
                 o, evas_object_type_get(o));         \
        return;                                       \
     }
@@ -95,7 +95,7 @@ struct _Elm_Naviframe_Text_Item_Pair
   ELM_NAVIFRAME_DATA_GET(o, ptr);                         \
   if (!ptr)                                               \
     {                                                     \
-       CRITICAL("No widget data for object %p (%s)",      \
+       CRI("No widget data for object %p (%s)",      \
                 o, evas_object_type_get(o));              \
        return val;                                        \
     }

diff --git a/src/lib/elm_widget_notify.h b/src/lib/elm_widget_notify.h
index ac6c006..046f129 100644 (file)
--- a/src/lib/elm_widget_notify.h
+++ b/src/lib/elm_widget_notify.h
@@ -43,7 +43,7 @@ struct _Elm_Notify_Smart_Data
   ELM_NOTIFY_DATA_GET(o, ptr);                       \
   if (!ptr)                                          \
     {                                                \
-       CRITICAL("No widget data for object %p (%s)", \
+       CRI("No widget data for object %p (%s)", \
                 o, evas_object_type_get(o));         \
        return;                                       \
     }
@@ -52,7 +52,7 @@ struct _Elm_Notify_Smart_Data
   ELM_NOTIFY_DATA_GET(o, ptr);                         \
   if (!ptr)                                            \
     {                                                  \
-       CRITICAL("No widget data for object %p (%s)",   \
+       CRI("No widget data for object %p (%s)",   \
                 o, evas_object_type_get(o));           \
        return val;                                     \
     }

diff --git a/src/lib/elm_widget_panel.h b/src/lib/elm_widget_panel.h
index dfee221..a82f064 100644 (file)
--- a/src/lib/elm_widget_panel.h
+++ b/src/lib/elm_widget_panel.h
@@ -41,7 +41,7 @@ struct _Elm_Panel_Smart_Data
   ELM_PANEL_DATA_GET(o, ptr);                        \
   if (!ptr)                                          \
     {                                                \
-       CRITICAL("No widget data for object %p (%s)", \
+       CRI("No widget data for object %p (%s)", \
                 o, evas_object_type_get(o));         \
        return;                                       \
     }
@@ -50,7 +50,7 @@ struct _Elm_Panel_Smart_Data
   ELM_PANEL_DATA_GET(o, ptr);                         \
   if (!ptr)                                           \
     {                                                 \
-       CRITICAL("No widget data for object %p (%s)",  \
+       CRI("No widget data for object %p (%s)",  \
                 o, evas_object_type_get(o));          \
        return val;                                    \
     }

diff --git a/src/lib/elm_widget_panes.h b/src/lib/elm_widget_panes.h
index accd079..089be61 100644 (file)
--- a/src/lib/elm_widget_panes.h
+++ b/src/lib/elm_widget_panes.h
@@ -44,7 +44,7 @@ struct _Elm_Panes_Smart_Data
   ELM_PANES_DATA_GET(o, ptr);                        \
   if (!ptr)                                          \
     {                                                \
-       CRITICAL("No widget data for object %p (%s)", \
+       CRI("No widget data for object %p (%s)", \
                 o, evas_object_type_get(o));         \
        return;                                       \
     }
@@ -53,7 +53,7 @@ struct _Elm_Panes_Smart_Data
   ELM_PANES_DATA_GET(o, ptr);                         \
   if (!ptr)                                           \
     {                                                 \
-       CRITICAL("No widget data for object %p (%s)",  \
+       CRI("No widget data for object %p (%s)",  \
                 o, evas_object_type_get(o));          \
        return val;                                    \
     }

diff --git a/src/lib/elm_widget_photo.h b/src/lib/elm_widget_photo.h
index f67de88..40625eb 100644 (file)
--- a/src/lib/elm_widget_photo.h
+++ b/src/lib/elm_widget_photo.h
@@ -49,7 +49,7 @@ struct _Elm_Photo_Smart_Data
   ELM_PHOTO_DATA_GET(o, ptr);                        \
   if (!ptr)                                          \
     {                                                \
-       CRITICAL("No widget data for object %p (%s)", \
+       CRI("No widget data for object %p (%s)", \
                 o, evas_object_type_get(o));         \
        return;                                       \
     }
@@ -58,7 +58,7 @@ struct _Elm_Photo_Smart_Data
   ELM_PHOTO_DATA_GET(o, ptr);                         \
   if (!ptr)                                           \
     {                                                 \
-       CRITICAL("No widget data for object %p (%s)",  \
+       CRI("No widget data for object %p (%s)",  \
                 o, evas_object_type_get(o));          \
        return val;                                    \
     }

diff --git a/src/lib/elm_widget_photocam.h b/src/lib/elm_widget_photocam.h
index 7b70fcd..6b41039 100644 (file)
--- a/src/lib/elm_widget_photocam.h
+++ b/src/lib/elm_widget_photocam.h
@@ -145,7 +145,7 @@ struct _Elm_Photocam_Pan_Smart_Data
   ELM_PHOTOCAM_DATA_GET(o, ptr);                     \
   if (!ptr)                                          \
     {                                                \
-       CRITICAL("No widget data for object %p (%s)", \
+       CRI("No widget data for object %p (%s)", \
                 o, evas_object_type_get(o));         \
        return;                                       \
     }
@@ -154,7 +154,7 @@ struct _Elm_Photocam_Pan_Smart_Data
   ELM_PHOTOCAM_DATA_GET(o, ptr);                         \
   if (!ptr)                                              \
     {                                                    \
-       CRITICAL("No widget data for object %p (%s)",     \
+       CRI("No widget data for object %p (%s)",     \
                 o, evas_object_type_get(o));             \
        return val;                                       \
     }

diff --git a/src/lib/elm_widget_player.h b/src/lib/elm_widget_player.h
index 3ada378..54a4164 100644 (file)
--- a/src/lib/elm_widget_player.h
+++ b/src/lib/elm_widget_player.h
@@ -52,7 +52,7 @@ struct _Elm_Player_Smart_Data
   ELM_PLAYER_DATA_GET(o, ptr);                       \
   if (!ptr)                                          \
     {                                                \
-       CRITICAL("No widget data for object %p (%s)", \
+       CRI("No widget data for object %p (%s)", \
                 o, evas_object_type_get(o));         \
        return;                                       \
     }
@@ -61,7 +61,7 @@ struct _Elm_Player_Smart_Data
   ELM_PLAYER_DATA_GET(o, ptr);                         \
   if (!ptr)                                            \
     {                                                  \
-       CRITICAL("No widget data for object %p (%s)",   \
+       CRI("No widget data for object %p (%s)",   \
                 o, evas_object_type_get(o));           \
        return val;                                     \
     }

diff --git a/src/lib/elm_widget_plug.h b/src/lib/elm_widget_plug.h
index 604b1a1..6058952 100644 (file)
--- a/src/lib/elm_widget_plug.h
+++ b/src/lib/elm_widget_plug.h
@@ -24,7 +24,7 @@
   ELM_PLUG_DATA_GET(o, ptr);                         \
   if (!ptr)                                          \
     {                                                \
-       CRITICAL("No widget data for object %p (%s)", \
+       CRI("No widget data for object %p (%s)", \
                 o, evas_object_type_get(o));         \
        return;                                       \
     }
@@ -33,7 +33,7 @@
   ELM_PLUG_DATA_GET(o, ptr);                         \
   if (!ptr)                                          \
     {                                                \
-       CRITICAL("No widget data for object %p (%s)", \
+       CRI("No widget data for object %p (%s)", \
                 o, evas_object_type_get(o));         \
        return val;                                   \
     }

diff --git a/src/lib/elm_widget_popup.h b/src/lib/elm_widget_popup.h
index e0bbc22..84016eb 100644 (file)
--- a/src/lib/elm_widget_popup.h
+++ b/src/lib/elm_widget_popup.h
@@ -76,7 +76,7 @@ struct _Action_Area_Data
   ELM_POPUP_DATA_GET(o, ptr);                        \
   if (!ptr)                                          \
     {                                                \
-       CRITICAL("No widget data for object %p (%s)", \
+       CRI("No widget data for object %p (%s)", \
                 o, evas_object_type_get(o));         \
        return;                                       \
     }
@@ -85,7 +85,7 @@ struct _Action_Area_Data
   ELM_POPUP_DATA_GET(o, ptr);                         \
   if (!ptr)                                           \
     {                                                 \
-       CRITICAL("No widget data for object %p (%s)",  \
+       CRI("No widget data for object %p (%s)",  \
                 o, evas_object_type_get(o));          \
        return val;                                    \
     }

diff --git a/src/lib/elm_widget_prefs.h b/src/lib/elm_widget_prefs.h
index a66bd51..126201b 100644 (file)
--- a/src/lib/elm_widget_prefs.h
+++ b/src/lib/elm_widget_prefs.h
@@ -96,7 +96,7 @@ extern const Elm_Prefs_Item_Iface *elm_prefs_item_default_widget;
 #define ELM_PREFS_ENTRY(o, sd)                                              \
   if (!sd->data_file || !sd->page)                                          \
     {                                                                       \
-       CRITICAL("You must issue elm_prefs_file_set() on this widget before" \
+       CRI("You must issue elm_prefs_file_set() on this widget before" \
                 " you make this call");                                     \
     }                                                                       \
   return
@@ -105,7 +105,7 @@ extern const Elm_Prefs_Item_Iface *elm_prefs_item_default_widget;
   ELM_PREFS_DATA_GET(o, ptr);                        \
   if (!ptr)                                          \
     {                                                \
-       CRITICAL("No widget data for object %p (%s)", \
+       CRI("No widget data for object %p (%s)", \
                 o, evas_object_type_get(o));         \
        return;                                       \
     }
@@ -114,7 +114,7 @@ extern const Elm_Prefs_Item_Iface *elm_prefs_item_default_widget;
   ELM_PREFS_DATA_GET(o, ptr);                         \
   if (!ptr)                                           \
     {                                                 \
-       CRITICAL("No widget data for object %p (%s)",  \
+       CRI("No widget data for object %p (%s)",  \
                 o, evas_object_type_get(o));          \
        return val;                                    \
     }

diff --git a/src/lib/elm_widget_progressbar.h b/src/lib/elm_widget_progressbar.h
index 016970e..014bb0f 100644 (file)
--- a/src/lib/elm_widget_progressbar.h
+++ b/src/lib/elm_widget_progressbar.h
@@ -55,7 +55,7 @@ struct _Elm_Progress_Status
   ELM_PROGRESSBAR_DATA_GET(o, ptr);                       \
   if (!ptr)                                          \
     {                                                \
-       CRITICAL("No widget data for object %p (%s)", \
+       CRI("No widget data for object %p (%s)", \
                 o, evas_object_type_get(o));         \
        return;                                       \
     }
@@ -64,7 +64,7 @@ struct _Elm_Progress_Status
   ELM_PROGRESSBAR_DATA_GET(o, ptr);                         \
   if (!ptr)                                            \
     {                                                  \
-       CRITICAL("No widget data for object %p (%s)",   \
+       CRI("No widget data for object %p (%s)",   \
                 o, evas_object_type_get(o));           \
        return val;                                     \
     }

diff --git a/src/lib/elm_widget_radio.h b/src/lib/elm_widget_radio.h
index 1bd2815..904c1de 100644 (file)
--- a/src/lib/elm_widget_radio.h
+++ b/src/lib/elm_widget_radio.h
@@ -46,7 +46,7 @@ struct _Elm_Radio_Smart_Data
   ELM_RADIO_DATA_GET(o, ptr);                        \
   if (!ptr)                                          \
     {                                                \
-       CRITICAL("No widget data for object %p (%s)", \
+       CRI("No widget data for object %p (%s)", \
                 o, evas_object_type_get(o));         \
        return;                                       \
     }
@@ -55,7 +55,7 @@ struct _Elm_Radio_Smart_Data
   ELM_RADIO_DATA_GET(o, ptr);                         \
   if (!ptr)                                           \
     {                                                 \
-       CRITICAL("No widget data for object %p (%s)",  \
+       CRI("No widget data for object %p (%s)",  \
                 o, evas_object_type_get(o));          \
        return val;                                    \
     }

diff --git a/src/lib/elm_widget_route.h b/src/lib/elm_widget_route.h
index 84e6e18..c7ff1a6 100644 (file)
--- a/src/lib/elm_widget_route.h
+++ b/src/lib/elm_widget_route.h
@@ -57,7 +57,7 @@ struct Segment
   ELM_ROUTE_DATA_GET(o, ptr);                         \
   if (!ptr)                                          \
     {                                                \
-       CRITICAL("No widget data for object %p (%s)", \
+       CRI("No widget data for object %p (%s)", \
                 o, evas_object_type_get(o));         \
        return;                                       \
     }
@@ -66,7 +66,7 @@ struct Segment
   ELM_ROUTE_DATA_GET(o, ptr);                         \
   if (!ptr)                                          \
     {                                                \
-       CRITICAL("No widget data for object %p (%s)", \
+       CRI("No widget data for object %p (%s)", \
                 o, evas_object_type_get(o));         \
        return val;                                   \
     }

diff --git a/src/lib/elm_widget_scroller.h b/src/lib/elm_widget_scroller.h
index ef627e6..be871f4 100644 (file)
--- a/src/lib/elm_widget_scroller.h
+++ b/src/lib/elm_widget_scroller.h
@@ -40,7 +40,7 @@ struct _Elm_Scroller_Smart_Data
   ELM_SCROLLER_DATA_GET(o, ptr);                     \
   if (!ptr)                                          \
     {                                                \
-       CRITICAL("No widget data for object %p (%s)", \
+       CRI("No widget data for object %p (%s)", \
                 o, evas_object_type_get(o));         \
        return;                                       \
     }
@@ -49,7 +49,7 @@ struct _Elm_Scroller_Smart_Data
   ELM_SCROLLER_DATA_GET(o, ptr);                         \
   if (!ptr)                                              \
     {                                                    \
-       CRITICAL("No widget data for object %p (%s)",     \
+       CRI("No widget data for object %p (%s)",     \
                 o, evas_object_type_get(o));             \
        return val;                                       \
     }

diff --git a/src/lib/elm_widget_segment_control.h b/src/lib/elm_widget_segment_control.h
index 44f34a4..1d5fab0 100644 (file)
--- a/src/lib/elm_widget_segment_control.h
+++ b/src/lib/elm_widget_segment_control.h
@@ -49,7 +49,7 @@ struct _Elm_Segment_Item
   ELM_SEGMENT_CONTROL_DATA_GET(o, ptr);                \
   if (!ptr)                                            \
     {                                                  \
-       CRITICAL("No widget data for object %p (%s)",   \
+       CRI("No widget data for object %p (%s)",   \
                 o, evas_object_type_get(o));           \
        return;                                         \
     }
@@ -58,7 +58,7 @@ struct _Elm_Segment_Item
   ELM_SEGMENT_CONTROL_DATA_GET(o, ptr);                         \
   if (!ptr)                                                     \
     {                                                           \
-       CRITICAL("No widget data for object %p (%s)",            \
+       CRI("No widget data for object %p (%s)",            \
                 o, evas_object_type_get(o));                    \
        return val;                                              \
     }

diff --git a/src/lib/elm_widget_separator.h b/src/lib/elm_widget_separator.h
index 63f7397..132c052 100644 (file)
--- a/src/lib/elm_widget_separator.h
+++ b/src/lib/elm_widget_separator.h
@@ -34,7 +34,7 @@ struct _Elm_Separator_Smart_Data
   ELM_SEPARATOR_DATA_GET(o, ptr);                    \
   if (!ptr)                                          \
     {                                                \
-       CRITICAL("No widget data for object %p (%s)", \
+       CRI("No widget data for object %p (%s)", \
                 o, evas_object_type_get(o));         \
        return;                                       \
     }
@@ -43,7 +43,7 @@ struct _Elm_Separator_Smart_Data
   ELM_SEPARATOR_DATA_GET(o, ptr);                         \
   if (!ptr)                                               \
     {                                                     \
-       CRITICAL("No widget data for object %p (%s)",      \
+       CRI("No widget data for object %p (%s)",      \
                 o, evas_object_type_get(o));              \
        return val;                                        \
     }

diff --git a/src/lib/elm_widget_slider.h b/src/lib/elm_widget_slider.h
index 74e4b5f..88c386b 100644 (file)
--- a/src/lib/elm_widget_slider.h
+++ b/src/lib/elm_widget_slider.h
@@ -59,7 +59,7 @@ struct _Elm_Slider_Smart_Data
   ELM_SLIDER_DATA_GET(o, ptr);                       \
   if (!ptr)                                          \
     {                                                \
-       CRITICAL("No widget data for object %p (%s)", \
+       CRI("No widget data for object %p (%s)", \
                 o, evas_object_type_get(o));         \
        return;                                       \
     }
@@ -68,7 +68,7 @@ struct _Elm_Slider_Smart_Data
   ELM_SLIDER_DATA_GET(o, ptr);                         \
   if (!ptr)                                            \
     {                                                  \
-       CRITICAL("No widget data for object %p (%s)",   \
+       CRI("No widget data for object %p (%s)",   \
                 o, evas_object_type_get(o));           \
        return val;                                     \
     }

diff --git a/src/lib/elm_widget_slideshow.h b/src/lib/elm_widget_slideshow.h
index 0511647..022b0f7 100644 (file)
--- a/src/lib/elm_widget_slideshow.h
+++ b/src/lib/elm_widget_slideshow.h
@@ -65,7 +65,7 @@ struct _Elm_Slideshow_Smart_Data
   ELM_SLIDESHOW_DATA_GET(o, ptr);                    \
   if (!ptr)                                          \
     {                                                \
-       CRITICAL("No widget data for object %p (%s)", \
+       CRI("No widget data for object %p (%s)", \
                 o, evas_object_type_get(o));         \
        return;                                       \
     }
@@ -74,7 +74,7 @@ struct _Elm_Slideshow_Smart_Data
   ELM_SLIDESHOW_DATA_GET(o, ptr);                         \
   if (!ptr)                                               \
     {                                                     \
-       CRITICAL("No widget data for object %p (%s)",      \
+       CRI("No widget data for object %p (%s)",      \
                 o, evas_object_type_get(o));              \
        return val;                                        \
     }

diff --git a/src/lib/elm_widget_spinner.h b/src/lib/elm_widget_spinner.h
index 0271b9e..5f732fb 100644 (file)
--- a/src/lib/elm_widget_spinner.h
+++ b/src/lib/elm_widget_spinner.h
@@ -58,7 +58,7 @@ struct _Elm_Spinner_Special_Value
   ELM_SPINNER_DATA_GET(o, ptr);                      \
   if (!ptr)                                          \
     {                                                \
-       CRITICAL("No widget data for object %p (%s)", \
+       CRI("No widget data for object %p (%s)", \
                 o, evas_object_type_get(o));         \
        return;                                       \
     }
@@ -67,7 +67,7 @@ struct _Elm_Spinner_Special_Value
   ELM_SPINNER_DATA_GET(o, ptr);                         \
   if (!ptr)                                             \
     {                                                   \
-       CRITICAL("No widget data for object %p (%s)",    \
+       CRI("No widget data for object %p (%s)",    \
                 o, evas_object_type_get(o));            \
        return val;                                      \
     }

diff --git a/src/lib/elm_widget_thumb.h b/src/lib/elm_widget_thumb.h
index 1f1ca87..8ecdc79 100644 (file)
--- a/src/lib/elm_widget_thumb.h
+++ b/src/lib/elm_widget_thumb.h
@@ -72,7 +72,7 @@ struct _Elm_Thumb_Smart_Data
   ELM_THUMB_DATA_GET(o, ptr);                        \
   if (!ptr)                                          \
     {                                                \
-       CRITICAL("No widget data for object %p (%s)", \
+       CRI("No widget data for object %p (%s)", \
                 o, evas_object_type_get(o));         \
        return;                                       \
     }
@@ -81,7 +81,7 @@ struct _Elm_Thumb_Smart_Data
   ELM_THUMB_DATA_GET(o, ptr);                         \
   if (!ptr)                                           \
     {                                                 \
-       CRITICAL("No widget data for object %p (%s)",  \
+       CRI("No widget data for object %p (%s)",  \
                 o, evas_object_type_get(o));          \
        return val;                                    \
     }

diff --git a/src/lib/elm_widget_toolbar.h b/src/lib/elm_widget_toolbar.h
index 6e96040..66d1802 100644 (file)
--- a/src/lib/elm_widget_toolbar.h
+++ b/src/lib/elm_widget_toolbar.h
@@ -102,7 +102,7 @@ struct _Elm_Toolbar_Item_State
   ELM_TOOLBAR_DATA_GET(o, ptr);                      \
   if (!ptr)                                          \
     {                                                \
-       CRITICAL("No widget data for object %p (%s)", \
+       CRI("No widget data for object %p (%s)", \
                 o, evas_object_type_get(o));         \
        return;                                       \
     }
@@ -111,7 +111,7 @@ struct _Elm_Toolbar_Item_State
   ELM_TOOLBAR_DATA_GET(o, ptr);                         \
   if (!ptr)                                             \
     {                                                   \
-       CRITICAL("No widget data for object %p (%s)",    \
+       CRI("No widget data for object %p (%s)",    \
                 o, evas_object_type_get(o));            \
        return val;                                      \
     }

diff --git a/src/lib/elm_widget_video.h b/src/lib/elm_widget_video.h
index e2979e5..1907c1c 100644 (file)
--- a/src/lib/elm_widget_video.h
+++ b/src/lib/elm_widget_video.h
@@ -38,7 +38,7 @@ struct _Elm_Video_Smart_Data
   ELM_VIDEO_DATA_GET(o, ptr);                        \
   if (!ptr)                                          \
     {                                                \
-       CRITICAL("No widget data for object %p (%s)", \
+       CRI("No widget data for object %p (%s)", \
                 o, evas_object_type_get(o));         \
        return;                                       \
     }
@@ -47,7 +47,7 @@ struct _Elm_Video_Smart_Data
   ELM_VIDEO_DATA_GET(o, ptr);                         \
   if (!ptr)                                           \
     {                                                 \
-       CRITICAL("No widget data for object %p (%s)",  \
+       CRI("No widget data for object %p (%s)",  \
                 o, evas_object_type_get(o));          \
        return val;                                    \
     }

diff --git a/src/lib/elm_widget_web.h b/src/lib/elm_widget_web.h
index 147f411..85df9a1 100644 (file)
--- a/src/lib/elm_widget_web.h
+++ b/src/lib/elm_widget_web.h
@@ -129,7 +129,7 @@ struct _View_Smart_Data
   ELM_WEB_DATA_GET(o, ptr);                          \
   if (!ptr)                                          \
     {                                                \
-       CRITICAL("No widget data for object %p (%s)", \
+       CRI("No widget data for object %p (%s)", \
                 o, evas_object_type_get(o));         \
        return;                                       \
     }
@@ -138,7 +138,7 @@ struct _View_Smart_Data
   ELM_WEB_DATA_GET(o, ptr);                          \
   if (!ptr)                                          \
     {                                                \
-       CRITICAL("No widget data for object %p (%s)", \
+       CRI("No widget data for object %p (%s)", \
                 o, evas_object_type_get(o));         \
        return val;                                   \
     }

diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index 8ccb89d..f8c2c79 100644 (file)
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -34,7 +34,7 @@ static const Elm_Win_Trap *trap = NULL;
   ELM_WIN_DATA_GET(o, ptr);                          \
   if (!ptr)                                          \
     {                                                \
-       CRITICAL("No widget data for object %p (%s)", \
+       CRI("No widget data for object %p (%s)", \
                 o, evas_object_type_get(o));         \
        return;                                       \
     }
@@ -43,7 +43,7 @@ static const Elm_Win_Trap *trap = NULL;
   ELM_WIN_DATA_GET(o, ptr);                          \
   if (!ptr)                                          \
     {                                                \
-       CRITICAL("No widget data for object %p (%s)", \
+       CRI("No widget data for object %p (%s)", \
                 o, evas_object_type_get(o));         \
        return val;                                   \
     }
@@ -2812,12 +2812,12 @@ _win_constructor(Eo *obj, void *_pd, va_list *list)
 
 #define FALLBACK_TRY(engine)                                      \
   if (!tmp_sd.ee) {                                               \
-     CRITICAL(engine " engine creation failed. Trying default."); \
+     CRI(engine " engine creation failed. Trying default."); \
   } while (0)
 #define FALLBACK_STORE(engine)                               \
    if (tmp_sd.ee)                                            \
    {                                                         \
-      CRITICAL(engine "Fallback to %s successful.", engine); \
+      CRI(engine "Fallback to %s successful.", engine); \
       fallback = engine;                                     \
    }
 
@@ -5448,7 +5448,7 @@ elm_win_trap_set(const Elm_Win_Trap *t)
 
    if ((t) && (t->version != ELM_WIN_TRAP_VERSION))
      {
-        CRITICAL("trying to set a trap version %lu while %lu was expected!",
+        CRI("trying to set a trap version %lu while %lu was expected!",
                  t->version, ELM_WIN_TRAP_VERSION);
         return EINA_FALSE;
      }

diff --git a/src/lib/els_cursor.c b/src/lib/els_cursor.c
index e611af5..6549423 100644 (file)
--- a/src/lib/els_cursor.c
+++ b/src/lib/els_cursor.c
@@ -119,7 +119,7 @@ static const int _cursors_count = sizeof(_cursors)/sizeof(struct _Cursor_Id);
     {                                                   \
        if (!(obj))                                      \
          {                                              \
-            CRITICAL("Null pointer: " #obj);            \
+            CRI("Null pointer: " #obj);            \
             return __VA_ARGS__;                         \
          }                                              \
        cur = evas_object_data_get((obj), _cursor_key);  \

diff --git a/src/lib/els_tooltip.c b/src/lib/els_tooltip.c
index 0e6c71a..011e274 100644 (file)
--- a/src/lib/els_tooltip.c
+++ b/src/lib/els_tooltip.c
@@ -22,7 +22,7 @@ static const char _tooltip_key[] = "_elm_tooltip";
     {                                                   \
        if (!(obj))                                      \
          {                                              \
-            CRITICAL("Null pointer: " #obj);            \
+            CRI("Null pointer: " #obj);            \
             return __VA_ARGS__;                         \
          }                                              \
        tt = evas_object_data_get((obj), _tooltip_key);  \

diff --git a/src/modules/prefs/private.h b/src/modules/prefs/private.h
index 6ad8661..22e8317 100644 (file)
--- a/src/modules/prefs/private.h
+++ b/src/modules/prefs/private.h
@@ -3,13 +3,13 @@
 #endif
 #include "Elementary.h"
 
-#undef CRITICAL
+#undef CRI
 #undef ERR
 #undef WRN
 #undef INF
 #undef DBG
 
-#define CRITICAL(...) EINA_LOG_DOM_CRIT(_elm_prefs_log_dom, __VA_ARGS__)
+#define CRI(...) EINA_LOG_DOM_CRIT(_elm_prefs_log_dom, __VA_ARGS__)
 #define ERR(...)      EINA_LOG_DOM_ERR (_elm_prefs_log_dom, __VA_ARGS__)
 #define WRN(...)      EINA_LOG_DOM_WARN(_elm_prefs_log_dom, __VA_ARGS__)
 #define INF(...)      EINA_LOG_DOM_INFO(_elm_prefs_log_dom, __VA_ARGS__)