summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniel Juyung Seo <juyung.seo@samsung.com>2013-12-26 13:03:55 +0900
committerDaniel Juyung Seo <juyung.seo@samsung.com>2013-12-26 13:03:55 +0900
commit64da1da7b0c30ee862cd5cdb9886b5000363088a (patch)
treea7b0628163d464519c66d77b3a2015186cef1036 /src
parentd8c7def3965ae0af8a756fdde1d4c120cae85502 (diff)
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.
Diffstat (limited to 'src')
-rw-r--r--src/bin/elm_prefs_cc.h6
-rw-r--r--src/bin/quicklaunch.c20
-rw-r--r--src/bin/test.h2
-rw-r--r--src/edje_externals/private.h4
-rw-r--r--src/lib/elc_ctxpopup.c2
-rw-r--r--src/lib/elc_fileselector.c2
-rw-r--r--src/lib/elc_fileselector_entry.c2
-rw-r--r--src/lib/elc_multibuttonentry.c2
-rw-r--r--src/lib/elc_naviframe.c2
-rw-r--r--src/lib/elc_player.c2
-rw-r--r--src/lib/elc_popup.c16
-rw-r--r--src/lib/elm_actionslider.c2
-rw-r--r--src/lib/elm_bg.c2
-rw-r--r--src/lib/elm_bubble.c2
-rw-r--r--src/lib/elm_button.c2
-rw-r--r--src/lib/elm_calendar.c2
-rw-r--r--src/lib/elm_check.c2
-rw-r--r--src/lib/elm_clock.c8
-rw-r--r--src/lib/elm_colorselector.c6
-rw-r--r--src/lib/elm_conform.c2
-rw-r--r--src/lib/elm_datetime.c2
-rw-r--r--src/lib/elm_dayselector.c2
-rw-r--r--src/lib/elm_entry.c2
-rw-r--r--src/lib/elm_flipselector.c2
-rw-r--r--src/lib/elm_frame.c2
-rw-r--r--src/lib/elm_gengrid.c2
-rw-r--r--src/lib/elm_genlist.c2
-rw-r--r--src/lib/elm_gesture_layer.c4
-rw-r--r--src/lib/elm_hover.c2
-rw-r--r--src/lib/elm_index.c2
-rw-r--r--src/lib/elm_interface_scrollable.c8
-rw-r--r--src/lib/elm_inwin.c2
-rw-r--r--src/lib/elm_label.c2
-rw-r--r--src/lib/elm_list.c2
-rw-r--r--src/lib/elm_map.c12
-rw-r--r--src/lib/elm_menu.c14
-rw-r--r--src/lib/elm_notify.c2
-rw-r--r--src/lib/elm_panel.c14
-rw-r--r--src/lib/elm_panes.c2
-rw-r--r--src/lib/elm_priv.h2
-rw-r--r--src/lib/elm_progressbar.c2
-rw-r--r--src/lib/elm_radio.c2
-rw-r--r--src/lib/elm_scroller.c2
-rw-r--r--src/lib/elm_segment_control.c2
-rw-r--r--src/lib/elm_separator.c2
-rw-r--r--src/lib/elm_slider.c2
-rw-r--r--src/lib/elm_slideshow.c2
-rw-r--r--src/lib/elm_spinner.c4
-rw-r--r--src/lib/elm_thumb.c2
-rw-r--r--src/lib/elm_toolbar.c4
-rw-r--r--src/lib/elm_transit.c2
-rw-r--r--src/lib/elm_video.c2
-rw-r--r--src/lib/elm_web.c2
-rw-r--r--src/lib/elm_web2.c2
-rw-r--r--src/lib/elm_widget.c2
-rw-r--r--src/lib/elm_widget.h6
-rw-r--r--src/lib/elm_widget_actionslider.h4
-rw-r--r--src/lib/elm_widget_bg.h4
-rw-r--r--src/lib/elm_widget_box.h4
-rw-r--r--src/lib/elm_widget_bubble.h4
-rw-r--r--src/lib/elm_widget_button.h4
-rw-r--r--src/lib/elm_widget_check.h4
-rw-r--r--src/lib/elm_widget_clock.h4
-rw-r--r--src/lib/elm_widget_colorselector.h4
-rw-r--r--src/lib/elm_widget_conform.h4
-rw-r--r--src/lib/elm_widget_ctxpopup.h4
-rw-r--r--src/lib/elm_widget_datetime.h4
-rw-r--r--src/lib/elm_widget_dayselector.h4
-rw-r--r--src/lib/elm_widget_diskselector.h4
-rw-r--r--src/lib/elm_widget_entry.h4
-rw-r--r--src/lib/elm_widget_fileselector.h4
-rw-r--r--src/lib/elm_widget_fileselector_button.h4
-rw-r--r--src/lib/elm_widget_fileselector_entry.h4
-rw-r--r--src/lib/elm_widget_flip.h4
-rw-r--r--src/lib/elm_widget_flipselector.h4
-rw-r--r--src/lib/elm_widget_frame.h4
-rw-r--r--src/lib/elm_widget_gengrid.h4
-rw-r--r--src/lib/elm_widget_genlist.h4
-rw-r--r--src/lib/elm_widget_glview.h4
-rw-r--r--src/lib/elm_widget_hover.h4
-rw-r--r--src/lib/elm_widget_hoversel.h4
-rw-r--r--src/lib/elm_widget_icon.h4
-rw-r--r--src/lib/elm_widget_image.h4
-rw-r--r--src/lib/elm_widget_index.h4
-rw-r--r--src/lib/elm_widget_inwin.h4
-rw-r--r--src/lib/elm_widget_label.h4
-rw-r--r--src/lib/elm_widget_list.h4
-rw-r--r--src/lib/elm_widget_map.h4
-rw-r--r--src/lib/elm_widget_mapbuf.h4
-rw-r--r--src/lib/elm_widget_menu.h4
-rw-r--r--src/lib/elm_widget_multibuttonentry.h4
-rw-r--r--src/lib/elm_widget_naviframe.h4
-rw-r--r--src/lib/elm_widget_notify.h4
-rw-r--r--src/lib/elm_widget_panel.h4
-rw-r--r--src/lib/elm_widget_panes.h4
-rw-r--r--src/lib/elm_widget_photo.h4
-rw-r--r--src/lib/elm_widget_photocam.h4
-rw-r--r--src/lib/elm_widget_player.h4
-rw-r--r--src/lib/elm_widget_plug.h4
-rw-r--r--src/lib/elm_widget_popup.h4
-rw-r--r--src/lib/elm_widget_prefs.h6
-rw-r--r--src/lib/elm_widget_progressbar.h4
-rw-r--r--src/lib/elm_widget_radio.h4
-rw-r--r--src/lib/elm_widget_route.h4
-rw-r--r--src/lib/elm_widget_scroller.h4
-rw-r--r--src/lib/elm_widget_segment_control.h4
-rw-r--r--src/lib/elm_widget_separator.h4
-rw-r--r--src/lib/elm_widget_slider.h4
-rw-r--r--src/lib/elm_widget_slideshow.h4
-rw-r--r--src/lib/elm_widget_spinner.h4
-rw-r--r--src/lib/elm_widget_thumb.h4
-rw-r--r--src/lib/elm_widget_toolbar.h4
-rw-r--r--src/lib/elm_widget_video.h4
-rw-r--r--src/lib/elm_widget_web.h4
-rw-r--r--src/lib/elm_win.c10
-rw-r--r--src/lib/els_cursor.c2
-rw-r--r--src/lib/els_tooltip.c2
-rw-r--r--src/modules/prefs/private.h4
118 files changed, 231 insertions, 231 deletions
diff --git a/src/bin/elm_prefs_cc.h b/src/bin/elm_prefs_cc.h
index bc895b910..d138f003c 100644
--- 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;
34# undef WRN 34# undef WRN
35#endif 35#endif
36#define WRN(...) EINA_LOG_DOM_WARN(_elm_prefs_cc_log_dom, __VA_ARGS__) 36#define WRN(...) EINA_LOG_DOM_WARN(_elm_prefs_cc_log_dom, __VA_ARGS__)
37#ifdef CRIT 37#ifdef CRI
38# undef CRIT 38# undef CRI
39#endif 39#endif
40#define CRIT(...) EINA_LOG_DOM_CRIT(_elm_prefs_cc_log_dom, __VA_ARGS__) 40#define CRI(...) EINA_LOG_DOM_CRIT(_elm_prefs_cc_log_dom, __VA_ARGS__)
41#ifdef DBG 41#ifdef DBG
42# undef DBG 42# undef DBG
43#endif 43#endif
diff --git a/src/bin/quicklaunch.c b/src/bin/quicklaunch.c
index f79770c28..6ca0a3c97 100644
--- a/src/bin/quicklaunch.c
+++ b/src/bin/quicklaunch.c
@@ -42,7 +42,7 @@ static struct sigaction old_sigbus;
42static struct sigaction old_sigabrt; 42static struct sigaction old_sigabrt;
43static int _log_dom = -1; 43static int _log_dom = -1;
44 44
45#define CRITICAL(...) EINA_LOG_DOM_CRIT(_log_dom, __VA_ARGS__) 45#define CRI(...) EINA_LOG_DOM_CRIT(_log_dom, __VA_ARGS__)
46#define ERR(...) EINA_LOG_DOM_ERR(_log_dom, __VA_ARGS__) 46#define ERR(...) EINA_LOG_DOM_ERR(_log_dom, __VA_ARGS__)
47#define WRN(...) EINA_LOG_DOM_WARN(_log_dom, __VA_ARGS__) 47#define WRN(...) EINA_LOG_DOM_WARN(_log_dom, __VA_ARGS__)
48#define INF(...) EINA_LOG_DOM_INFO(_log_dom, __VA_ARGS__) 48#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
87 t = ecore_time_get(); 87 t = ecore_time_get();
88 if ((t - restart_time) <= 2.0) 88 if ((t - restart_time) <= 2.0)
89 { 89 {
90 CRITICAL("crash too fast - less than 2 seconds. abort restart"); 90 CRI("crash too fast - less than 2 seconds. abort restart");
91 exit(-1); 91 exit(-1);
92 } 92 }
93 ecore_app_restart(); 93 ecore_app_restart();
@@ -109,7 +109,7 @@ handle_run(int fd, unsigned long bytes)
109 buf = alloca(bytes); 109 buf = alloca(bytes);
110 if (read(fd, buf, bytes) != (int)bytes) 110 if (read(fd, buf, bytes) != (int)bytes)
111 { 111 {
112 CRITICAL("cannot read %i bytes of args and environment data", (int)bytes); 112 CRI("cannot read %i bytes of args and environment data", (int)bytes);
113 close(fd); 113 close(fd);
114 return; 114 return;
115 } 115 }
@@ -120,7 +120,7 @@ handle_run(int fd, unsigned long bytes)
120 120
121 if (argc <= 0) 121 if (argc <= 0)
122 { 122 {
123 CRITICAL("no executable specified"); 123 CRI("no executable specified");
124 return; 124 return;
125 } 125 }
126 126
@@ -188,7 +188,7 @@ main(int argc, char **argv)
188 ret = mkdir(buf, S_IRUSR | S_IWUSR | S_IXUSR); 188 ret = mkdir(buf, S_IRUSR | S_IWUSR | S_IXUSR);
189 if (ret < 0) 189 if (ret < 0)
190 { 190 {
191 CRITICAL("cannot create directory '%s'", buf); 191 CRI("cannot create directory '%s'", buf);
192 exit(-1); 192 exit(-1);
193 } 193 }
194 } 194 }
@@ -197,13 +197,13 @@ main(int argc, char **argv)
197 sock = socket(AF_UNIX, SOCK_STREAM, 0); 197 sock = socket(AF_UNIX, SOCK_STREAM, 0);
198 if (sock < 0) 198 if (sock < 0)
199 { 199 {
200 CRITICAL("cannot create socket for socket for '%s': %s", 200 CRI("cannot create socket for socket for '%s': %s",
201 buf, strerror(errno)); 201 buf, strerror(errno));
202 exit(-1); 202 exit(-1);
203 } 203 }
204 if (fcntl(sock, F_SETFD, FD_CLOEXEC) < 0) 204 if (fcntl(sock, F_SETFD, FD_CLOEXEC) < 0)
205 { 205 {
206 CRITICAL("cannot set close on exec socket for '%s' (fd=%d): %s", 206 CRI("cannot set close on exec socket for '%s' (fd=%d): %s",
207 buf, sock, strerror(errno)); 207 buf, sock, strerror(errno));
208 exit(-1); 208 exit(-1);
209 } 209 }
@@ -211,7 +211,7 @@ main(int argc, char **argv)
211 lin.l_linger = 0; 211 lin.l_linger = 0;
212 if (setsockopt(sock, SOL_SOCKET, SO_LINGER, &lin, sizeof(struct linger)) < 0) 212 if (setsockopt(sock, SOL_SOCKET, SO_LINGER, &lin, sizeof(struct linger)) < 0)
213 { 213 {
214 CRITICAL("cannot set linger for socket for '%s' (fd=%d): %s", 214 CRI("cannot set linger for socket for '%s' (fd=%d): %s",
215 buf, sock, strerror(errno)); 215 buf, sock, strerror(errno));
216 exit(-1); 216 exit(-1);
217 } 217 }
@@ -220,13 +220,13 @@ main(int argc, char **argv)
220 socket_unix_len = LENGTH_OF_SOCKADDR_UN(&socket_unix); 220 socket_unix_len = LENGTH_OF_SOCKADDR_UN(&socket_unix);
221 if (bind(sock, (struct sockaddr *)&socket_unix, socket_unix_len) < 0) 221 if (bind(sock, (struct sockaddr *)&socket_unix, socket_unix_len) < 0)
222 { 222 {
223 CRITICAL("cannot bind socket for '%s' (fd=%d): %s", 223 CRI("cannot bind socket for '%s' (fd=%d): %s",
224 buf, sock, strerror(errno)); 224 buf, sock, strerror(errno));
225 exit(-1); 225 exit(-1);
226 } 226 }
227 if (listen(sock, 4096) < 0) 227 if (listen(sock, 4096) < 0)
228 { 228 {
229 CRITICAL("listen(sock=%d, 4096): %s", sock, strerror(errno)); 229 CRI("listen(sock=%d, 4096): %s", sock, strerror(errno));
230 exit(-1); 230 exit(-1);
231 } 231 }
232 elm_quicklaunch_mode_set(EINA_TRUE); 232 elm_quicklaunch_mode_set(EINA_TRUE);
diff --git a/src/bin/test.h b/src/bin/test.h
index b492c082f..1b34c95f5 100644
--- a/src/bin/test.h
+++ b/src/bin/test.h
@@ -20,7 +20,7 @@
20 20
21extern int _log_domain; 21extern int _log_domain;
22 22
23#define CRITICAL(...) EINA_LOG_DOM_CRIT(_log_domain, _VA_ARGS__) 23#define CRI(...) EINA_LOG_DOM_CRIT(_log_domain, _VA_ARGS__)
24#define ERR(...) EINA_LOG_DOM_ERR(_log_domain, __VA_ARGS__) 24#define ERR(...) EINA_LOG_DOM_ERR(_log_domain, __VA_ARGS__)
25#define WRN(...) EINA_LOG_DOM_WARN(_log_domain, __VA_ARGS__) 25#define WRN(...) EINA_LOG_DOM_WARN(_log_domain, __VA_ARGS__)
26#define INF(...) EINA_LOG_DOM_INFO(_log_domain, __VA_ARGS__) 26#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 4d63b0c8f..43dea735d 100644
--- a/src/edje_externals/private.h
+++ b/src/edje_externals/private.h
@@ -4,13 +4,13 @@
4#include "Elementary.h" 4#include "Elementary.h"
5#include "elm_priv.h" 5#include "elm_priv.h"
6 6
7#undef CRITICAL 7#undef CRI
8#undef ERR 8#undef ERR
9#undef WRN 9#undef WRN
10#undef INF 10#undef INF
11#undef DBG 11#undef DBG
12 12
13#define CRITICAL(...) EINA_LOG_DOM_CRIT(_elm_ext_log_dom, __VA_ARGS__) 13#define CRI(...) EINA_LOG_DOM_CRIT(_elm_ext_log_dom, __VA_ARGS__)
14#define ERR(...) EINA_LOG_DOM_ERR (_elm_ext_log_dom, __VA_ARGS__) 14#define ERR(...) EINA_LOG_DOM_ERR (_elm_ext_log_dom, __VA_ARGS__)
15#define WRN(...) EINA_LOG_DOM_WARN(_elm_ext_log_dom, __VA_ARGS__) 15#define WRN(...) EINA_LOG_DOM_WARN(_elm_ext_log_dom, __VA_ARGS__)
16#define INF(...) EINA_LOG_DOM_INFO(_elm_ext_log_dom, __VA_ARGS__) 16#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 05c91862f..eed5ac5a3 100644
--- 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)
1126 1126
1127 if (!elm_layout_theme_set 1127 if (!elm_layout_theme_set
1128 (obj, "ctxpopup", "base", elm_widget_style_get(obj))) 1128 (obj, "ctxpopup", "base", elm_widget_style_get(obj)))
1129 CRITICAL("Failed to set layout!"); 1129 CRI("Failed to set layout!");
1130 1130
1131 elm_layout_signal_callback_add 1131 elm_layout_signal_callback_add
1132 (obj, "elm,action,hide,finished", "*", _hide_finished_cb, obj); 1132 (obj, "elm,action,hide,finished", "*", _hide_finished_cb, obj);
diff --git a/src/lib/elc_fileselector.c b/src/lib/elc_fileselector.c
index 198d2a4e9..e9d0c9c12 100644
--- 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)
1295 1295
1296 if (!elm_layout_theme_set 1296 if (!elm_layout_theme_set
1297 (obj, "fileselector", "base", elm_widget_style_get(obj))) 1297 (obj, "fileselector", "base", elm_widget_style_get(obj)))
1298 CRITICAL("Failed to set layout!"); 1298 CRI("Failed to set layout!");
1299 1299
1300 // up btn 1300 // up btn
1301 ic = elm_icon_add(obj); 1301 ic = elm_icon_add(obj);
diff --git a/src/lib/elc_fileselector_entry.c b/src/lib/elc_fileselector_entry.c
index ba415645e..ba78501ed 100644
--- 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)
351 351
352 if (!elm_layout_theme_set 352 if (!elm_layout_theme_set
353 (obj, "fileselector_entry", "base", elm_widget_style_get(obj))) 353 (obj, "fileselector_entry", "base", elm_widget_style_get(obj)))
354 CRITICAL("Failed to set layout!"); 354 CRI("Failed to set layout!");
355 355
356 priv->button = elm_fileselector_button_add(obj); 356 priv->button = elm_fileselector_button_add(obj);
357 elm_widget_mirrored_automatic_set(priv->button, EINA_FALSE); 357 elm_widget_mirrored_automatic_set(priv->button, EINA_FALSE);
diff --git a/src/lib/elc_multibuttonentry.c b/src/lib/elc_multibuttonentry.c
index 760c6a43d..700ac4ec5 100644
--- 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)
1453 1453
1454 if (!elm_layout_theme_set 1454 if (!elm_layout_theme_set
1455 (obj, "multibuttonentry", "base", elm_widget_style_get(obj))) 1455 (obj, "multibuttonentry", "base", elm_widget_style_get(obj)))
1456 CRITICAL("Failed to set layout!"); 1456 CRI("Failed to set layout!");
1457 1457
1458 elm_widget_can_focus_set(obj, EINA_TRUE); 1458 elm_widget_can_focus_set(obj, EINA_TRUE);
1459 1459
diff --git a/src/lib/elc_naviframe.c b/src/lib/elc_naviframe.c
index e71b1655e..22c6ee2f7 100644
--- a/src/lib/elc_naviframe.c
+++ b/src/lib/elc_naviframe.c
@@ -293,7 +293,7 @@ _item_style_set(Elm_Naviframe_Item *it,
293 293
294 if (!elm_layout_theme_set(VIEW(it), "naviframe", buf, 294 if (!elm_layout_theme_set(VIEW(it), "naviframe", buf,
295 elm_widget_style_get(WIDGET(it)))) 295 elm_widget_style_get(WIDGET(it))))
296 CRITICAL("Failed to set layout!"); 296 CRI("Failed to set layout!");
297 297
298 if (sd->freeze_events) 298 if (sd->freeze_events)
299 evas_object_freeze_events_set(VIEW(it), EINA_FALSE); 299 evas_object_freeze_events_set(VIEW(it), EINA_FALSE);
diff --git a/src/lib/elc_player.c b/src/lib/elc_player.c
index b92188904..a8c06e12b 100644
--- 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)
632 elm_widget_sub_object_parent_add(obj); 632 elm_widget_sub_object_parent_add(obj);
633 633
634 if (!elm_layout_theme_set(obj, "player", "base", elm_widget_style_get(obj))) 634 if (!elm_layout_theme_set(obj, "player", "base", elm_widget_style_get(obj)))
635 CRITICAL("Failed to set layout!"); 635 CRI("Failed to set layout!");
636 636
637 priv->forward = _player_button_add(obj, "forward", _forward); 637 priv->forward = _player_button_add(obj, "forward", _forward);
638 priv->info = _player_button_add(obj, "info", _info); 638 priv->info = _player_button_add(obj, "info", _info);
diff --git a/src/lib/elc_popup.c b/src/lib/elc_popup.c
index c9256b4f2..ef3220898 100644
--- 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)
339 { 339 {
340 snprintf(buf, sizeof(buf), "buttons%i", sd->last_button_number); 340 snprintf(buf, sizeof(buf), "buttons%i", sd->last_button_number);
341 if (!elm_layout_theme_set(sd->action_area, "popup", buf, style)) 341 if (!elm_layout_theme_set(sd->action_area, "popup", buf, style))
342 CRITICAL("Failed to set layout!"); 342 CRI("Failed to set layout!");
343 for (i = 0; i < ELM_POPUP_ACTION_BUTTON_MAX; i++) 343 for (i = 0; i < ELM_POPUP_ACTION_BUTTON_MAX; i++)
344 { 344 {
345 if (!sd->buttons[i]) continue; 345 if (!sd->buttons[i]) continue;
@@ -347,7 +347,7 @@ _elm_popup_smart_theme(Eo *obj, void *_pd, va_list *list)
347 } 347 }
348 } 348 }
349 if (!elm_layout_theme_set(sd->content_area, "popup", "content", style)) 349 if (!elm_layout_theme_set(sd->content_area, "popup", "content", style))
350 CRITICAL("Failed to set layout!"); 350 CRI("Failed to set layout!");
351 if (sd->text_content_obj) 351 if (sd->text_content_obj)
352 elm_object_style_set(sd->text_content_obj, style); 352 elm_object_style_set(sd->text_content_obj, style);
353 else if (sd->items) 353 else if (sd->items)
@@ -355,7 +355,7 @@ _elm_popup_smart_theme(Eo *obj, void *_pd, va_list *list)
355 EINA_LIST_FOREACH(sd->items, elist, it) 355 EINA_LIST_FOREACH(sd->items, elist, it)
356 { 356 {
357 if (!elm_layout_theme_set(VIEW(it), "popup", "item", style)) 357 if (!elm_layout_theme_set(VIEW(it), "popup", "item", style))
358 CRITICAL("Failed to set layout!"); 358 CRI("Failed to set layout!");
359 else 359 else
360 { 360 {
361 if (it->label) 361 if (it->label)
@@ -591,7 +591,7 @@ _button_remove(Evas_Object *obj,
591 snprintf(style, sizeof(style), "popup/%s", elm_widget_style_get(obj)); 591 snprintf(style, sizeof(style), "popup/%s", elm_widget_style_get(obj));
592 snprintf(buf, sizeof(buf), "buttons%i", sd->last_button_number); 592 snprintf(buf, sizeof(buf), "buttons%i", sd->last_button_number);
593 if (!elm_layout_theme_set(sd->action_area, "popup", buf, style)) 593 if (!elm_layout_theme_set(sd->action_area, "popup", buf, style))
594 CRITICAL("Failed to set layout!"); 594 CRI("Failed to set layout!");
595 } 595 }
596} 596}
597 597
@@ -867,7 +867,7 @@ _item_new(Elm_Popup_Item *it)
867 867
868 snprintf(style, sizeof(style), "popup/%s", elm_widget_style_get(WIDGET(it))); 868 snprintf(style, sizeof(style), "popup/%s", elm_widget_style_get(WIDGET(it)));
869 if (!elm_layout_theme_set(VIEW(it), "popup", "item", style)) 869 if (!elm_layout_theme_set(VIEW(it), "popup", "item", style))
870 CRITICAL("Failed to set layout!"); 870 CRI("Failed to set layout!");
871 else 871 else
872 { 872 {
873 elm_layout_signal_callback_add(VIEW(it), "elm,action,click", "*", 873 elm_layout_signal_callback_add(VIEW(it), "elm,action,click", "*",
@@ -1157,7 +1157,7 @@ _action_button_set(Evas_Object *obj,
1157 1157
1158 snprintf(style, sizeof(style), "popup/%s", elm_widget_style_get(obj)); 1158 snprintf(style, sizeof(style), "popup/%s", elm_widget_style_get(obj));
1159 if (!elm_layout_theme_set(sd->action_area, "popup", buf, style)) 1159 if (!elm_layout_theme_set(sd->action_area, "popup", buf, style))
1160 CRITICAL("Failed to set layout!"); 1160 CRI("Failed to set layout!");
1161 1161
1162 snprintf(buf, sizeof(buf), "elm.swallow.content.button%i", idx + 1); 1162 snprintf(buf, sizeof(buf), "elm.swallow.content.button%i", idx + 1);
1163 elm_object_part_content_set 1163 elm_object_part_content_set
@@ -1508,7 +1508,7 @@ _elm_popup_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
1508 1508
1509 snprintf(style, sizeof(style), "%s", "default"); 1509 snprintf(style, sizeof(style), "%s", "default");
1510 if (!elm_layout_theme_set(obj, "popup", "base", style)) 1510 if (!elm_layout_theme_set(obj, "popup", "base", style))
1511 CRITICAL("Failed to set layout!"); 1511 CRI("Failed to set layout!");
1512 1512
1513 snprintf(style, sizeof(style), "popup/%s", "default"); 1513 snprintf(style, sizeof(style), "popup/%s", "default");
1514 1514
@@ -1538,7 +1538,7 @@ _elm_popup_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
1538 1538
1539 priv->content_area = elm_layout_add(obj); 1539 priv->content_area = elm_layout_add(obj);
1540 if (!elm_layout_theme_set(priv->content_area, "popup", "content", style)) 1540 if (!elm_layout_theme_set(priv->content_area, "popup", "content", style))
1541 CRITICAL("Failed to set layout!"); 1541 CRI("Failed to set layout!");
1542 else 1542 else
1543 evas_object_event_callback_add 1543 evas_object_event_callback_add
1544 (priv->content_area, EVAS_CALLBACK_CHANGED_SIZE_HINTS, 1544 (priv->content_area, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
diff --git a/src/lib/elm_actionslider.c b/src/lib/elm_actionslider.c
index 272841ad5..663da3880 100644
--- 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)
420 420
421 if (!elm_layout_theme_set 421 if (!elm_layout_theme_set
422 (obj, "actionslider", "base", elm_widget_style_get(obj))) 422 (obj, "actionslider", "base", elm_widget_style_get(obj)))
423 CRITICAL("Failed to set layout!"); 423 CRI("Failed to set layout!");
424 424
425 elm_layout_content_set(obj, "elm.drag_button_base", priv->drag_button_base); 425 elm_layout_content_set(obj, "elm.drag_button_base", priv->drag_button_base);
426 426
diff --git a/src/lib/elm_bg.c b/src/lib/elm_bg.c
index d0a8690e1..174057d7e 100644
--- 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)
115 evas_object_event_callback_add(obj, EVAS_CALLBACK_RESIZE, _on_resize, obj); 115 evas_object_event_callback_add(obj, EVAS_CALLBACK_RESIZE, _on_resize, obj);
116 116
117 if (!elm_layout_theme_set(obj, "bg", "base", elm_widget_style_get(obj))) 117 if (!elm_layout_theme_set(obj, "bg", "base", elm_widget_style_get(obj)))
118 CRITICAL("Failed to set layout!"); 118 CRI("Failed to set layout!");
119} 119}
120 120
121static void 121static void
diff --git a/src/lib/elm_bubble.c b/src/lib/elm_bubble.c
index 5f4b365b2..46ca3a44d 100644
--- 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)
219 (_elm_access_info_get(obj), ELM_ACCESS_INFO, _access_info_cb, NULL); 219 (_elm_access_info_get(obj), ELM_ACCESS_INFO, _access_info_cb, NULL);
220 220
221 if (!elm_layout_theme_set(obj, "bubble", "base", elm_widget_style_get(obj))) 221 if (!elm_layout_theme_set(obj, "bubble", "base", elm_widget_style_get(obj)))
222 CRITICAL("Failed to set layout!"); 222 CRI("Failed to set layout!");
223 223
224 elm_layout_sizing_eval(obj); 224 elm_layout_sizing_eval(obj);
225 225
diff --git a/src/lib/elm_button.c b/src/lib/elm_button.c
index 3ebfe5836..a0aa24238 100644
--- 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)
309 309
310 elm_widget_can_focus_set(obj, EINA_TRUE); 310 elm_widget_can_focus_set(obj, EINA_TRUE);
311 if (!elm_layout_theme_set(obj, "button", "base", elm_widget_style_get(obj))) 311 if (!elm_layout_theme_set(obj, "button", "base", elm_widget_style_get(obj)))
312 CRITICAL("Failed to set layout!"); 312 CRI("Failed to set layout!");
313} 313}
314 314
315static void 315static void
diff --git a/src/lib/elm_calendar.c b/src/lib/elm_calendar.c
index 096cf1269..01586383b 100644
--- 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)
1014 1014
1015 if (!elm_layout_theme_set(obj, "calendar", "base", 1015 if (!elm_layout_theme_set(obj, "calendar", "base",
1016 elm_object_style_get(obj))) 1016 elm_object_style_get(obj)))
1017 CRITICAL("Failed to set layout!"); 1017 CRI("Failed to set layout!");
1018 1018
1019 evas_object_smart_changed(obj); 1019 evas_object_smart_changed(obj);
1020 1020
diff --git a/src/lib/elm_check.c b/src/lib/elm_check.c
index 769a6b356..fc6035c8d 100644
--- 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)
318 elm_widget_can_focus_set(obj, EINA_TRUE); 318 elm_widget_can_focus_set(obj, EINA_TRUE);
319 319
320 if (!elm_layout_theme_set(obj, "check", "base", elm_widget_style_get(obj))) 320 if (!elm_layout_theme_set(obj, "check", "base", elm_widget_style_get(obj)))
321 CRITICAL("Failed to set layout!"); 321 CRI("Failed to set layout!");
322 322
323 elm_layout_sizing_eval(obj); 323 elm_layout_sizing_eval(obj);
324} 324}
diff --git a/src/lib/elm_clock.c b/src/lib/elm_clock.c
index d377d7663..30b5dcb31 100644
--- a/src/lib/elm_clock.c
+++ b/src/lib/elm_clock.c
@@ -368,22 +368,22 @@ _time_update(Evas_Object *obj)
368 if ((sd->seconds) && (sd->am_pm)) 368 if ((sd->seconds) && (sd->am_pm))
369 { 369 {
370 if (!elm_layout_theme_set(obj, "clock", "base-all", style)) 370 if (!elm_layout_theme_set(obj, "clock", "base-all", style))
371 CRITICAL("Failed to set layout!"); 371 CRI("Failed to set layout!");
372 } 372 }
373 else if (sd->seconds) 373 else if (sd->seconds)
374 { 374 {
375 if (!elm_layout_theme_set(obj, "clock", "base-seconds", style)) 375 if (!elm_layout_theme_set(obj, "clock", "base-seconds", style))
376 CRITICAL("Failed to set layout!"); 376 CRI("Failed to set layout!");
377 } 377 }
378 else if (sd->am_pm) 378 else if (sd->am_pm)
379 { 379 {
380 if (!elm_layout_theme_set(obj, "clock", "base-am_pm", style)) 380 if (!elm_layout_theme_set(obj, "clock", "base-am_pm", style))
381 CRITICAL("Failed to set layout!"); 381 CRI("Failed to set layout!");
382 } 382 }
383 else 383 else
384 { 384 {
385 if (!elm_layout_theme_set(obj, "clock", "base", style)) 385 if (!elm_layout_theme_set(obj, "clock", "base", style))
386 CRITICAL("Failed to set layout!"); 386 CRI("Failed to set layout!");
387 } 387 }
388 388
389 edje_object_scale_set 389 edje_object_scale_set
diff --git a/src/lib/elm_colorselector.c b/src/lib/elm_colorselector.c
index b4fddc53f..57920d39d 100644
--- 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)
1103 { 1103 {
1104 if (!elm_layout_theme_set 1104 if (!elm_layout_theme_set
1105 (VIEW(item), "colorselector", "item", elm_widget_style_get(obj))) 1105 (VIEW(item), "colorselector", "item", elm_widget_style_get(obj)))
1106 CRITICAL("Failed to set layout!"); 1106 CRI("Failed to set layout!");
1107 1107
1108 elm_widget_theme_object_set 1108 elm_widget_theme_object_set
1109 (obj, item->color_obj, "colorselector", "item/color", 1109 (obj, item->color_obj, "colorselector", "item/color",
@@ -1391,7 +1391,7 @@ _item_new(Evas_Object *obj)
1391 VIEW(item) = elm_layout_add(obj); 1391 VIEW(item) = elm_layout_add(obj);
1392 if (!elm_layout_theme_set 1392 if (!elm_layout_theme_set
1393 (VIEW(item), "colorselector", "item", elm_widget_style_get(obj))) 1393 (VIEW(item), "colorselector", "item", elm_widget_style_get(obj)))
1394 CRITICAL("Failed to set layout!"); 1394 CRI("Failed to set layout!");
1395 evas_object_size_hint_weight_set 1395 evas_object_size_hint_weight_set
1396 (VIEW(item), EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 1396 (VIEW(item), EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
1397 evas_object_size_hint_align_set(VIEW(item), EVAS_HINT_FILL, EVAS_HINT_FILL); 1397 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)
1498 1498
1499 if (!elm_layout_theme_set 1499 if (!elm_layout_theme_set
1500 (obj, "colorselector", "palette", elm_object_style_get(obj))) 1500 (obj, "colorselector", "palette", elm_object_style_get(obj)))
1501 CRITICAL("Failed to set layout!"); 1501 CRI("Failed to set layout!");
1502 1502
1503 priv->palette_box = elm_box_add(obj); 1503 priv->palette_box = elm_box_add(obj);
1504 elm_box_layout_set 1504 elm_box_layout_set
diff --git a/src/lib/elm_conform.c b/src/lib/elm_conform.c
index 5fc424d2f..9c3312d6f 100644
--- 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
887 887
888 if (!elm_layout_theme_set 888 if (!elm_layout_theme_set
889 (obj, "conformant", "base", elm_widget_style_get(obj))) 889 (obj, "conformant", "base", elm_widget_style_get(obj)))
890 CRITICAL("Failed to set layout!"); 890 CRI("Failed to set layout!");
891 891
892 _conformant_parts_swallow(obj); 892 _conformant_parts_swallow(obj);
893 893
diff --git a/src/lib/elm_datetime.c b/src/lib/elm_datetime.c
index bc5eaf8c8..4dc0acc26 100644
--- 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)
805 805
806 if (!elm_layout_theme_set(obj, "datetime", "base", 806 if (!elm_layout_theme_set(obj, "datetime", "base",
807 elm_widget_style_get(obj))) 807 elm_widget_style_get(obj)))
808 CRITICAL("Failed to set layout!"); 808 CRI("Failed to set layout!");
809 809
810 // module - initialise module for datetime 810 // module - initialise module for datetime
811 if (!dt_mod) dt_mod = _dt_mod_init(); 811 if (!dt_mod) dt_mod = _dt_mod_init();
diff --git a/src/lib/elm_dayselector.c b/src/lib/elm_dayselector.c
index e2e1da560..087c7a169 100644
--- 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)
436 436
437 if (!elm_layout_theme_set(obj, "dayselector", "base", 437 if (!elm_layout_theme_set(obj, "dayselector", "base",
438 elm_widget_style_get(obj))) 438 elm_widget_style_get(obj)))
439 CRITICAL("Failed to set layout!"); 439 CRI("Failed to set layout!");
440 440
441 priv->week_start = _elm_config->week_start; 441 priv->week_start = _elm_config->week_start;
442 priv->weekend_start = _elm_config->weekend_start; 442 priv->weekend_start = _elm_config->weekend_start;
diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index e2855881b..873cfd4c1 100644
--- 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)
3157 priv->editable = EINA_TRUE; 3157 priv->editable = EINA_TRUE;
3158 3158
3159 if (!elm_layout_theme_set(obj, "entry", "base", elm_widget_style_get(obj))) 3159 if (!elm_layout_theme_set(obj, "entry", "base", elm_widget_style_get(obj)))
3160 CRITICAL("Failed to set layout!"); 3160 CRI("Failed to set layout!");
3161 3161
3162 priv->hit_rect = evas_object_rectangle_add(evas_object_evas_get(obj)); 3162 priv->hit_rect = evas_object_rectangle_add(evas_object_evas_get(obj));
3163 evas_object_data_set(priv->hit_rect, "_elm_leaveme", obj); 3163 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 9b9ca2767..b7ab713ab 100644
--- 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)
557 557
558 if (!elm_layout_theme_set 558 if (!elm_layout_theme_set
559 (obj, "flipselector", "base", elm_widget_style_get(obj))) 559 (obj, "flipselector", "base", elm_widget_style_get(obj)))
560 CRITICAL("Failed to set layout!"); 560 CRI("Failed to set layout!");
561 561
562 elm_layout_signal_callback_add 562 elm_layout_signal_callback_add
563 (obj, "elm,action,up,start", "*", _signal_val_up_start, obj); 563 (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 28c86d214..4512ad7ff 100644
--- 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)
187 elm_widget_can_focus_set(obj, EINA_FALSE); 187 elm_widget_can_focus_set(obj, EINA_FALSE);
188 188
189 if (!elm_layout_theme_set(obj, "frame", "base", elm_widget_style_get(obj))) 189 if (!elm_layout_theme_set(obj, "frame", "base", elm_widget_style_get(obj)))
190 CRITICAL("Failed to set layout!"); 190 CRI("Failed to set layout!");
191 191
192 elm_layout_sizing_eval(obj); 192 elm_layout_sizing_eval(obj);
193} 193}
diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c
index 366dea4d2..bde798a28 100644
--- 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)
2401 2401
2402 if (!elm_layout_theme_set(obj, "gengrid", "base", 2402 if (!elm_layout_theme_set(obj, "gengrid", "base",
2403 elm_widget_style_get(obj))) 2403 elm_widget_style_get(obj)))
2404 CRITICAL("Failed to set layout!"); 2404 CRI("Failed to set layout!");
2405 2405
2406 eo_do(obj, elm_scrollable_interface_objects_set(wd->resize_obj, priv->hit_rect)); 2406 eo_do(obj, elm_scrollable_interface_objects_set(wd->resize_obj, priv->hit_rect));
2407 2407
diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index 3ca50ebac..c97a001b4 100644
--- 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)
4909 4909
4910 if (!elm_layout_theme_set 4910 if (!elm_layout_theme_set
4911 (obj, "genlist", "base", elm_widget_style_get(obj))) 4911 (obj, "genlist", "base", elm_widget_style_get(obj)))
4912 CRITICAL("Failed to set layout!"); 4912 CRI("Failed to set layout!");
4913 4913
4914 eo_do(obj, elm_scrollable_interface_objects_set(wd->resize_obj, priv->hit_rect)); 4914 eo_do(obj, elm_scrollable_interface_objects_set(wd->resize_obj, priv->hit_rect));
4915 4915
diff --git a/src/lib/elm_gesture_layer.c b/src/lib/elm_gesture_layer.c
index 274f81d3c..351d0bef9 100644
--- 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)
64 ELM_GESTURE_LAYER_DATA_GET(o, ptr); \ 64 ELM_GESTURE_LAYER_DATA_GET(o, ptr); \
65 if (!ptr) \ 65 if (!ptr) \
66 { \ 66 { \
67 CRITICAL("No widget data for object %p (%s)", \ 67 CRI("No widget data for object %p (%s)", \
68 o, evas_object_type_get(o)); \ 68 o, evas_object_type_get(o)); \
69 return; \ 69 return; \
70 } 70 }
@@ -73,7 +73,7 @@ _glayer_buf_dup(void *buf, size_t size)
73 ELM_GESTURE_LAYER_DATA_GET(o, ptr); \ 73 ELM_GESTURE_LAYER_DATA_GET(o, ptr); \
74 if (!ptr) \ 74 if (!ptr) \
75 { \ 75 { \
76 CRITICAL("No widget data for object %p (%s)", \ 76 CRI("No widget data for object %p (%s)", \
77 o, evas_object_type_get(o)); \ 77 o, evas_object_type_get(o)); \
78 return val; \ 78 return val; \
79 } 79 }
diff --git a/src/lib/elm_hover.c b/src/lib/elm_hover.c
index 4fb5e18b1..5f20fb1cc 100644
--- 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)
552 priv->subs[i].swallow = _content_aliases[i].alias; 552 priv->subs[i].swallow = _content_aliases[i].alias;
553 553
554 if (!elm_layout_theme_set(obj, "hover", "base", elm_widget_style_get(obj))) 554 if (!elm_layout_theme_set(obj, "hover", "base", elm_widget_style_get(obj)))
555 CRITICAL("Failed to set layout!"); 555 CRI("Failed to set layout!");
556 556
557 elm_layout_signal_callback_add 557 elm_layout_signal_callback_add
558 (obj, "elm,action,dismiss", "*", _hov_dismiss_cb, obj); 558 (obj, "elm,action,dismiss", "*", _hov_dismiss_cb, obj);
diff --git a/src/lib/elm_index.c b/src/lib/elm_index.c
index f61caadb9..8e7f7d822 100644
--- 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)
901 901
902 if (!elm_layout_theme_set 902 if (!elm_layout_theme_set
903 (obj, "index", "base/vertical", elm_widget_style_get(obj))) 903 (obj, "index", "base/vertical", elm_widget_style_get(obj)))
904 CRITICAL("Failed to set layout!"); 904 CRI("Failed to set layout!");
905 905
906 evas_object_event_callback_add 906 evas_object_event_callback_add
907 (obj, EVAS_CALLBACK_RESIZE, _index_resize_cb, NULL); 907 (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 496bf4631..b092cf344 100644
--- 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;
18 Elm_Pan_Smart_Data *ptr = eo_data_scope_get(o, MY_PAN_CLASS); \ 18 Elm_Pan_Smart_Data *ptr = eo_data_scope_get(o, MY_PAN_CLASS); \
19 if (!ptr) \ 19 if (!ptr) \
20 { \ 20 { \
21 CRITICAL("No smart data for object %p (%s)", \ 21 CRI("No smart data for object %p (%s)", \
22 o, evas_object_type_get(o)); \ 22 o, evas_object_type_get(o)); \
23 return; \ 23 return; \
24 } 24 }
@@ -27,7 +27,7 @@ EAPI Eo_Op ELM_OBJ_PAN_BASE_ID = EO_NOOP;
27 Elm_Pan_Smart_Data *ptr = eo_data_scope_get(o, MY_PAN_CLASS); \ 27 Elm_Pan_Smart_Data *ptr = eo_data_scope_get(o, MY_PAN_CLASS); \
28 if (!ptr) \ 28 if (!ptr) \
29 { \ 29 { \
30 CRITICAL("No smart data for object %p (%s)", \ 30 CRI("No smart data for object %p (%s)", \
31 o, evas_object_type_get(o)); \ 31 o, evas_object_type_get(o)); \
32 return val; \ 32 return val; \
33 } 33 }
@@ -395,7 +395,7 @@ EAPI Eo_Op ELM_SCROLLABLE_INTERFACE_BASE_ID = EO_NOOP;
395 eo_data_scope_get(o, MY_SCROLLABLE_INTERFACE)); \ 395 eo_data_scope_get(o, MY_SCROLLABLE_INTERFACE)); \
396 if (!ptr) \ 396 if (!ptr) \
397 { \ 397 { \
398 CRITICAL("No interface data for object %p (%s)", \ 398 CRI("No interface data for object %p (%s)", \
399 o, evas_object_type_get(o)); \ 399 o, evas_object_type_get(o)); \
400 return; \ 400 return; \
401 } 401 }
@@ -406,7 +406,7 @@ EAPI Eo_Op ELM_SCROLLABLE_INTERFACE_BASE_ID = EO_NOOP;
406 eo_data_scope_get(o, MY_SCROLLABLE_INTERFACE)); \ 406 eo_data_scope_get(o, MY_SCROLLABLE_INTERFACE)); \
407 if (!ptr) \ 407 if (!ptr) \
408 { \ 408 { \
409 CRITICAL("No interface data for object %p (%s)", \ 409 CRI("No interface data for object %p (%s)", \
410 o, evas_object_type_get(o)); \ 410 o, evas_object_type_get(o)); \
411 return val; \ 411 return val; \
412 } 412 }
diff --git a/src/lib/elm_inwin.c b/src/lib/elm_inwin.c
index c4e945bc9..11266f972 100644
--- 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)
83 evas_object_size_hint_weight_set(obj, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 83 evas_object_size_hint_weight_set(obj, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
84 evas_object_size_hint_align_set(obj, EVAS_HINT_FILL, EVAS_HINT_FILL); 84 evas_object_size_hint_align_set(obj, EVAS_HINT_FILL, EVAS_HINT_FILL);
85 if (!elm_layout_theme_set(obj, "win", "inwin", elm_object_style_get(obj))) 85 if (!elm_layout_theme_set(obj, "win", "inwin", elm_object_style_get(obj)))
86 CRITICAL("Failed to set layout!"); 86 CRI("Failed to set layout!");
87} 87}
88 88
89static void 89static void
diff --git a/src/lib/elm_label.c b/src/lib/elm_label.c
index 5b8111712..7881c18d7 100644
--- 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)
410 (_elm_access_info_get(obj), ELM_ACCESS_INFO, _access_info_cb, NULL); 410 (_elm_access_info_get(obj), ELM_ACCESS_INFO, _access_info_cb, NULL);
411 411
412 if (!elm_layout_theme_set(obj, "label", "base", elm_widget_style_get(obj))) 412 if (!elm_layout_theme_set(obj, "label", "base", elm_widget_style_get(obj)))
413 CRITICAL("Failed to set layout!"); 413 CRI("Failed to set layout!");
414 414
415 elm_layout_text_set(obj, NULL, "<br>"); 415 elm_layout_text_set(obj, NULL, "<br>");
416 elm_layout_sizing_eval(obj); 416 elm_layout_sizing_eval(obj);
diff --git a/src/lib/elm_list.c b/src/lib/elm_list.c
index 4ea1b084a..e38bd32aa 100644
--- 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)
1773 priv->mode = ELM_LIST_SCROLL; 1773 priv->mode = ELM_LIST_SCROLL;
1774 1774
1775 if (!elm_layout_theme_set(obj, "list", "base", elm_widget_style_get(obj))) 1775 if (!elm_layout_theme_set(obj, "list", "base", elm_widget_style_get(obj)))
1776 CRITICAL("Failed to set layout!"); 1776 CRI("Failed to set layout!");
1777 1777
1778 priv->hit_rect = evas_object_rectangle_add(evas_object_evas_get(obj)); 1778 priv->hit_rect = evas_object_rectangle_add(evas_object_evas_get(obj));
1779 evas_object_data_set(priv->hit_rect, "_elm_leaveme", obj); 1779 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 bf6b4321f..361da6585 100644
--- a/src/lib/elm_map.c
+++ b/src/lib/elm_map.c
@@ -1524,7 +1524,7 @@ _overlay_default_layout_update(Overlay_Default *ovl)
1524 if (!elm_layout_theme_set 1524 if (!elm_layout_theme_set
1525 (ovl->layout, "map/marker", "empty", 1525 (ovl->layout, "map/marker", "empty",
1526 elm_widget_style_get((ovl->wsd)->obj))) 1526 elm_widget_style_get((ovl->wsd)->obj)))
1527 CRITICAL("Failed to set layout!"); 1527 CRI("Failed to set layout!");
1528 1528
1529 elm_object_part_content_set(ovl->layout, "elm.icon", ovl->icon); 1529 elm_object_part_content_set(ovl->layout, "elm.icon", ovl->icon);
1530 } 1530 }
@@ -1534,7 +1534,7 @@ _overlay_default_layout_update(Overlay_Default *ovl)
1534 if (!elm_layout_theme_set 1534 if (!elm_layout_theme_set
1535 (ovl->layout, "map/marker", "empty", 1535 (ovl->layout, "map/marker", "empty",
1536 elm_widget_style_get((ovl->wsd)->obj))) 1536 elm_widget_style_get((ovl->wsd)->obj)))
1537 CRITICAL("Failed to set layout!"); 1537 CRI("Failed to set layout!");
1538 1538
1539 elm_object_part_content_set(ovl->layout, "elm.icon", ovl->clas_icon); 1539 elm_object_part_content_set(ovl->layout, "elm.icon", ovl->clas_icon);
1540 } 1540 }
@@ -1545,7 +1545,7 @@ _overlay_default_layout_update(Overlay_Default *ovl)
1545 if (!elm_layout_theme_set 1545 if (!elm_layout_theme_set
1546 (ovl->layout, "map/marker", "radio", 1546 (ovl->layout, "map/marker", "radio",
1547 elm_widget_style_get((ovl->wsd)->obj))) 1547 elm_widget_style_get((ovl->wsd)->obj)))
1548 CRITICAL("Failed to set layout!"); 1548 CRI("Failed to set layout!");
1549 } 1549 }
1550} 1550}
1551 1551
@@ -1629,7 +1629,7 @@ _overlay_default_new(Elm_Map_Overlay *overlay,
1629 evas_object_stack_above(ovl->layout, ovl->wsd->sep_maps_overlays); 1629 evas_object_stack_above(ovl->layout, ovl->wsd->sep_maps_overlays);
1630 if (!elm_layout_theme_set(ovl->layout, "map/marker", "radio", 1630 if (!elm_layout_theme_set(ovl->layout, "map/marker", "radio",
1631 elm_widget_style_get((ovl->wsd)->obj))) 1631 elm_widget_style_get((ovl->wsd)->obj)))
1632 CRITICAL("Failed to set layout!"); 1632 CRI("Failed to set layout!");
1633 1633
1634 evas_object_event_callback_add(ovl->layout, EVAS_CALLBACK_MOUSE_DOWN, 1634 evas_object_event_callback_add(ovl->layout, EVAS_CALLBACK_MOUSE_DOWN,
1635 _overlay_clicked_cb, overlay); 1635 _overlay_clicked_cb, overlay);
@@ -2322,7 +2322,7 @@ _overlay_circle_new(Elm_Map_Smart_Data *sd,
2322 evas_object_stack_above(ovl->obj, sd->sep_maps_overlays); 2322 evas_object_stack_above(ovl->obj, sd->sep_maps_overlays);
2323 if (!elm_layout_theme_set(ovl->obj, "map/circle", "base", 2323 if (!elm_layout_theme_set(ovl->obj, "map/circle", "base",
2324 elm_widget_style_get(sd->obj))) 2324 elm_widget_style_get(sd->obj)))
2325 CRITICAL("Failed to set layout!"); 2325 CRI("Failed to set layout!");
2326 2326
2327 _overlay_circle_color_update(ovl, c); 2327 _overlay_circle_color_update(ovl, c);
2328 2328
@@ -2408,7 +2408,7 @@ _overlay_scale_new(Elm_Map_Smart_Data *sd,
2408 evas_object_stack_above(ovl->obj, sd->sep_maps_overlays); 2408 evas_object_stack_above(ovl->obj, sd->sep_maps_overlays);
2409 if (!elm_layout_theme_set(ovl->obj, "map/scale", "base", 2409 if (!elm_layout_theme_set(ovl->obj, "map/scale", "base",
2410 elm_widget_style_get(sd->obj))) 2410 elm_widget_style_get(sd->obj)))
2411 CRITICAL("Failed to set layout!"); 2411 CRI("Failed to set layout!");
2412 2412
2413 s = edje_object_data_get(elm_layout_edje_get(ovl->obj), "size_w"); 2413 s = edje_object_data_get(elm_layout_edje_get(ovl->obj), "size_w");
2414 2414
diff --git a/src/lib/elm_menu.c b/src/lib/elm_menu.c
index a476a7fe1..fd0cd8f6c 100644
--- 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)
215 { 215 {
216 if (!elm_layout_theme_set(VIEW(item), "menu", "separator", 216 if (!elm_layout_theme_set(VIEW(item), "menu", "separator",
217 elm_widget_style_get(obj))) 217 elm_widget_style_get(obj)))
218 CRITICAL("Failed to set layout!"); 218 CRI("Failed to set layout!");
219 } 219 }
220 else if (item->submenu.bx) 220 else if (item->submenu.bx)
221 { 221 {
@@ -224,7 +224,7 @@ _elm_menu_smart_theme(Eo *obj, void *_pd, va_list *list)
224 224
225 if (!elm_layout_theme_set(VIEW(item), "menu", s, 225 if (!elm_layout_theme_set(VIEW(item), "menu", s,
226 elm_widget_style_get(obj))) 226 elm_widget_style_get(obj)))
227 CRITICAL("Failed to set layout!"); 227 CRI("Failed to set layout!");
228 228
229 elm_object_item_text_set((Elm_Object_Item *)item, 229 elm_object_item_text_set((Elm_Object_Item *)item,
230 item->label); 230 item->label);
@@ -236,7 +236,7 @@ _elm_menu_smart_theme(Eo *obj, void *_pd, va_list *list)
236 { 236 {
237 if (!elm_layout_theme_set(VIEW(item), "menu", "item", 237 if (!elm_layout_theme_set(VIEW(item), "menu", "item",
238 elm_widget_style_get(obj))) 238 elm_widget_style_get(obj)))
239 CRITICAL("Failed to set layout!"); 239 CRI("Failed to set layout!");
240 240
241 elm_object_item_text_set((Elm_Object_Item *)item, 241 elm_object_item_text_set((Elm_Object_Item *)item,
242 item->label); 242 item->label);
@@ -495,7 +495,7 @@ _item_obj_create(Elm_Menu_Item *item)
495 evas_object_size_hint_fill_set(VIEW(item), EVAS_HINT_FILL, EVAS_HINT_FILL); 495 evas_object_size_hint_fill_set(VIEW(item), EVAS_HINT_FILL, EVAS_HINT_FILL);
496 if (!elm_layout_theme_set(VIEW(item), "menu", "item", 496 if (!elm_layout_theme_set(VIEW(item), "menu", "item",
497 elm_widget_style_get(WIDGET(item)))) 497 elm_widget_style_get(WIDGET(item))))
498 CRITICAL("Failed to set layout!"); 498 CRI("Failed to set layout!");
499 else 499 else
500 { 500 {
501 elm_layout_signal_callback_add(VIEW(item), "elm,action,click", "*", 501 elm_layout_signal_callback_add(VIEW(item), "elm,action,click", "*",
@@ -518,7 +518,7 @@ _item_separator_obj_create(Elm_Menu_Item *item)
518 evas_object_size_hint_fill_set(VIEW(item), EVAS_HINT_FILL, EVAS_HINT_FILL); 518 evas_object_size_hint_fill_set(VIEW(item), EVAS_HINT_FILL, EVAS_HINT_FILL);
519 if (!elm_layout_theme_set(VIEW(item), "menu", "separator", 519 if (!elm_layout_theme_set(VIEW(item), "menu", "separator",
520 elm_widget_style_get(WIDGET(item)))) 520 elm_widget_style_get(WIDGET(item))))
521 CRITICAL("Failed to set layout!"); 521 CRI("Failed to set layout!");
522 else 522 else
523 { 523 {
524 elm_layout_signal_callback_add 524 elm_layout_signal_callback_add
@@ -561,14 +561,14 @@ _item_submenu_obj_create(Elm_Menu_Item *item)
561 if (!elm_layout_theme_set(VIEW(item), "menu", 561 if (!elm_layout_theme_set(VIEW(item), "menu",
562 "main_menu_submenu", 562 "main_menu_submenu",
563 elm_widget_style_get(WIDGET(item)))) 563 elm_widget_style_get(WIDGET(item))))
564 CRITICAL("Failed to set layout!"); 564 CRI("Failed to set layout!");
565 } 565 }
566 else 566 else
567 { 567 {
568 if (!elm_layout_theme_set(VIEW(item), "menu", 568 if (!elm_layout_theme_set(VIEW(item), "menu",
569 "item_with_submenu", 569 "item_with_submenu",
570 elm_widget_style_get(WIDGET(item)))) 570 elm_widget_style_get(WIDGET(item))))
571 CRITICAL("Failed to set layout!"); 571 CRI("Failed to set layout!");
572 } 572 }
573 573
574 elm_object_item_text_set((Elm_Object_Item *)item, item->label); 574 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 cefc49da1..459a3f764 100644
--- a/src/lib/elm_notify.c
+++ b/src/lib/elm_notify.c
@@ -94,7 +94,7 @@ _block_events_theme_apply(Evas_Object *obj)
94 94
95 if (!elm_layout_theme_set 95 if (!elm_layout_theme_set
96 (sd->block_events, "notify", "block_events", style)) 96 (sd->block_events, "notify", "block_events", style))
97 CRITICAL("Failed to set layout!"); 97 CRI("Failed to set layout!");
98} 98}
99 99
100static void 100static void
diff --git a/src/lib/elm_panel.c b/src/lib/elm_panel.c
index 3dfac24ab..13d8c3fd3 100644
--- a/src/lib/elm_panel.c
+++ b/src/lib/elm_panel.c
@@ -68,13 +68,13 @@ _orient_set_do(Evas_Object *obj)
68 case ELM_PANEL_ORIENT_TOP: 68 case ELM_PANEL_ORIENT_TOP:
69 if (!elm_layout_theme_set 69 if (!elm_layout_theme_set
70 (obj, "panel", "top", elm_widget_style_get(obj))) 70 (obj, "panel", "top", elm_widget_style_get(obj)))
71 CRITICAL("Failed to set layout!"); 71 CRI("Failed to set layout!");
72 break; 72 break;
73 73
74 case ELM_PANEL_ORIENT_BOTTOM: 74 case ELM_PANEL_ORIENT_BOTTOM:
75 if (!elm_layout_theme_set 75 if (!elm_layout_theme_set
76 (obj, "panel", "bottom", elm_widget_style_get(obj))) 76 (obj, "panel", "bottom", elm_widget_style_get(obj)))
77 CRITICAL("Failed to set layout!"); 77 CRI("Failed to set layout!");
78 break; 78 break;
79 79
80 case ELM_PANEL_ORIENT_LEFT: 80 case ELM_PANEL_ORIENT_LEFT:
@@ -82,13 +82,13 @@ _orient_set_do(Evas_Object *obj)
82 { 82 {
83 if (!elm_layout_theme_set 83 if (!elm_layout_theme_set
84 (obj, "panel", "left", elm_widget_style_get(obj))) 84 (obj, "panel", "left", elm_widget_style_get(obj)))
85 CRITICAL("Failed to set layout!"); 85 CRI("Failed to set layout!");
86 } 86 }
87 else 87 else
88 { 88 {
89 if (!elm_layout_theme_set 89 if (!elm_layout_theme_set
90 (obj, "panel", "right", elm_widget_style_get(obj))) 90 (obj, "panel", "right", elm_widget_style_get(obj)))
91 CRITICAL("Failed to set layout!"); 91 CRI("Failed to set layout!");
92 } 92 }
93 break; 93 break;
94 94
@@ -97,13 +97,13 @@ _orient_set_do(Evas_Object *obj)
97 { 97 {
98 if (!elm_layout_theme_set 98 if (!elm_layout_theme_set
99 (obj, "panel", "right", elm_widget_style_get(obj))) 99 (obj, "panel", "right", elm_widget_style_get(obj)))
100 CRITICAL("Failed to set layout!"); 100 CRI("Failed to set layout!");
101 } 101 }
102 else 102 else
103 { 103 {
104 if (!elm_layout_theme_set 104 if (!elm_layout_theme_set
105 (obj, "panel", "left", elm_widget_style_get(obj))) 105 (obj, "panel", "left", elm_widget_style_get(obj)))
106 CRITICAL("Failed to set layout!"); 106 CRI("Failed to set layout!");
107 } 107 }
108 break; 108 break;
109 } 109 }
@@ -361,7 +361,7 @@ _elm_panel_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
361 361
362 /* just to bootstrap and have theme hook to work */ 362 /* just to bootstrap and have theme hook to work */
363 if (!elm_layout_theme_set(obj, "panel", "top", elm_widget_style_get(obj))) 363 if (!elm_layout_theme_set(obj, "panel", "top", elm_widget_style_get(obj)))
364 CRITICAL("Failed to set layout!"); 364 CRI("Failed to set layout!");
365 365
366 eo_do(obj, elm_wdg_theme(NULL)); 366 eo_do(obj, elm_wdg_theme(NULL));
367 367
diff --git a/src/lib/elm_panes.c b/src/lib/elm_panes.c
index 1bb0d7354..c837fd760 100644
--- 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)
202 202
203 if (!elm_layout_theme_set 203 if (!elm_layout_theme_set
204 (obj, "panes", "vertical", elm_widget_style_get(obj))) 204 (obj, "panes", "vertical", elm_widget_style_get(obj)))
205 CRITICAL("Failed to set layout!"); 205 CRI("Failed to set layout!");
206 206
207 elm_panes_content_left_size_set(obj, 0.5); 207 elm_panes_content_left_size_set(obj, 0.5);
208 208
diff --git a/src/lib/elm_priv.h b/src/lib/elm_priv.h
index e99a60b4b..a8757c3d7 100644
--- a/src/lib/elm_priv.h
+++ b/src/lib/elm_priv.h
@@ -47,7 +47,7 @@
47# include <langinfo.h> 47# include <langinfo.h>
48#endif 48#endif
49 49
50#define CRITICAL(...) EINA_LOG_DOM_CRIT(_elm_log_dom, __VA_ARGS__) 50#define CRI(...) EINA_LOG_DOM_CRIT(_elm_log_dom, __VA_ARGS__)
51#define ERR(...) EINA_LOG_DOM_ERR(_elm_log_dom, __VA_ARGS__) 51#define ERR(...) EINA_LOG_DOM_ERR(_elm_log_dom, __VA_ARGS__)
52#define WRN(...) EINA_LOG_DOM_WARN(_elm_log_dom, __VA_ARGS__) 52#define WRN(...) EINA_LOG_DOM_WARN(_elm_log_dom, __VA_ARGS__)
53#define INF(...) EINA_LOG_DOM_INFO(_elm_log_dom, __VA_ARGS__) 53#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 89e86edea..560694601 100644
--- 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)
275 275
276 if (!elm_layout_theme_set 276 if (!elm_layout_theme_set
277 (obj, "progressbar", "horizontal", elm_widget_style_get(obj))) 277 (obj, "progressbar", "horizontal", elm_widget_style_get(obj)))
278 CRITICAL("Failed to set layout!"); 278 CRI("Failed to set layout!");
279 279
280 priv->spacer = evas_object_rectangle_add(evas_object_evas_get(obj)); 280 priv->spacer = evas_object_rectangle_add(evas_object_evas_get(obj));
281 evas_object_color_set(priv->spacer, 0, 0, 0, 0); 281 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 469644554..4895a91fd 100644
--- 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)
279 elm_widget_sub_object_parent_add(obj); 279 elm_widget_sub_object_parent_add(obj);
280 280
281 if (!elm_layout_theme_set(obj, "radio", "base", elm_widget_style_get(obj))) 281 if (!elm_layout_theme_set(obj, "radio", "base", elm_widget_style_get(obj)))
282 CRITICAL("Failed to set layout!"); 282 CRI("Failed to set layout!");
283 283
284 elm_layout_signal_callback_add 284 elm_layout_signal_callback_add
285 (obj, "elm,action,radio,toggle", "*", _radio_on_cb, obj); 285 (obj, "elm,action,radio,toggle", "*", _radio_on_cb, obj);
diff --git a/src/lib/elm_scroller.c b/src/lib/elm_scroller.c
index edfc9b88a..93d5a0701 100644
--- 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)
746 746
747 if (!elm_layout_theme_set 747 if (!elm_layout_theme_set
748 (obj, "scroller", "base", elm_widget_style_get(obj))) 748 (obj, "scroller", "base", elm_widget_style_get(obj)))
749 CRITICAL("Failed to set layout!"); 749 CRI("Failed to set layout!");
750 750
751 priv->hit_rect = evas_object_rectangle_add(evas_object_evas_get(obj)); 751 priv->hit_rect = evas_object_rectangle_add(evas_object_evas_get(obj));
752 evas_object_smart_member_add(priv->hit_rect, obj); 752 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 6fb8a1545..1bc7fa339 100644
--- 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
613 613
614 if (!elm_layout_theme_set 614 if (!elm_layout_theme_set
615 (obj, "segment_control", "base", elm_widget_style_get(obj))) 615 (obj, "segment_control", "base", elm_widget_style_get(obj)))
616 CRITICAL("Failed to set layout!"); 616 CRI("Failed to set layout!");
617 617
618 evas_object_event_callback_add 618 evas_object_event_callback_add
619 (obj, EVAS_CALLBACK_RESIZE, _on_move_resize, obj); 619 (obj, EVAS_CALLBACK_RESIZE, _on_move_resize, obj);
diff --git a/src/lib/elm_separator.c b/src/lib/elm_separator.c
index 2b4256045..91c9252fd 100644
--- 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__,
57 57
58 if (!elm_layout_theme_set 58 if (!elm_layout_theme_set
59 (obj, "separator", "vertical", elm_widget_style_get(obj))) 59 (obj, "separator", "vertical", elm_widget_style_get(obj)))
60 CRITICAL("Failed to set layout!"); 60 CRI("Failed to set layout!");
61 61
62 elm_layout_sizing_eval(obj); 62 elm_layout_sizing_eval(obj);
63} 63}
diff --git a/src/lib/elm_slider.c b/src/lib/elm_slider.c
index 02519c1f2..495ddf7a5 100644
--- 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)
833 833
834 if (!elm_layout_theme_set 834 if (!elm_layout_theme_set
835 (obj, "slider", "horizontal", elm_widget_style_get(obj))) 835 (obj, "slider", "horizontal", elm_widget_style_get(obj)))
836 CRITICAL("Failed to set layout!"); 836 CRI("Failed to set layout!");
837 837
838 elm_layout_signal_callback_add(obj, "drag", "*", _drag, obj); 838 elm_layout_signal_callback_add(obj, "drag", "*", _drag, obj);
839 elm_layout_signal_callback_add(obj, "drag,start", "*", _drag_start, obj); 839 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 acfcaf536..eb3cf0e07 100644
--- 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)
317 317
318 if (!elm_layout_theme_set 318 if (!elm_layout_theme_set
319 (obj, "slideshow", "base", elm_widget_style_get(obj))) 319 (obj, "slideshow", "base", elm_widget_style_get(obj)))
320 CRITICAL("Failed to set layout!"); 320 CRI("Failed to set layout!");
321 321
322 priv->transitions = elm_widget_stringlist_get 322 priv->transitions = elm_widget_stringlist_get
323 (edje_object_data_get(wd->resize_obj, 323 (edje_object_data_get(wd->resize_obj,
diff --git a/src/lib/elm_spinner.c b/src/lib/elm_spinner.c
index 79b924b3e..da0272d3d 100644
--- 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)
684 684
685 if (!elm_layout_theme_set(obj, "spinner", "base", 685 if (!elm_layout_theme_set(obj, "spinner", "base",
686 elm_widget_style_get(obj))) 686 elm_widget_style_get(obj)))
687 CRITICAL("Failed to set layout!"); 687 CRI("Failed to set layout!");
688 688
689 elm_layout_signal_callback_add(obj, "drag", "*", _drag_cb, obj); 689 elm_layout_signal_callback_add(obj, "drag", "*", _drag_cb, obj);
690 elm_layout_signal_callback_add(obj, "drag,start", "*", _drag_start_cb, obj); 690 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)
756 elm_widget_style_get(obj)); 756 elm_widget_style_get(obj));
757 if (ret) *ret = int_ret; 757 if (ret) *ret = int_ret;
758 758
759 if (!int_ret) CRITICAL("Failed to set layout!"); 759 if (!int_ret) CRI("Failed to set layout!");
760 760
761 if (_elm_config->access_mode) 761 if (_elm_config->access_mode)
762 _access_spinner_register(obj, EINA_TRUE); 762 _access_spinner_register(obj, EINA_TRUE);
diff --git a/src/lib/elm_thumb.c b/src/lib/elm_thumb.c
index 8981a786d..013d7fc99 100644
--- 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)
550 elm_widget_sub_object_parent_add(obj); 550 elm_widget_sub_object_parent_add(obj);
551 551
552 if (!elm_layout_theme_set(obj, "thumb", "base", elm_widget_style_get(obj))) 552 if (!elm_layout_theme_set(obj, "thumb", "base", elm_widget_style_get(obj)))
553 CRITICAL("Failed to set layout!"); 553 CRI("Failed to set layout!");
554 554
555 evas_object_event_callback_add 555 evas_object_event_callback_add
556 (obj, EVAS_CALLBACK_MOUSE_DOWN, _mouse_down_cb, obj); 556 (obj, EVAS_CALLBACK_MOUSE_DOWN, _mouse_down_cb, obj);
diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c
index 1feb29f5c..5ac9bc204 100644
--- 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)
1167 1167
1168 if (!elm_layout_theme_set 1168 if (!elm_layout_theme_set
1169 (sd->more, "toolbar", "more", elm_widget_style_get(obj))) 1169 (sd->more, "toolbar", "more", elm_widget_style_get(obj)))
1170 CRITICAL("Failed to set layout!"); 1170 CRI("Failed to set layout!");
1171 if (sd->vertical) 1171 if (sd->vertical)
1172 edje_object_signal_emit(sd->more, "elm,orient,vertical", "elm"); 1172 edje_object_signal_emit(sd->more, "elm,orient,vertical", "elm");
1173 else 1173 else
@@ -2535,7 +2535,7 @@ _elm_toolbar_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
2535 2535
2536 priv->more = elm_layout_add(obj); 2536 priv->more = elm_layout_add(obj);
2537 if (!elm_layout_theme_set(priv->more, "toolbar", "more", "default")) 2537 if (!elm_layout_theme_set(priv->more, "toolbar", "more", "default"))
2538 CRITICAL("Failed to set layout!"); 2538 CRI("Failed to set layout!");
2539 if (priv->vertical) 2539 if (priv->vertical)
2540 edje_object_signal_emit(priv->more, "elm,orient,vertical", "elm"); 2540 edje_object_signal_emit(priv->more, "elm,orient,vertical", "elm");
2541 else 2541 else
diff --git a/src/lib/elm_transit.c b/src/lib/elm_transit.c
index 77d2a0e93..c124aa636 100644
--- a/src/lib/elm_transit.c
+++ b/src/lib/elm_transit.c
@@ -9,7 +9,7 @@
9#define ELM_TRANSIT_CHECK_OR_RETURN(transit, ...) \ 9#define ELM_TRANSIT_CHECK_OR_RETURN(transit, ...) \
10 do { \ 10 do { \
11 if (!transit) { \ 11 if (!transit) { \
12 CRITICAL("Elm_Transit " # transit " is NULL!"); \ 12 CRI("Elm_Transit " # transit " is NULL!"); \
13 return __VA_ARGS__; \ 13 return __VA_ARGS__; \
14 } \ 14 } \
15 if (!EINA_MAGIC_CHECK(transit, ELM_TRANSIT_MAGIC)) { \ 15 if (!EINA_MAGIC_CHECK(transit, ELM_TRANSIT_MAGIC)) { \
diff --git a/src/lib/elm_video.c b/src/lib/elm_video.c
index 742819521..c6028384b 100644
--- 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)
226 emotion_object_init(priv->emotion, NULL); 226 emotion_object_init(priv->emotion, NULL);
227 227
228 if (!elm_layout_theme_set(obj, "video", "base", elm_widget_style_get(obj))) 228 if (!elm_layout_theme_set(obj, "video", "base", elm_widget_style_get(obj)))
229 CRITICAL("Failed to set layout!"); 229 CRI("Failed to set layout!");
230 230
231 elm_layout_content_set(obj, "elm.swallow.video", priv->emotion); 231 elm_layout_content_set(obj, "elm.swallow.video", priv->emotion);
232 232
diff --git a/src/lib/elm_web.c b/src/lib/elm_web.c
index 3575c1f24..4e2cf3f88 100644
--- a/src/lib/elm_web.c
+++ b/src/lib/elm_web.c
@@ -806,7 +806,7 @@ _view_add(Evas_Object *parent)
806 smart = evas_smart_class_new(&api.sc); 806 smart = evas_smart_class_new(&api.sc);
807 if (!smart) 807 if (!smart)
808 { 808 {
809 CRITICAL("Could not create smart class"); 809 CRI("Could not create smart class");
810 return NULL; 810 return NULL;
811 } 811 }
812 } 812 }
diff --git a/src/lib/elm_web2.c b/src/lib/elm_web2.c
index b911a557b..fb2cbd9df 100644
--- a/src/lib/elm_web2.c
+++ b/src/lib/elm_web2.c
@@ -81,7 +81,7 @@ _view_add(Evas_Object *parent)
81 smart = evas_smart_class_new(&api.sc); 81 smart = evas_smart_class_new(&api.sc);
82 if (!smart) 82 if (!smart)
83 { 83 {
84 CRITICAL("Could not create smart class"); 84 CRI("Could not create smart class");
85 return NULL; 85 return NULL;
86 } 86 }
87 } 87 }
diff --git a/src/lib/elm_widget.c b/src/lib/elm_widget.c
index 44559d19c..5d253dc1f 100644
--- a/src/lib/elm_widget.c
+++ b/src/lib/elm_widget.c
@@ -707,7 +707,7 @@ elm_widget_api_check(int ver)
707{ 707{
708 if (ver != ELM_INTERNAL_API_VERSION) 708 if (ver != ELM_INTERNAL_API_VERSION)
709 { 709 {
710 CRITICAL("Elementary widget api versions do not match"); 710 CRI("Elementary widget api versions do not match");
711 return EINA_FALSE; 711 return EINA_FALSE;
712 } 712 }
713 return EINA_TRUE; 713 return EINA_TRUE;
diff --git a/src/lib/elm_widget.h b/src/lib/elm_widget.h
index 6992fbf8e..31cd870b3 100644
--- 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
799 NULL); \ 799 NULL); \
800 if (!ptr) \ 800 if (!ptr) \
801 { \ 801 { \
802 CRITICAL("no widget data for object %p (%s)", \ 802 CRI("no widget data for object %p (%s)", \
803 o, evas_object_type_get(o)); \ 803 o, evas_object_type_get(o)); \
804 return __VA_ARGS__; \ 804 return __VA_ARGS__; \
805 } 805 }
@@ -1042,7 +1042,7 @@ EAPI void elm_widget_tree_dot_dump(const Evas_Object *top, FILE *out
1042#define ELM_WIDGET_ITEM_CHECK_OR_RETURN(item, ...) \ 1042#define ELM_WIDGET_ITEM_CHECK_OR_RETURN(item, ...) \
1043 do { \ 1043 do { \
1044 if (!item) { \ 1044 if (!item) { \
1045 CRITICAL("Elm_Widget_Item " # item " is NULL"); \ 1045 CRI("Elm_Widget_Item " # item " is NULL"); \
1046 return __VA_ARGS__; \ 1046 return __VA_ARGS__; \
1047 } \ 1047 } \
1048 if (!EINA_MAGIC_CHECK(item, ELM_WIDGET_ITEM_MAGIC)) { \ 1048 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
1054#define ELM_WIDGET_ITEM_CHECK_OR_GOTO(item, label) \ 1054#define ELM_WIDGET_ITEM_CHECK_OR_GOTO(item, label) \
1055 do { \ 1055 do { \
1056 if (!item) { \ 1056 if (!item) { \
1057 CRITICAL("Elm_Widget_Item " # item " is NULL"); \ 1057 CRI("Elm_Widget_Item " # item " is NULL"); \
1058 goto label; \ 1058 goto label; \
1059 } \ 1059 } \
1060 if (!EINA_MAGIC_CHECK(item, ELM_WIDGET_ITEM_MAGIC)) { \ 1060 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 2d72a648e..61bb2d0fd 100644
--- a/src/lib/elm_widget_actionslider.h
+++ b/src/lib/elm_widget_actionslider.h
@@ -39,7 +39,7 @@ struct _Elm_Actionslider_Smart_Data
39 ELM_ACTIONSLIDER_DATA_GET(o, ptr); \ 39 ELM_ACTIONSLIDER_DATA_GET(o, ptr); \
40 if (!ptr) \ 40 if (!ptr) \
41 { \ 41 { \
42 CRITICAL("No widget data for object %p (%s)", \ 42 CRI("No widget data for object %p (%s)", \
43 o, evas_object_type_get(o)); \ 43 o, evas_object_type_get(o)); \
44 return; \ 44 return; \
45 } 45 }
@@ -48,7 +48,7 @@ struct _Elm_Actionslider_Smart_Data
48 ELM_ACTIONSLIDER_DATA_GET(o, ptr); \ 48 ELM_ACTIONSLIDER_DATA_GET(o, ptr); \
49 if (!ptr) \ 49 if (!ptr) \
50 { \ 50 { \
51 CRITICAL("No widget data for object %p (%s)", \ 51 CRI("No widget data for object %p (%s)", \
52 o, evas_object_type_get(o)); \ 52 o, evas_object_type_get(o)); \
53 return val; \ 53 return val; \
54 } 54 }
diff --git a/src/lib/elm_widget_bg.h b/src/lib/elm_widget_bg.h
index 2f34eea61..8174eac10 100644
--- a/src/lib/elm_widget_bg.h
+++ b/src/lib/elm_widget_bg.h
@@ -48,7 +48,7 @@ struct _Elm_Bg_Smart_Data
48 ELM_BG_DATA_GET(o, ptr); \ 48 ELM_BG_DATA_GET(o, ptr); \
49 if (!ptr) \ 49 if (!ptr) \
50 { \ 50 { \
51 CRITICAL("No widget data for object %p (%s)", \ 51 CRI("No widget data for object %p (%s)", \
52 o, evas_object_type_get(o)); \ 52 o, evas_object_type_get(o)); \
53 return; \ 53 return; \
54 } 54 }
@@ -57,7 +57,7 @@ struct _Elm_Bg_Smart_Data
57 ELM_BG_DATA_GET(o, ptr); \ 57 ELM_BG_DATA_GET(o, ptr); \
58 if (!ptr) \ 58 if (!ptr) \
59 { \ 59 { \
60 CRITICAL("No widget data for object %p (%s)", \ 60 CRI("No widget data for object %p (%s)", \
61 o, evas_object_type_get(o)); \ 61 o, evas_object_type_get(o)); \
62 return val; \ 62 return val; \
63 } 63 }
diff --git a/src/lib/elm_widget_box.h b/src/lib/elm_widget_box.h
index 4a498bb6f..92f39f43d 100644
--- a/src/lib/elm_widget_box.h
+++ b/src/lib/elm_widget_box.h
@@ -70,7 +70,7 @@ struct _Transition_Animation_Data
70 ELM_BOX_DATA_GET(o, ptr); \ 70 ELM_BOX_DATA_GET(o, ptr); \
71 if (!ptr) \ 71 if (!ptr) \
72 { \ 72 { \
73 CRITICAL("No widget data for object %p (%s)", \ 73 CRI("No widget data for object %p (%s)", \
74 o, evas_object_type_get(o)); \ 74 o, evas_object_type_get(o)); \
75 return; \ 75 return; \
76 } 76 }
@@ -79,7 +79,7 @@ struct _Transition_Animation_Data
79 ELM_BOX_DATA_GET(o, ptr); \ 79 ELM_BOX_DATA_GET(o, ptr); \
80 if (!ptr) \ 80 if (!ptr) \
81 { \ 81 { \
82 CRITICAL("No widget data for object %p (%s)", \ 82 CRI("No widget data for object %p (%s)", \
83 o, evas_object_type_get(o)); \ 83 o, evas_object_type_get(o)); \
84 return val; \ 84 return val; \
85 } 85 }
diff --git a/src/lib/elm_widget_bubble.h b/src/lib/elm_widget_bubble.h
index 5620f06e0..c78ee89d7 100644
--- a/src/lib/elm_widget_bubble.h
+++ b/src/lib/elm_widget_bubble.h
@@ -35,7 +35,7 @@ struct _Elm_Bubble_Smart_Data
35 ELM_BUBBLE_DATA_GET(o, ptr); \ 35 ELM_BUBBLE_DATA_GET(o, ptr); \
36 if (!ptr) \ 36 if (!ptr) \
37 { \ 37 { \
38 CRITICAL("No widget data for object %p (%s)", \ 38 CRI("No widget data for object %p (%s)", \
39 o, evas_object_type_get(o)); \ 39 o, evas_object_type_get(o)); \
40 return; \ 40 return; \
41 } 41 }
@@ -44,7 +44,7 @@ struct _Elm_Bubble_Smart_Data
44 ELM_BUBBLE_DATA_GET(o, ptr); \ 44 ELM_BUBBLE_DATA_GET(o, ptr); \
45 if (!ptr) \ 45 if (!ptr) \
46 { \ 46 { \
47 CRITICAL("No widget data for object %p (%s)", \ 47 CRI("No widget data for object %p (%s)", \
48 o, evas_object_type_get(o)); \ 48 o, evas_object_type_get(o)); \
49 return val; \ 49 return val; \
50 } 50 }
diff --git a/src/lib/elm_widget_button.h b/src/lib/elm_widget_button.h
index b76811180..cedb86490 100644
--- a/src/lib/elm_widget_button.h
+++ b/src/lib/elm_widget_button.h
@@ -41,7 +41,7 @@ typedef struct _Elm_Button_Smart_Data
41 ELM_BUTTON_DATA_GET(o, ptr); \ 41 ELM_BUTTON_DATA_GET(o, ptr); \
42 if (!ptr) \ 42 if (!ptr) \
43 { \ 43 { \
44 CRITICAL("No widget data for object %p (%s)", \ 44 CRI("No widget data for object %p (%s)", \
45 o, evas_object_type_get(o)); \ 45 o, evas_object_type_get(o)); \
46 return; \ 46 return; \
47 } 47 }
@@ -50,7 +50,7 @@ typedef struct _Elm_Button_Smart_Data
50 ELM_BUTTON_DATA_GET(o, ptr); \ 50 ELM_BUTTON_DATA_GET(o, ptr); \
51 if (!ptr) \ 51 if (!ptr) \
52 { \ 52 { \
53 CRITICAL("No widget data for object %p (%s)", \ 53 CRI("No widget data for object %p (%s)", \
54 o, evas_object_type_get(o)); \ 54 o, evas_object_type_get(o)); \
55 return val; \ 55 return val; \
56 } 56 }
diff --git a/src/lib/elm_widget_check.h b/src/lib/elm_widget_check.h
index 4a1796452..e5b05d7b8 100644
--- a/src/lib/elm_widget_check.h
+++ b/src/lib/elm_widget_check.h
@@ -35,7 +35,7 @@ struct _Elm_Check_Smart_Data
35 ELM_CHECK_DATA_GET(o, ptr); \ 35 ELM_CHECK_DATA_GET(o, ptr); \
36 if (!ptr) \ 36 if (!ptr) \
37 { \ 37 { \
38 CRITICAL("No widget data for object %p (%s)", \ 38 CRI("No widget data for object %p (%s)", \
39 o, evas_object_type_get(o)); \ 39 o, evas_object_type_get(o)); \
40 return; \ 40 return; \
41 } 41 }
@@ -44,7 +44,7 @@ struct _Elm_Check_Smart_Data
44 ELM_CHECK_DATA_GET(o, ptr); \ 44 ELM_CHECK_DATA_GET(o, ptr); \
45 if (!ptr) \ 45 if (!ptr) \
46 { \ 46 { \
47 CRITICAL("No widget data for object %p (%s)", \ 47 CRI("No widget data for object %p (%s)", \
48 o, evas_object_type_get(o)); \ 48 o, evas_object_type_get(o)); \
49 return val; \ 49 return val; \
50 } 50 }
diff --git a/src/lib/elm_widget_clock.h b/src/lib/elm_widget_clock.h
index b91297ae7..9a06d6da4 100644
--- a/src/lib/elm_widget_clock.h
+++ b/src/lib/elm_widget_clock.h
@@ -58,7 +58,7 @@ struct _Elm_Clock_Smart_Data
58 ELM_CLOCK_DATA_GET(o, ptr); \ 58 ELM_CLOCK_DATA_GET(o, ptr); \
59 if (!ptr) \ 59 if (!ptr) \
60 { \ 60 { \
61 CRITICAL("No widget data for object %p (%s)", \ 61 CRI("No widget data for object %p (%s)", \
62 o, evas_object_type_get(o)); \ 62 o, evas_object_type_get(o)); \
63 return; \ 63 return; \
64 } 64 }
@@ -67,7 +67,7 @@ struct _Elm_Clock_Smart_Data
67 ELM_CLOCK_DATA_GET(o, ptr); \ 67 ELM_CLOCK_DATA_GET(o, ptr); \
68 if (!ptr) \ 68 if (!ptr) \
69 { \ 69 { \
70 CRITICAL("No widget data for object %p (%s)", \ 70 CRI("No widget data for object %p (%s)", \
71 o, evas_object_type_get(o)); \ 71 o, evas_object_type_get(o)); \
72 return val; \ 72 return val; \
73 } 73 }
diff --git a/src/lib/elm_widget_colorselector.h b/src/lib/elm_widget_colorselector.h
index 680b208d0..d61087266 100644
--- a/src/lib/elm_widget_colorselector.h
+++ b/src/lib/elm_widget_colorselector.h
@@ -102,7 +102,7 @@ struct _Elm_Color_Item
102 ELM_COLORSELECTOR_DATA_GET(o, ptr); \ 102 ELM_COLORSELECTOR_DATA_GET(o, ptr); \
103 if (!ptr) \ 103 if (!ptr) \
104 { \ 104 { \
105 CRITICAL("No widget data for object %p (%s)", \ 105 CRI("No widget data for object %p (%s)", \
106 o, evas_object_type_get(o)); \ 106 o, evas_object_type_get(o)); \
107 return; \ 107 return; \
108 } 108 }
@@ -111,7 +111,7 @@ struct _Elm_Color_Item
111 ELM_COLORSELECTOR_DATA_GET(o, ptr); \ 111 ELM_COLORSELECTOR_DATA_GET(o, ptr); \
112 if (!ptr) \ 112 if (!ptr) \
113 { \ 113 { \
114 CRITICAL("No widget data for object %p (%s)", \ 114 CRI("No widget data for object %p (%s)", \
115 o, evas_object_type_get(o)); \ 115 o, evas_object_type_get(o)); \
116 return val; \ 116 return val; \
117 } 117 }
diff --git a/src/lib/elm_widget_conform.h b/src/lib/elm_widget_conform.h
index db8bb34b5..e1826c53d 100644
--- a/src/lib/elm_widget_conform.h
+++ b/src/lib/elm_widget_conform.h
@@ -68,7 +68,7 @@ enum _Conformant_Part_Type
68 ELM_CONFORMANT_DATA_GET(o, ptr); \ 68 ELM_CONFORMANT_DATA_GET(o, ptr); \
69 if (!ptr) \ 69 if (!ptr) \
70 { \ 70 { \
71 CRITICAL("No widget data for object %p (%s)", \ 71 CRI("No widget data for object %p (%s)", \
72 o, evas_object_type_get(o)); \ 72 o, evas_object_type_get(o)); \
73 return; \ 73 return; \
74 } 74 }
@@ -77,7 +77,7 @@ enum _Conformant_Part_Type
77 ELM_CONFORMANT_DATA_GET(o, ptr); \ 77 ELM_CONFORMANT_DATA_GET(o, ptr); \
78 if (!ptr) \ 78 if (!ptr) \
79 { \ 79 { \
80 CRITICAL("No widget data for object %p (%s)", \ 80 CRI("No widget data for object %p (%s)", \
81 o, evas_object_type_get(o)); \ 81 o, evas_object_type_get(o)); \
82 return val; \ 82 return val; \
83 } 83 }
diff --git a/src/lib/elm_widget_ctxpopup.h b/src/lib/elm_widget_ctxpopup.h
index bdd5921da..2ab8bbc75 100644
--- a/src/lib/elm_widget_ctxpopup.h
+++ b/src/lib/elm_widget_ctxpopup.h
@@ -66,7 +66,7 @@ struct _Elm_Ctxpopup_Smart_Data
66 ELM_CTXPOPUP_DATA_GET(o, ptr); \ 66 ELM_CTXPOPUP_DATA_GET(o, ptr); \
67 if (!ptr) \ 67 if (!ptr) \
68 { \ 68 { \
69 CRITICAL("No widget data for object %p (%s)", \ 69 CRI("No widget data for object %p (%s)", \
70 o, evas_object_type_get(o)); \ 70 o, evas_object_type_get(o)); \
71 return; \ 71 return; \
72 } 72 }
@@ -75,7 +75,7 @@ struct _Elm_Ctxpopup_Smart_Data
75 ELM_CTXPOPUP_DATA_GET(o, ptr); \ 75 ELM_CTXPOPUP_DATA_GET(o, ptr); \
76 if (!ptr) \ 76 if (!ptr) \
77 { \ 77 { \
78 CRITICAL("No widget data for object %p (%s)", \ 78 CRI("No widget data for object %p (%s)", \
79 o, evas_object_type_get(o)); \ 79 o, evas_object_type_get(o)); \
80 return val; \ 80 return val; \
81 } 81 }
diff --git a/src/lib/elm_widget_datetime.h b/src/lib/elm_widget_datetime.h
index 44a39018a..68d6ca604 100644
--- a/src/lib/elm_widget_datetime.h
+++ b/src/lib/elm_widget_datetime.h
@@ -85,7 +85,7 @@ struct _Format_Map
85 ELM_DATETIME_DATA_GET(o, ptr); \ 85 ELM_DATETIME_DATA_GET(o, ptr); \
86 if (!ptr) \ 86 if (!ptr) \
87 { \ 87 { \
88 CRITICAL("No widget data for object %p (%s)", \ 88 CRI("No widget data for object %p (%s)", \
89 o, evas_object_type_get(o)); \ 89 o, evas_object_type_get(o)); \
90 return; \ 90 return; \
91 } 91 }
@@ -94,7 +94,7 @@ struct _Format_Map
94 ELM_DATETIME_DATA_GET(o, ptr); \ 94 ELM_DATETIME_DATA_GET(o, ptr); \
95 if (!ptr) \ 95 if (!ptr) \
96 { \ 96 { \
97 CRITICAL("No widget data for object %p (%s)", \ 97 CRI("No widget data for object %p (%s)", \
98 o, evas_object_type_get(o)); \ 98 o, evas_object_type_get(o)); \
99 return val; \ 99 return val; \
100 } 100 }
diff --git a/src/lib/elm_widget_dayselector.h b/src/lib/elm_widget_dayselector.h
index 0006868b3..92071647e 100644
--- a/src/lib/elm_widget_dayselector.h
+++ b/src/lib/elm_widget_dayselector.h
@@ -46,7 +46,7 @@ struct _Elm_Dayselector_Item
46 ELM_DAYSELECTOR_DATA_GET(o, ptr); \ 46 ELM_DAYSELECTOR_DATA_GET(o, ptr); \
47 if (!ptr) \ 47 if (!ptr) \
48 { \ 48 { \
49 CRITICAL("No widget data for object %p (%s)", \ 49 CRI("No widget data for object %p (%s)", \
50 o, evas_object_type_get(o)); \ 50 o, evas_object_type_get(o)); \
51 return; \ 51 return; \
52 } 52 }
@@ -55,7 +55,7 @@ struct _Elm_Dayselector_Item
55 ELM_DAYSELECTOR_DATA_GET(o, ptr); \ 55 ELM_DAYSELECTOR_DATA_GET(o, ptr); \
56 if (!ptr) \ 56 if (!ptr) \
57 { \ 57 { \
58 CRITICAL("No widget data for object %p (%s)", \ 58 CRI("No widget data for object %p (%s)", \
59 o, evas_object_type_get(o)); \ 59 o, evas_object_type_get(o)); \
60 return val; \ 60 return val; \
61 } 61 }
diff --git a/src/lib/elm_widget_diskselector.h b/src/lib/elm_widget_diskselector.h
index 68c95b796..42813b1aa 100644
--- a/src/lib/elm_widget_diskselector.h
+++ b/src/lib/elm_widget_diskselector.h
@@ -71,7 +71,7 @@ struct _Elm_Diskselector_Item
71 ELM_DISKSELECTOR_DATA_GET(o, ptr); \ 71 ELM_DISKSELECTOR_DATA_GET(o, ptr); \
72 if (!ptr) \ 72 if (!ptr) \
73 { \ 73 { \
74 CRITICAL("No widget data for object %p (%s)", \ 74 CRI("No widget data for object %p (%s)", \
75 o, evas_object_type_get(o)); \ 75 o, evas_object_type_get(o)); \
76 return; \ 76 return; \
77 } 77 }
@@ -80,7 +80,7 @@ struct _Elm_Diskselector_Item
80 ELM_DISKSELECTOR_DATA_GET(o, ptr); \ 80 ELM_DISKSELECTOR_DATA_GET(o, ptr); \
81 if (!ptr) \ 81 if (!ptr) \
82 { \ 82 { \
83 CRITICAL("No widget data for object %p (%s)", \ 83 CRI("No widget data for object %p (%s)", \
84 o, evas_object_type_get(o)); \ 84 o, evas_object_type_get(o)); \
85 return val; \ 85 return val; \
86 } 86 }
diff --git a/src/lib/elm_widget_entry.h b/src/lib/elm_widget_entry.h
index 6548781f1..4e37a106c 100644
--- a/src/lib/elm_widget_entry.h
+++ b/src/lib/elm_widget_entry.h
@@ -149,7 +149,7 @@ typedef enum _Length_Unit
149 ELM_ENTRY_DATA_GET(o, ptr); \ 149 ELM_ENTRY_DATA_GET(o, ptr); \
150 if (!ptr) \ 150 if (!ptr) \
151 { \ 151 { \
152 CRITICAL("No widget data for object %p (%s)", \ 152 CRI("No widget data for object %p (%s)", \
153 o, evas_object_type_get(o)); \ 153 o, evas_object_type_get(o)); \
154 return; \ 154 return; \
155 } 155 }
@@ -158,7 +158,7 @@ typedef enum _Length_Unit
158 ELM_ENTRY_DATA_GET(o, ptr); \ 158 ELM_ENTRY_DATA_GET(o, ptr); \
159 if (!ptr) \ 159 if (!ptr) \
160 { \ 160 { \
161 CRITICAL("No widget data for object %p (%s)", \ 161 CRI("No widget data for object %p (%s)", \
162 o, evas_object_type_get(o)); \ 162 o, evas_object_type_get(o)); \
163 return val; \ 163 return val; \
164 } 164 }
diff --git a/src/lib/elm_widget_fileselector.h b/src/lib/elm_widget_fileselector.h
index bcc10bc94..c52948d12 100644
--- a/src/lib/elm_widget_fileselector.h
+++ b/src/lib/elm_widget_fileselector.h
@@ -117,7 +117,7 @@ struct _Elm_Fileselector_Filter
117 ELM_FILESELECTOR_DATA_GET(o, ptr); \ 117 ELM_FILESELECTOR_DATA_GET(o, ptr); \
118 if (!ptr) \ 118 if (!ptr) \
119 { \ 119 { \
120 CRITICAL("No widget data for object %p (%s)", \ 120 CRI("No widget data for object %p (%s)", \
121 o, evas_object_type_get(o)); \ 121 o, evas_object_type_get(o)); \
122 return; \ 122 return; \
123 } 123 }
@@ -126,7 +126,7 @@ struct _Elm_Fileselector_Filter
126 ELM_FILESELECTOR_DATA_GET(o, ptr); \ 126 ELM_FILESELECTOR_DATA_GET(o, ptr); \
127 if (!ptr) \ 127 if (!ptr) \
128 { \ 128 { \
129 CRITICAL("No widget data for object %p (%s)", \ 129 CRI("No widget data for object %p (%s)", \
130 o, evas_object_type_get(o)); \ 130 o, evas_object_type_get(o)); \
131 return val; \ 131 return val; \
132 } 132 }
diff --git a/src/lib/elm_widget_fileselector_button.h b/src/lib/elm_widget_fileselector_button.h
index d27aeb909..d47222a5e 100644
--- 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
51 ELM_FILESELECTOR_BUTTON_DATA_GET(o, ptr); \ 51 ELM_FILESELECTOR_BUTTON_DATA_GET(o, ptr); \
52 if (!ptr) \ 52 if (!ptr) \
53 { \ 53 { \
54 CRITICAL("No widget data for object %p (%s)", \ 54 CRI("No widget data for object %p (%s)", \
55 o, evas_object_type_get(o)); \ 55 o, evas_object_type_get(o)); \
56 return; \ 56 return; \
57 } 57 }
@@ -60,7 +60,7 @@ struct _Elm_Fileselector_Button_Smart_Data
60 ELM_FILESELECTOR_BUTTON_DATA_GET(o, ptr); \ 60 ELM_FILESELECTOR_BUTTON_DATA_GET(o, ptr); \
61 if (!ptr) \ 61 if (!ptr) \
62 { \ 62 { \
63 CRITICAL("No widget data for object %p (%s)", \ 63 CRI("No widget data for object %p (%s)", \
64 o, evas_object_type_get(o)); \ 64 o, evas_object_type_get(o)); \
65 return val; \ 65 return val; \
66 } 66 }
diff --git a/src/lib/elm_widget_fileselector_entry.h b/src/lib/elm_widget_fileselector_entry.h
index 7c3a2c8d8..4cac805a8 100644
--- 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
41 ELM_FILESELECTOR_ENTRY_DATA_GET(o, ptr); \ 41 ELM_FILESELECTOR_ENTRY_DATA_GET(o, ptr); \
42 if (!ptr) \ 42 if (!ptr) \
43 { \ 43 { \
44 CRITICAL("No widget data for object %p (%s)", \ 44 CRI("No widget data for object %p (%s)", \
45 o, evas_object_type_get(o)); \ 45 o, evas_object_type_get(o)); \
46 return; \ 46 return; \
47 } 47 }
@@ -50,7 +50,7 @@ struct _Elm_Fileselector_Entry_Smart_Data
50 ELM_FILESELECTOR_ENTRY_DATA_GET(o, ptr); \ 50 ELM_FILESELECTOR_ENTRY_DATA_GET(o, ptr); \
51 if (!ptr) \ 51 if (!ptr) \
52 { \ 52 { \
53 CRITICAL("No widget data for object %p (%s)", \ 53 CRI("No widget data for object %p (%s)", \
54 o, evas_object_type_get(o)); \ 54 o, evas_object_type_get(o)); \
55 return val; \ 55 return val; \
56 } 56 }
diff --git a/src/lib/elm_widget_flip.h b/src/lib/elm_widget_flip.h
index bf6aeecdd..a7cd670eb 100644
--- a/src/lib/elm_widget_flip.h
+++ b/src/lib/elm_widget_flip.h
@@ -82,7 +82,7 @@ struct _Vertex3
82 ELM_FLIP_DATA_GET(o, ptr); \ 82 ELM_FLIP_DATA_GET(o, ptr); \
83 if (!ptr) \ 83 if (!ptr) \
84 { \ 84 { \
85 CRITICAL("No widget data for object %p (%s)", \ 85 CRI("No widget data for object %p (%s)", \
86 o, evas_object_type_get(o)); \ 86 o, evas_object_type_get(o)); \
87 return; \ 87 return; \
88 } 88 }
@@ -91,7 +91,7 @@ struct _Vertex3
91 ELM_FLIP_DATA_GET(o, ptr); \ 91 ELM_FLIP_DATA_GET(o, ptr); \
92 if (!ptr) \ 92 if (!ptr) \
93 { \ 93 { \
94 CRITICAL("No widget data for object %p (%s)", \ 94 CRI("No widget data for object %p (%s)", \
95 o, evas_object_type_get(o)); \ 95 o, evas_object_type_get(o)); \
96 return val; \ 96 return val; \
97 } 97 }
diff --git a/src/lib/elm_widget_flipselector.h b/src/lib/elm_widget_flipselector.h
index 8b14e086d..0b76e3153 100644
--- a/src/lib/elm_widget_flipselector.h
+++ b/src/lib/elm_widget_flipselector.h
@@ -53,7 +53,7 @@ struct _Elm_Flipselector_Item
53 ELM_FLIPSELECTOR_DATA_GET(o, ptr); \ 53 ELM_FLIPSELECTOR_DATA_GET(o, ptr); \
54 if (!ptr) \ 54 if (!ptr) \
55 { \ 55 { \
56 CRITICAL("No widget data for object %p (%s)", \ 56 CRI("No widget data for object %p (%s)", \
57 o, evas_object_type_get(o)); \ 57 o, evas_object_type_get(o)); \
58 return; \ 58 return; \
59 } 59 }
@@ -62,7 +62,7 @@ struct _Elm_Flipselector_Item
62 ELM_FLIPSELECTOR_DATA_GET(o, ptr); \ 62 ELM_FLIPSELECTOR_DATA_GET(o, ptr); \
63 if (!ptr) \ 63 if (!ptr) \
64 { \ 64 { \
65 CRITICAL("No widget data for object %p (%s)", \ 65 CRI("No widget data for object %p (%s)", \
66 o, evas_object_type_get(o)); \ 66 o, evas_object_type_get(o)); \
67 return val; \ 67 return val; \
68 } 68 }
diff --git a/src/lib/elm_widget_frame.h b/src/lib/elm_widget_frame.h
index b726da2a9..e2ee9f057 100644
--- a/src/lib/elm_widget_frame.h
+++ b/src/lib/elm_widget_frame.h
@@ -36,7 +36,7 @@ struct _Elm_Frame_Smart_Data
36 ELM_FRAME_DATA_GET(o, ptr); \ 36 ELM_FRAME_DATA_GET(o, ptr); \
37 if (!ptr) \ 37 if (!ptr) \
38 { \ 38 { \
39 CRITICAL("No widget data for object %p (%s)", \ 39 CRI("No widget data for object %p (%s)", \
40 o, evas_object_type_get(o)); \ 40 o, evas_object_type_get(o)); \
41 return; \ 41 return; \
42 } 42 }
@@ -45,7 +45,7 @@ struct _Elm_Frame_Smart_Data
45 ELM_FRAME_DATA_GET(o, ptr); \ 45 ELM_FRAME_DATA_GET(o, ptr); \
46 if (!ptr) \ 46 if (!ptr) \
47 { \ 47 { \
48 CRITICAL("No widget data for object %p (%s)", \ 48 CRI("No widget data for object %p (%s)", \
49 o, evas_object_type_get(o)); \ 49 o, evas_object_type_get(o)); \
50 return val; \ 50 return val; \
51 } 51 }
diff --git a/src/lib/elm_widget_gengrid.h b/src/lib/elm_widget_gengrid.h
index e5ea80c77..f04e0d431 100644
--- a/src/lib/elm_widget_gengrid.h
+++ b/src/lib/elm_widget_gengrid.h
@@ -145,7 +145,7 @@ struct _Elm_Gengrid_Pan_Smart_Data
145 ELM_GENGRID_DATA_GET(o, ptr); \ 145 ELM_GENGRID_DATA_GET(o, ptr); \
146 if (!ptr) \ 146 if (!ptr) \
147 { \ 147 { \
148 CRITICAL("No widget data for object %p (%s)", \ 148 CRI("No widget data for object %p (%s)", \
149 o, evas_object_type_get(o)); \ 149 o, evas_object_type_get(o)); \
150 return; \ 150 return; \
151 } 151 }
@@ -154,7 +154,7 @@ struct _Elm_Gengrid_Pan_Smart_Data
154 ELM_GENGRID_DATA_GET(o, ptr); \ 154 ELM_GENGRID_DATA_GET(o, ptr); \
155 if (!ptr) \ 155 if (!ptr) \
156 { \ 156 { \
157 CRITICAL("No widget data for object %p (%s)", \ 157 CRI("No widget data for object %p (%s)", \
158 o, evas_object_type_get(o)); \ 158 o, evas_object_type_get(o)); \
159 return val; \ 159 return val; \
160 } 160 }
diff --git a/src/lib/elm_widget_genlist.h b/src/lib/elm_widget_genlist.h
index db8711907..734f54520 100644
--- a/src/lib/elm_widget_genlist.h
+++ b/src/lib/elm_widget_genlist.h
@@ -296,7 +296,7 @@ struct _Elm_Genlist_Pan_Smart_Data
296 ELM_GENLIST_DATA_GET(o, ptr); \ 296 ELM_GENLIST_DATA_GET(o, ptr); \
297 if (!ptr) \ 297 if (!ptr) \
298 { \ 298 { \
299 CRITICAL("No widget data for object %p (%s)", \ 299 CRI("No widget data for object %p (%s)", \
300 o, evas_object_type_get(o)); \ 300 o, evas_object_type_get(o)); \
301 return; \ 301 return; \
302 } 302 }
@@ -305,7 +305,7 @@ struct _Elm_Genlist_Pan_Smart_Data
305 ELM_GENLIST_DATA_GET(o, ptr); \ 305 ELM_GENLIST_DATA_GET(o, ptr); \
306 if (!ptr) \ 306 if (!ptr) \
307 { \ 307 { \
308 CRITICAL("No widget data for object %p (%s)", \ 308 CRI("No widget data for object %p (%s)", \
309 o, evas_object_type_get(o)); \ 309 o, evas_object_type_get(o)); \
310 return val; \ 310 return val; \
311 } 311 }
diff --git a/src/lib/elm_widget_glview.h b/src/lib/elm_widget_glview.h
index e310d841f..5f5ba5e70 100644
--- a/src/lib/elm_widget_glview.h
+++ b/src/lib/elm_widget_glview.h
@@ -53,7 +53,7 @@ struct _Elm_Glview_Smart_Data
53 ELM_GLVIEW_DATA_GET(o, ptr); \ 53 ELM_GLVIEW_DATA_GET(o, ptr); \
54 if (!ptr) \ 54 if (!ptr) \
55 { \ 55 { \
56 CRITICAL("No widget data for object %p (%s)", \ 56 CRI("No widget data for object %p (%s)", \
57 o, evas_object_type_get(o)); \ 57 o, evas_object_type_get(o)); \
58 return; \ 58 return; \
59 } 59 }
@@ -62,7 +62,7 @@ struct _Elm_Glview_Smart_Data
62 ELM_GLVIEW_DATA_GET(o, ptr); \ 62 ELM_GLVIEW_DATA_GET(o, ptr); \
63 if (!ptr) \ 63 if (!ptr) \
64 { \ 64 { \
65 CRITICAL("No widget data for object %p (%s)", \ 65 CRI("No widget data for object %p (%s)", \
66 o, evas_object_type_get(o)); \ 66 o, evas_object_type_get(o)); \
67 return val; \ 67 return val; \
68 } 68 }
diff --git a/src/lib/elm_widget_hover.h b/src/lib/elm_widget_hover.h
index db4868e96..dcfd30e1e 100644
--- a/src/lib/elm_widget_hover.h
+++ b/src/lib/elm_widget_hover.h
@@ -53,7 +53,7 @@ struct _Elm_Hover_Smart_Data
53 ELM_HOVER_DATA_GET(o, ptr); \ 53 ELM_HOVER_DATA_GET(o, ptr); \
54 if (!ptr) \ 54 if (!ptr) \
55 { \ 55 { \
56 CRITICAL("No widget data for object %p (%s)", \ 56 CRI("No widget data for object %p (%s)", \
57 o, evas_object_type_get(o)); \ 57 o, evas_object_type_get(o)); \
58 return; \ 58 return; \
59 } 59 }
@@ -62,7 +62,7 @@ struct _Elm_Hover_Smart_Data
62 ELM_HOVER_DATA_GET(o, ptr); \ 62 ELM_HOVER_DATA_GET(o, ptr); \
63 if (!ptr) \ 63 if (!ptr) \
64 { \ 64 { \
65 CRITICAL("No widget data for object %p (%s)", \ 65 CRI("No widget data for object %p (%s)", \
66 o, evas_object_type_get(o)); \ 66 o, evas_object_type_get(o)); \
67 return val; \ 67 return val; \
68 } 68 }
diff --git a/src/lib/elm_widget_hoversel.h b/src/lib/elm_widget_hoversel.h
index 5a2b7b51e..355208873 100644
--- a/src/lib/elm_widget_hoversel.h
+++ b/src/lib/elm_widget_hoversel.h
@@ -56,7 +56,7 @@ struct _Elm_Hoversel_Item
56 ELM_HOVERSEL_DATA_GET(o, ptr); \ 56 ELM_HOVERSEL_DATA_GET(o, ptr); \
57 if (!ptr) \ 57 if (!ptr) \
58 { \ 58 { \
59 CRITICAL("No widget data for object %p (%s)", \ 59 CRI("No widget data for object %p (%s)", \
60 o, evas_object_type_get(o)); \ 60 o, evas_object_type_get(o)); \
61 return; \ 61 return; \
62 } 62 }
@@ -65,7 +65,7 @@ struct _Elm_Hoversel_Item
65 ELM_HOVERSEL_DATA_GET(o, ptr); \ 65 ELM_HOVERSEL_DATA_GET(o, ptr); \
66 if (!ptr) \ 66 if (!ptr) \
67 { \ 67 { \
68 CRITICAL("No widget data for object %p (%s)", \ 68 CRI("No widget data for object %p (%s)", \
69 o, evas_object_type_get(o)); \ 69 o, evas_object_type_get(o)); \
70 return val; \ 70 return val; \
71 } 71 }
diff --git a/src/lib/elm_widget_icon.h b/src/lib/elm_widget_icon.h
index 6dd0e3e9e..64509a667 100644
--- a/src/lib/elm_widget_icon.h
+++ b/src/lib/elm_widget_icon.h
@@ -62,7 +62,7 @@ struct _Elm_Icon_Smart_Data
62 ELM_ICON_DATA_GET(o, ptr); \ 62 ELM_ICON_DATA_GET(o, ptr); \
63 if (!ptr) \ 63 if (!ptr) \
64 { \ 64 { \
65 CRITICAL("No widget data for object %p (%s)", \ 65 CRI("No widget data for object %p (%s)", \
66 o, evas_object_type_get(o)); \ 66 o, evas_object_type_get(o)); \
67 return; \ 67 return; \
68 } 68 }
@@ -71,7 +71,7 @@ struct _Elm_Icon_Smart_Data
71 ELM_ICON_DATA_GET(o, ptr); \ 71 ELM_ICON_DATA_GET(o, ptr); \
72 if (!ptr) \ 72 if (!ptr) \
73 { \ 73 { \
74 CRITICAL("No widget data for object %p (%s)", \ 74 CRI("No widget data for object %p (%s)", \
75 o, evas_object_type_get(o)); \ 75 o, evas_object_type_get(o)); \
76 return val; \ 76 return val; \
77 } 77 }
diff --git a/src/lib/elm_widget_image.h b/src/lib/elm_widget_image.h
index 16ec39239..7a2674dad 100644
--- a/src/lib/elm_widget_image.h
+++ b/src/lib/elm_widget_image.h
@@ -73,7 +73,7 @@ struct _Elm_Image_Smart_Data
73 ELM_IMAGE_DATA_GET(o, ptr); \ 73 ELM_IMAGE_DATA_GET(o, ptr); \
74 if (!ptr) \ 74 if (!ptr) \
75 { \ 75 { \
76 CRITICAL("No widget data for object %p (%s)", \ 76 CRI("No widget data for object %p (%s)", \
77 o, evas_object_type_get(o)); \ 77 o, evas_object_type_get(o)); \
78 return; \ 78 return; \
79 } 79 }
@@ -82,7 +82,7 @@ struct _Elm_Image_Smart_Data
82 ELM_IMAGE_DATA_GET(o, ptr); \ 82 ELM_IMAGE_DATA_GET(o, ptr); \
83 if (!ptr) \ 83 if (!ptr) \
84 { \ 84 { \
85 CRITICAL("No widget data for object %p (%s)", \ 85 CRI("No widget data for object %p (%s)", \
86 o, evas_object_type_get(o)); \ 86 o, evas_object_type_get(o)); \
87 return val; \ 87 return val; \
88 } 88 }
diff --git a/src/lib/elm_widget_index.h b/src/lib/elm_widget_index.h
index 288a610d1..cf5ea72e2 100644
--- a/src/lib/elm_widget_index.h
+++ b/src/lib/elm_widget_index.h
@@ -74,7 +74,7 @@ struct _Elm_Index_Omit
74 ELM_INDEX_DATA_GET(o, ptr); \ 74 ELM_INDEX_DATA_GET(o, ptr); \
75 if (!ptr) \ 75 if (!ptr) \
76 { \ 76 { \
77 CRITICAL("No widget data for object %p (%s)", \ 77 CRI("No widget data for object %p (%s)", \
78 o, evas_object_type_get(o)); \ 78 o, evas_object_type_get(o)); \
79 return; \ 79 return; \
80 } 80 }
@@ -83,7 +83,7 @@ struct _Elm_Index_Omit
83 ELM_INDEX_DATA_GET(o, ptr); \ 83 ELM_INDEX_DATA_GET(o, ptr); \
84 if (!ptr) \ 84 if (!ptr) \
85 { \ 85 { \
86 CRITICAL("No widget data for object %p (%s)", \ 86 CRI("No widget data for object %p (%s)", \
87 o, evas_object_type_get(o)); \ 87 o, evas_object_type_get(o)); \
88 return val; \ 88 return val; \
89 } 89 }
diff --git a/src/lib/elm_widget_inwin.h b/src/lib/elm_widget_inwin.h
index 2c90ee3b1..1623b47c2 100644
--- a/src/lib/elm_widget_inwin.h
+++ b/src/lib/elm_widget_inwin.h
@@ -33,7 +33,7 @@ struct _Elm_Inwin_Smart_Data
33 ELM_INWIN_DATA_GET(o, ptr); \ 33 ELM_INWIN_DATA_GET(o, ptr); \
34 if (!ptr) \ 34 if (!ptr) \
35 { \ 35 { \
36 CRITICAL("No widget data for object %p (%s)", \ 36 CRI("No widget data for object %p (%s)", \
37 o, evas_object_type_get(o)); \ 37 o, evas_object_type_get(o)); \
38 return; \ 38 return; \
39 } 39 }
@@ -42,7 +42,7 @@ struct _Elm_Inwin_Smart_Data
42 ELM_INWIN_DATA_GET(o, ptr); \ 42 ELM_INWIN_DATA_GET(o, ptr); \
43 if (!ptr) \ 43 if (!ptr) \
44 { \ 44 { \
45 CRITICAL("No widget data for object %p (%s)", \ 45 CRI("No widget data for object %p (%s)", \
46 o, evas_object_type_get(o)); \ 46 o, evas_object_type_get(o)); \
47 return val; \ 47 return val; \
48 } 48 }
diff --git a/src/lib/elm_widget_label.h b/src/lib/elm_widget_label.h
index 7cc999873..3d627d01d 100644
--- a/src/lib/elm_widget_label.h
+++ b/src/lib/elm_widget_label.h
@@ -29,7 +29,7 @@ struct _Elm_Label_Smart_Data
29 ELM_LABEL_DATA_GET(o, ptr); \ 29 ELM_LABEL_DATA_GET(o, ptr); \
30 if (!ptr) \ 30 if (!ptr) \
31 { \ 31 { \
32 CRITICAL("No widget data for object %p (%s)", \ 32 CRI("No widget data for object %p (%s)", \
33 o, evas_object_type_get(o)); \ 33 o, evas_object_type_get(o)); \
34 return; \ 34 return; \
35 } 35 }
@@ -38,7 +38,7 @@ struct _Elm_Label_Smart_Data
38 ELM_LABEL_DATA_GET(o, ptr); \ 38 ELM_LABEL_DATA_GET(o, ptr); \
39 if (!ptr) \ 39 if (!ptr) \
40 { \ 40 { \
41 CRITICAL("No widget data for object %p (%s)", \ 41 CRI("No widget data for object %p (%s)", \
42 o, evas_object_type_get(o)); \ 42 o, evas_object_type_get(o)); \
43 return val; \ 43 return val; \
44 } 44 }
diff --git a/src/lib/elm_widget_list.h b/src/lib/elm_widget_list.h
index c04d41da2..2c21c961b 100644
--- a/src/lib/elm_widget_list.h
+++ b/src/lib/elm_widget_list.h
@@ -89,7 +89,7 @@ struct _Elm_List_Item
89 ELM_LIST_DATA_GET(o, ptr); \ 89 ELM_LIST_DATA_GET(o, ptr); \
90 if (!ptr) \ 90 if (!ptr) \
91 { \ 91 { \
92 CRITICAL("No widget data for object %p (%s)", \ 92 CRI("No widget data for object %p (%s)", \
93 o, evas_object_type_get(o)); \ 93 o, evas_object_type_get(o)); \
94 return; \ 94 return; \
95 } 95 }
@@ -98,7 +98,7 @@ struct _Elm_List_Item
98 ELM_LIST_DATA_GET(o, ptr); \ 98 ELM_LIST_DATA_GET(o, ptr); \
99 if (!ptr) \ 99 if (!ptr) \
100 { \ 100 { \
101 CRITICAL("No widget data for object %p (%s)", \ 101 CRI("No widget data for object %p (%s)", \
102 o, evas_object_type_get(o)); \ 102 o, evas_object_type_get(o)); \
103 return val; \ 103 return val; \
104 } 104 }
diff --git a/src/lib/elm_widget_map.h b/src/lib/elm_widget_map.h
index c6639cd74..1d98e4f67 100644
--- a/src/lib/elm_widget_map.h
+++ b/src/lib/elm_widget_map.h
@@ -498,7 +498,7 @@ struct _Elm_Map_Pan_Smart_Data
498 ELM_MAP_DATA_GET(o, ptr); \ 498 ELM_MAP_DATA_GET(o, ptr); \
499 if (!ptr) \ 499 if (!ptr) \
500 { \ 500 { \
501 CRITICAL("No widget data for object %p (%s)", \ 501 CRI("No widget data for object %p (%s)", \
502 o, evas_object_type_get(o)); \ 502 o, evas_object_type_get(o)); \
503 return; \ 503 return; \
504 } 504 }
@@ -507,7 +507,7 @@ struct _Elm_Map_Pan_Smart_Data
507 ELM_MAP_DATA_GET(o, ptr); \ 507 ELM_MAP_DATA_GET(o, ptr); \
508 if (!ptr) \ 508 if (!ptr) \
509 { \ 509 { \
510 CRITICAL("No widget data for object %p (%s)", \ 510 CRI("No widget data for object %p (%s)", \
511 o, evas_object_type_get(o)); \ 511 o, evas_object_type_get(o)); \
512 return val; \ 512 return val; \
513 } 513 }
diff --git a/src/lib/elm_widget_mapbuf.h b/src/lib/elm_widget_mapbuf.h
index 0d2bb3be3..97435ef9c 100644
--- a/src/lib/elm_widget_mapbuf.h
+++ b/src/lib/elm_widget_mapbuf.h
@@ -46,7 +46,7 @@ struct _Elm_Mapbuf_Smart_Data
46 ELM_MAPBUF_DATA_GET(o, ptr); \ 46 ELM_MAPBUF_DATA_GET(o, ptr); \
47 if (!ptr) \ 47 if (!ptr) \
48 { \ 48 { \
49 CRITICAL("No widget data for object %p (%s)", \ 49 CRI("No widget data for object %p (%s)", \
50 o, evas_object_type_get(o)); \ 50 o, evas_object_type_get(o)); \
51 return; \ 51 return; \
52 } 52 }
@@ -55,7 +55,7 @@ struct _Elm_Mapbuf_Smart_Data
55 ELM_MAPBUF_DATA_GET(o, ptr); \ 55 ELM_MAPBUF_DATA_GET(o, ptr); \
56 if (!ptr) \ 56 if (!ptr) \
57 { \ 57 { \
58 CRITICAL("No widget data for object %p (%s)", \ 58 CRI("No widget data for object %p (%s)", \
59 o, evas_object_type_get(o)); \ 59 o, evas_object_type_get(o)); \
60 return val; \ 60 return val; \
61 } 61 }
diff --git a/src/lib/elm_widget_menu.h b/src/lib/elm_widget_menu.h
index 2bde15bc5..50b97e128 100644
--- a/src/lib/elm_widget_menu.h
+++ b/src/lib/elm_widget_menu.h
@@ -66,7 +66,7 @@ struct _Elm_Menu_Item
66 ELM_MENU_DATA_GET(o, ptr); \ 66 ELM_MENU_DATA_GET(o, ptr); \
67 if (!ptr) \ 67 if (!ptr) \
68 { \ 68 { \
69 CRITICAL("No widget data for object %p (%s)", \ 69 CRI("No widget data for object %p (%s)", \
70 o, evas_object_type_get(o)); \ 70 o, evas_object_type_get(o)); \
71 return; \ 71 return; \
72 } 72 }
@@ -75,7 +75,7 @@ struct _Elm_Menu_Item
75 ELM_MENU_DATA_GET(o, ptr); \ 75 ELM_MENU_DATA_GET(o, ptr); \
76 if (!ptr) \ 76 if (!ptr) \
77 { \ 77 { \
78 CRITICAL("No widget data for object %p (%s)", \ 78 CRI("No widget data for object %p (%s)", \
79 o, evas_object_type_get(o)); \ 79 o, evas_object_type_get(o)); \
80 return val; \ 80 return val; \
81 } 81 }
diff --git a/src/lib/elm_widget_multibuttonentry.h b/src/lib/elm_widget_multibuttonentry.h
index c1e66fc8c..62ce0977d 100644
--- a/src/lib/elm_widget_multibuttonentry.h
+++ b/src/lib/elm_widget_multibuttonentry.h
@@ -106,7 +106,7 @@ struct _Elm_Multibuttonentry_Smart_Data
106 Elm_Multibuttonentry_Smart_Data *ptr = eo_data_scope_get(o, ELM_OBJ_MULTIBUTTONENTRY_CLASS); \ 106 Elm_Multibuttonentry_Smart_Data *ptr = eo_data_scope_get(o, ELM_OBJ_MULTIBUTTONENTRY_CLASS); \
107 if (!ptr) \ 107 if (!ptr) \
108 { \ 108 { \
109 CRITICAL("No widget data for object %p (%s)", \ 109 CRI("No widget data for object %p (%s)", \
110 o, evas_object_type_get(o)); \ 110 o, evas_object_type_get(o)); \
111 return; \ 111 return; \
112 } 112 }
@@ -115,7 +115,7 @@ struct _Elm_Multibuttonentry_Smart_Data
115 Elm_Multibuttonentry_Smart_Data * ptr = eo_data_scope_get(o, ELM_OBJ_MULTIBUTTONENTRY_CLASS); \ 115 Elm_Multibuttonentry_Smart_Data * ptr = eo_data_scope_get(o, ELM_OBJ_MULTIBUTTONENTRY_CLASS); \
116 if (!ptr) \ 116 if (!ptr) \
117 { \ 117 { \
118 CRITICAL("No widget data for object %p (%s)", \ 118 CRI("No widget data for object %p (%s)", \
119 o, evas_object_type_get(o)); \ 119 o, evas_object_type_get(o)); \
120 return val; \ 120 return val; \
121 } 121 }
diff --git a/src/lib/elm_widget_naviframe.h b/src/lib/elm_widget_naviframe.h
index 284b9b4bc..b5ea65f02 100644
--- a/src/lib/elm_widget_naviframe.h
+++ b/src/lib/elm_widget_naviframe.h
@@ -86,7 +86,7 @@ struct _Elm_Naviframe_Text_Item_Pair
86 ELM_NAVIFRAME_DATA_GET(o, ptr); \ 86 ELM_NAVIFRAME_DATA_GET(o, ptr); \
87 if (!ptr) \ 87 if (!ptr) \
88 { \ 88 { \
89 CRITICAL("No widget data for object %p (%s)", \ 89 CRI("No widget data for object %p (%s)", \
90 o, evas_object_type_get(o)); \ 90 o, evas_object_type_get(o)); \
91 return; \ 91 return; \
92 } 92 }
@@ -95,7 +95,7 @@ struct _Elm_Naviframe_Text_Item_Pair
95 ELM_NAVIFRAME_DATA_GET(o, ptr); \ 95 ELM_NAVIFRAME_DATA_GET(o, ptr); \
96 if (!ptr) \ 96 if (!ptr) \
97 { \ 97 { \
98 CRITICAL("No widget data for object %p (%s)", \ 98 CRI("No widget data for object %p (%s)", \
99 o, evas_object_type_get(o)); \ 99 o, evas_object_type_get(o)); \
100 return val; \ 100 return val; \
101 } 101 }
diff --git a/src/lib/elm_widget_notify.h b/src/lib/elm_widget_notify.h
index ac6c00683..046f12984 100644
--- a/src/lib/elm_widget_notify.h
+++ b/src/lib/elm_widget_notify.h
@@ -43,7 +43,7 @@ struct _Elm_Notify_Smart_Data
43 ELM_NOTIFY_DATA_GET(o, ptr); \ 43 ELM_NOTIFY_DATA_GET(o, ptr); \
44 if (!ptr) \ 44 if (!ptr) \
45 { \ 45 { \
46 CRITICAL("No widget data for object %p (%s)", \ 46 CRI("No widget data for object %p (%s)", \
47 o, evas_object_type_get(o)); \ 47 o, evas_object_type_get(o)); \
48 return; \ 48 return; \
49 } 49 }
@@ -52,7 +52,7 @@ struct _Elm_Notify_Smart_Data
52 ELM_NOTIFY_DATA_GET(o, ptr); \ 52 ELM_NOTIFY_DATA_GET(o, ptr); \
53 if (!ptr) \ 53 if (!ptr) \
54 { \ 54 { \
55 CRITICAL("No widget data for object %p (%s)", \ 55 CRI("No widget data for object %p (%s)", \
56 o, evas_object_type_get(o)); \ 56 o, evas_object_type_get(o)); \
57 return val; \ 57 return val; \
58 } 58 }
diff --git a/src/lib/elm_widget_panel.h b/src/lib/elm_widget_panel.h
index dfee22105..a82f064bd 100644
--- a/src/lib/elm_widget_panel.h
+++ b/src/lib/elm_widget_panel.h
@@ -41,7 +41,7 @@ struct _Elm_Panel_Smart_Data
41 ELM_PANEL_DATA_GET(o, ptr); \ 41 ELM_PANEL_DATA_GET(o, ptr); \
42 if (!ptr) \ 42 if (!ptr) \
43 { \ 43 { \
44 CRITICAL("No widget data for object %p (%s)", \ 44 CRI("No widget data for object %p (%s)", \
45 o, evas_object_type_get(o)); \ 45 o, evas_object_type_get(o)); \
46 return; \ 46 return; \
47 } 47 }
@@ -50,7 +50,7 @@ struct _Elm_Panel_Smart_Data
50 ELM_PANEL_DATA_GET(o, ptr); \ 50 ELM_PANEL_DATA_GET(o, ptr); \
51 if (!ptr) \ 51 if (!ptr) \
52 { \ 52 { \
53 CRITICAL("No widget data for object %p (%s)", \ 53 CRI("No widget data for object %p (%s)", \
54 o, evas_object_type_get(o)); \ 54 o, evas_object_type_get(o)); \
55 return val; \ 55 return val; \
56 } 56 }
diff --git a/src/lib/elm_widget_panes.h b/src/lib/elm_widget_panes.h
index accd07981..089be6127 100644
--- a/src/lib/elm_widget_panes.h
+++ b/src/lib/elm_widget_panes.h
@@ -44,7 +44,7 @@ struct _Elm_Panes_Smart_Data
44 ELM_PANES_DATA_GET(o, ptr); \ 44 ELM_PANES_DATA_GET(o, ptr); \
45 if (!ptr) \ 45 if (!ptr) \
46 { \ 46 { \
47 CRITICAL("No widget data for object %p (%s)", \ 47 CRI("No widget data for object %p (%s)", \
48 o, evas_object_type_get(o)); \ 48 o, evas_object_type_get(o)); \
49 return; \ 49 return; \
50 } 50 }
@@ -53,7 +53,7 @@ struct _Elm_Panes_Smart_Data
53 ELM_PANES_DATA_GET(o, ptr); \ 53 ELM_PANES_DATA_GET(o, ptr); \
54 if (!ptr) \ 54 if (!ptr) \
55 { \ 55 { \
56 CRITICAL("No widget data for object %p (%s)", \ 56 CRI("No widget data for object %p (%s)", \
57 o, evas_object_type_get(o)); \ 57 o, evas_object_type_get(o)); \
58 return val; \ 58 return val; \
59 } 59 }
diff --git a/src/lib/elm_widget_photo.h b/src/lib/elm_widget_photo.h
index f67de88ed..40625ebe0 100644
--- a/src/lib/elm_widget_photo.h
+++ b/src/lib/elm_widget_photo.h
@@ -49,7 +49,7 @@ struct _Elm_Photo_Smart_Data
49 ELM_PHOTO_DATA_GET(o, ptr); \ 49 ELM_PHOTO_DATA_GET(o, ptr); \
50 if (!ptr) \ 50 if (!ptr) \
51 { \ 51 { \
52 CRITICAL("No widget data for object %p (%s)", \ 52 CRI("No widget data for object %p (%s)", \
53 o, evas_object_type_get(o)); \ 53 o, evas_object_type_get(o)); \
54 return; \ 54 return; \
55 } 55 }
@@ -58,7 +58,7 @@ struct _Elm_Photo_Smart_Data
58 ELM_PHOTO_DATA_GET(o, ptr); \ 58 ELM_PHOTO_DATA_GET(o, ptr); \
59 if (!ptr) \ 59 if (!ptr) \
60 { \ 60 { \
61 CRITICAL("No widget data for object %p (%s)", \ 61 CRI("No widget data for object %p (%s)", \
62 o, evas_object_type_get(o)); \ 62 o, evas_object_type_get(o)); \
63 return val; \ 63 return val; \
64 } 64 }
diff --git a/src/lib/elm_widget_photocam.h b/src/lib/elm_widget_photocam.h
index 7b70fcd37..6b410397b 100644
--- a/src/lib/elm_widget_photocam.h
+++ b/src/lib/elm_widget_photocam.h
@@ -145,7 +145,7 @@ struct _Elm_Photocam_Pan_Smart_Data
145 ELM_PHOTOCAM_DATA_GET(o, ptr); \ 145 ELM_PHOTOCAM_DATA_GET(o, ptr); \
146 if (!ptr) \ 146 if (!ptr) \
147 { \ 147 { \
148 CRITICAL("No widget data for object %p (%s)", \ 148 CRI("No widget data for object %p (%s)", \
149 o, evas_object_type_get(o)); \ 149 o, evas_object_type_get(o)); \
150 return; \ 150 return; \
151 } 151 }
@@ -154,7 +154,7 @@ struct _Elm_Photocam_Pan_Smart_Data
154 ELM_PHOTOCAM_DATA_GET(o, ptr); \ 154 ELM_PHOTOCAM_DATA_GET(o, ptr); \
155 if (!ptr) \ 155 if (!ptr) \
156 { \ 156 { \
157 CRITICAL("No widget data for object %p (%s)", \ 157 CRI("No widget data for object %p (%s)", \
158 o, evas_object_type_get(o)); \ 158 o, evas_object_type_get(o)); \
159 return val; \ 159 return val; \
160 } 160 }
diff --git a/src/lib/elm_widget_player.h b/src/lib/elm_widget_player.h
index 3ada37835..54a416494 100644
--- a/src/lib/elm_widget_player.h
+++ b/src/lib/elm_widget_player.h
@@ -52,7 +52,7 @@ struct _Elm_Player_Smart_Data
52 ELM_PLAYER_DATA_GET(o, ptr); \ 52 ELM_PLAYER_DATA_GET(o, ptr); \
53 if (!ptr) \ 53 if (!ptr) \
54 { \ 54 { \
55 CRITICAL("No widget data for object %p (%s)", \ 55 CRI("No widget data for object %p (%s)", \
56 o, evas_object_type_get(o)); \ 56 o, evas_object_type_get(o)); \
57 return; \ 57 return; \
58 } 58 }
@@ -61,7 +61,7 @@ struct _Elm_Player_Smart_Data
61 ELM_PLAYER_DATA_GET(o, ptr); \ 61 ELM_PLAYER_DATA_GET(o, ptr); \
62 if (!ptr) \ 62 if (!ptr) \
63 { \ 63 { \
64 CRITICAL("No widget data for object %p (%s)", \ 64 CRI("No widget data for object %p (%s)", \
65 o, evas_object_type_get(o)); \ 65 o, evas_object_type_get(o)); \
66 return val; \ 66 return val; \
67 } 67 }
diff --git a/src/lib/elm_widget_plug.h b/src/lib/elm_widget_plug.h
index 604b1a1b5..60589520c 100644
--- a/src/lib/elm_widget_plug.h
+++ b/src/lib/elm_widget_plug.h
@@ -24,7 +24,7 @@
24 ELM_PLUG_DATA_GET(o, ptr); \ 24 ELM_PLUG_DATA_GET(o, ptr); \
25 if (!ptr) \ 25 if (!ptr) \
26 { \ 26 { \
27 CRITICAL("No widget data for object %p (%s)", \ 27 CRI("No widget data for object %p (%s)", \
28 o, evas_object_type_get(o)); \ 28 o, evas_object_type_get(o)); \
29 return; \ 29 return; \
30 } 30 }
@@ -33,7 +33,7 @@
33 ELM_PLUG_DATA_GET(o, ptr); \ 33 ELM_PLUG_DATA_GET(o, ptr); \
34 if (!ptr) \ 34 if (!ptr) \
35 { \ 35 { \
36 CRITICAL("No widget data for object %p (%s)", \ 36 CRI("No widget data for object %p (%s)", \
37 o, evas_object_type_get(o)); \ 37 o, evas_object_type_get(o)); \
38 return val; \ 38 return val; \
39 } 39 }
diff --git a/src/lib/elm_widget_popup.h b/src/lib/elm_widget_popup.h
index e0bbc2246..84016ebdc 100644
--- a/src/lib/elm_widget_popup.h
+++ b/src/lib/elm_widget_popup.h
@@ -76,7 +76,7 @@ struct _Action_Area_Data
76 ELM_POPUP_DATA_GET(o, ptr); \ 76 ELM_POPUP_DATA_GET(o, ptr); \
77 if (!ptr) \ 77 if (!ptr) \
78 { \ 78 { \
79 CRITICAL("No widget data for object %p (%s)", \ 79 CRI("No widget data for object %p (%s)", \
80 o, evas_object_type_get(o)); \ 80 o, evas_object_type_get(o)); \
81 return; \ 81 return; \
82 } 82 }
@@ -85,7 +85,7 @@ struct _Action_Area_Data
85 ELM_POPUP_DATA_GET(o, ptr); \ 85 ELM_POPUP_DATA_GET(o, ptr); \
86 if (!ptr) \ 86 if (!ptr) \
87 { \ 87 { \
88 CRITICAL("No widget data for object %p (%s)", \ 88 CRI("No widget data for object %p (%s)", \
89 o, evas_object_type_get(o)); \ 89 o, evas_object_type_get(o)); \
90 return val; \ 90 return val; \
91 } 91 }
diff --git a/src/lib/elm_widget_prefs.h b/src/lib/elm_widget_prefs.h
index a66bd5178..126201b00 100644
--- 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;
96#define ELM_PREFS_ENTRY(o, sd) \ 96#define ELM_PREFS_ENTRY(o, sd) \
97 if (!sd->data_file || !sd->page) \ 97 if (!sd->data_file || !sd->page) \
98 { \ 98 { \
99 CRITICAL("You must issue elm_prefs_file_set() on this widget before" \ 99 CRI("You must issue elm_prefs_file_set() on this widget before" \
100 " you make this call"); \ 100 " you make this call"); \
101 } \ 101 } \
102 return 102 return
@@ -105,7 +105,7 @@ extern const Elm_Prefs_Item_Iface *elm_prefs_item_default_widget;
105 ELM_PREFS_DATA_GET(o, ptr); \ 105 ELM_PREFS_DATA_GET(o, ptr); \
106 if (!ptr) \ 106 if (!ptr) \
107 { \ 107 { \
108 CRITICAL("No widget data for object %p (%s)", \ 108 CRI("No widget data for object %p (%s)", \
109 o, evas_object_type_get(o)); \ 109 o, evas_object_type_get(o)); \
110 return; \ 110 return; \
111 } 111 }
@@ -114,7 +114,7 @@ extern const Elm_Prefs_Item_Iface *elm_prefs_item_default_widget;
114 ELM_PREFS_DATA_GET(o, ptr); \ 114 ELM_PREFS_DATA_GET(o, ptr); \
115 if (!ptr) \ 115 if (!ptr) \
116 { \ 116 { \
117 CRITICAL("No widget data for object %p (%s)", \ 117 CRI("No widget data for object %p (%s)", \
118 o, evas_object_type_get(o)); \ 118 o, evas_object_type_get(o)); \
119 return val; \ 119 return val; \
120 } 120 }
diff --git a/src/lib/elm_widget_progressbar.h b/src/lib/elm_widget_progressbar.h
index 016970e79..014bb0f22 100644
--- a/src/lib/elm_widget_progressbar.h
+++ b/src/lib/elm_widget_progressbar.h
@@ -55,7 +55,7 @@ struct _Elm_Progress_Status
55 ELM_PROGRESSBAR_DATA_GET(o, ptr); \ 55 ELM_PROGRESSBAR_DATA_GET(o, ptr); \
56 if (!ptr) \ 56 if (!ptr) \
57 { \ 57 { \
58 CRITICAL("No widget data for object %p (%s)", \ 58 CRI("No widget data for object %p (%s)", \
59 o, evas_object_type_get(o)); \ 59 o, evas_object_type_get(o)); \
60 return; \ 60 return; \
61 } 61 }
@@ -64,7 +64,7 @@ struct _Elm_Progress_Status
64 ELM_PROGRESSBAR_DATA_GET(o, ptr); \ 64 ELM_PROGRESSBAR_DATA_GET(o, ptr); \
65 if (!ptr) \ 65 if (!ptr) \
66 { \ 66 { \
67 CRITICAL("No widget data for object %p (%s)", \ 67 CRI("No widget data for object %p (%s)", \
68 o, evas_object_type_get(o)); \ 68 o, evas_object_type_get(o)); \
69 return val; \ 69 return val; \
70 } 70 }
diff --git a/src/lib/elm_widget_radio.h b/src/lib/elm_widget_radio.h
index 1bd281525..904c1de03 100644
--- a/src/lib/elm_widget_radio.h
+++ b/src/lib/elm_widget_radio.h
@@ -46,7 +46,7 @@ struct _Elm_Radio_Smart_Data
46 ELM_RADIO_DATA_GET(o, ptr); \ 46 ELM_RADIO_DATA_GET(o, ptr); \
47 if (!ptr) \ 47 if (!ptr) \
48 { \ 48 { \
49 CRITICAL("No widget data for object %p (%s)", \ 49 CRI("No widget data for object %p (%s)", \
50 o, evas_object_type_get(o)); \ 50 o, evas_object_type_get(o)); \
51 return; \ 51 return; \
52 } 52 }
@@ -55,7 +55,7 @@ struct _Elm_Radio_Smart_Data
55 ELM_RADIO_DATA_GET(o, ptr); \ 55 ELM_RADIO_DATA_GET(o, ptr); \
56 if (!ptr) \ 56 if (!ptr) \
57 { \ 57 { \
58 CRITICAL("No widget data for object %p (%s)", \ 58 CRI("No widget data for object %p (%s)", \
59 o, evas_object_type_get(o)); \ 59 o, evas_object_type_get(o)); \
60 return val; \ 60 return val; \
61 } 61 }
diff --git a/src/lib/elm_widget_route.h b/src/lib/elm_widget_route.h
index 84e6e18f6..c7ff1a652 100644
--- a/src/lib/elm_widget_route.h
+++ b/src/lib/elm_widget_route.h
@@ -57,7 +57,7 @@ struct Segment
57 ELM_ROUTE_DATA_GET(o, ptr); \ 57 ELM_ROUTE_DATA_GET(o, ptr); \
58 if (!ptr) \ 58 if (!ptr) \
59 { \ 59 { \
60 CRITICAL("No widget data for object %p (%s)", \ 60 CRI("No widget data for object %p (%s)", \
61 o, evas_object_type_get(o)); \ 61 o, evas_object_type_get(o)); \
62 return; \ 62 return; \
63 } 63 }
@@ -66,7 +66,7 @@ struct Segment
66 ELM_ROUTE_DATA_GET(o, ptr); \ 66 ELM_ROUTE_DATA_GET(o, ptr); \
67 if (!ptr) \ 67 if (!ptr) \
68 { \ 68 { \
69 CRITICAL("No widget data for object %p (%s)", \ 69 CRI("No widget data for object %p (%s)", \
70 o, evas_object_type_get(o)); \ 70 o, evas_object_type_get(o)); \
71 return val; \ 71 return val; \
72 } 72 }
diff --git a/src/lib/elm_widget_scroller.h b/src/lib/elm_widget_scroller.h
index ef627e696..be871f412 100644
--- a/src/lib/elm_widget_scroller.h
+++ b/src/lib/elm_widget_scroller.h
@@ -40,7 +40,7 @@ struct _Elm_Scroller_Smart_Data
40 ELM_SCROLLER_DATA_GET(o, ptr); \ 40 ELM_SCROLLER_DATA_GET(o, ptr); \
41 if (!ptr) \ 41 if (!ptr) \
42 { \ 42 { \
43 CRITICAL("No widget data for object %p (%s)", \ 43 CRI("No widget data for object %p (%s)", \
44 o, evas_object_type_get(o)); \ 44 o, evas_object_type_get(o)); \
45 return; \ 45 return; \
46 } 46 }
@@ -49,7 +49,7 @@ struct _Elm_Scroller_Smart_Data
49 ELM_SCROLLER_DATA_GET(o, ptr); \ 49 ELM_SCROLLER_DATA_GET(o, ptr); \
50 if (!ptr) \ 50 if (!ptr) \
51 { \ 51 { \
52 CRITICAL("No widget data for object %p (%s)", \ 52 CRI("No widget data for object %p (%s)", \
53 o, evas_object_type_get(o)); \ 53 o, evas_object_type_get(o)); \
54 return val; \ 54 return val; \
55 } 55 }
diff --git a/src/lib/elm_widget_segment_control.h b/src/lib/elm_widget_segment_control.h
index 44f34a406..1d5fab041 100644
--- a/src/lib/elm_widget_segment_control.h
+++ b/src/lib/elm_widget_segment_control.h
@@ -49,7 +49,7 @@ struct _Elm_Segment_Item
49 ELM_SEGMENT_CONTROL_DATA_GET(o, ptr); \ 49 ELM_SEGMENT_CONTROL_DATA_GET(o, ptr); \
50 if (!ptr) \ 50 if (!ptr) \
51 { \ 51 { \
52 CRITICAL("No widget data for object %p (%s)", \ 52 CRI("No widget data for object %p (%s)", \
53 o, evas_object_type_get(o)); \ 53 o, evas_object_type_get(o)); \
54 return; \ 54 return; \
55 } 55 }
@@ -58,7 +58,7 @@ struct _Elm_Segment_Item
58 ELM_SEGMENT_CONTROL_DATA_GET(o, ptr); \ 58 ELM_SEGMENT_CONTROL_DATA_GET(o, ptr); \
59 if (!ptr) \ 59 if (!ptr) \
60 { \ 60 { \
61 CRITICAL("No widget data for object %p (%s)", \ 61 CRI("No widget data for object %p (%s)", \
62 o, evas_object_type_get(o)); \ 62 o, evas_object_type_get(o)); \
63 return val; \ 63 return val; \
64 } 64 }
diff --git a/src/lib/elm_widget_separator.h b/src/lib/elm_widget_separator.h
index 63f739758..132c05282 100644
--- a/src/lib/elm_widget_separator.h
+++ b/src/lib/elm_widget_separator.h
@@ -34,7 +34,7 @@ struct _Elm_Separator_Smart_Data
34 ELM_SEPARATOR_DATA_GET(o, ptr); \ 34 ELM_SEPARATOR_DATA_GET(o, ptr); \
35 if (!ptr) \ 35 if (!ptr) \
36 { \ 36 { \
37 CRITICAL("No widget data for object %p (%s)", \ 37 CRI("No widget data for object %p (%s)", \
38 o, evas_object_type_get(o)); \ 38 o, evas_object_type_get(o)); \
39 return; \ 39 return; \
40 } 40 }
@@ -43,7 +43,7 @@ struct _Elm_Separator_Smart_Data
43 ELM_SEPARATOR_DATA_GET(o, ptr); \ 43 ELM_SEPARATOR_DATA_GET(o, ptr); \
44 if (!ptr) \ 44 if (!ptr) \
45 { \ 45 { \
46 CRITICAL("No widget data for object %p (%s)", \ 46 CRI("No widget data for object %p (%s)", \
47 o, evas_object_type_get(o)); \ 47 o, evas_object_type_get(o)); \
48 return val; \ 48 return val; \
49 } 49 }
diff --git a/src/lib/elm_widget_slider.h b/src/lib/elm_widget_slider.h
index 74e4b5fbd..88c386bff 100644
--- a/src/lib/elm_widget_slider.h
+++ b/src/lib/elm_widget_slider.h
@@ -59,7 +59,7 @@ struct _Elm_Slider_Smart_Data
59 ELM_SLIDER_DATA_GET(o, ptr); \ 59 ELM_SLIDER_DATA_GET(o, ptr); \
60 if (!ptr) \ 60 if (!ptr) \
61 { \ 61 { \
62 CRITICAL("No widget data for object %p (%s)", \ 62 CRI("No widget data for object %p (%s)", \
63 o, evas_object_type_get(o)); \ 63 o, evas_object_type_get(o)); \
64 return; \ 64 return; \
65 } 65 }
@@ -68,7 +68,7 @@ struct _Elm_Slider_Smart_Data
68 ELM_SLIDER_DATA_GET(o, ptr); \ 68 ELM_SLIDER_DATA_GET(o, ptr); \
69 if (!ptr) \ 69 if (!ptr) \
70 { \ 70 { \
71 CRITICAL("No widget data for object %p (%s)", \ 71 CRI("No widget data for object %p (%s)", \
72 o, evas_object_type_get(o)); \ 72 o, evas_object_type_get(o)); \
73 return val; \ 73 return val; \
74 } 74 }
diff --git a/src/lib/elm_widget_slideshow.h b/src/lib/elm_widget_slideshow.h
index 051164742..022b0f713 100644
--- a/src/lib/elm_widget_slideshow.h
+++ b/src/lib/elm_widget_slideshow.h
@@ -65,7 +65,7 @@ struct _Elm_Slideshow_Smart_Data
65 ELM_SLIDESHOW_DATA_GET(o, ptr); \ 65 ELM_SLIDESHOW_DATA_GET(o, ptr); \
66 if (!ptr) \ 66 if (!ptr) \
67 { \ 67 { \
68 CRITICAL("No widget data for object %p (%s)", \ 68 CRI("No widget data for object %p (%s)", \
69 o, evas_object_type_get(o)); \ 69 o, evas_object_type_get(o)); \
70 return; \ 70 return; \
71 } 71 }
@@ -74,7 +74,7 @@ struct _Elm_Slideshow_Smart_Data
74 ELM_SLIDESHOW_DATA_GET(o, ptr); \ 74 ELM_SLIDESHOW_DATA_GET(o, ptr); \
75 if (!ptr) \ 75 if (!ptr) \
76 { \ 76 { \
77 CRITICAL("No widget data for object %p (%s)", \ 77 CRI("No widget data for object %p (%s)", \
78 o, evas_object_type_get(o)); \ 78 o, evas_object_type_get(o)); \
79 return val; \ 79 return val; \
80 } 80 }
diff --git a/src/lib/elm_widget_spinner.h b/src/lib/elm_widget_spinner.h
index 0271b9e02..5f732fb58 100644
--- a/src/lib/elm_widget_spinner.h
+++ b/src/lib/elm_widget_spinner.h
@@ -58,7 +58,7 @@ struct _Elm_Spinner_Special_Value
58 ELM_SPINNER_DATA_GET(o, ptr); \ 58 ELM_SPINNER_DATA_GET(o, ptr); \
59 if (!ptr) \ 59 if (!ptr) \
60 { \ 60 { \
61 CRITICAL("No widget data for object %p (%s)", \ 61 CRI("No widget data for object %p (%s)", \
62 o, evas_object_type_get(o)); \ 62 o, evas_object_type_get(o)); \
63 return; \ 63 return; \
64 } 64 }
@@ -67,7 +67,7 @@ struct _Elm_Spinner_Special_Value
67 ELM_SPINNER_DATA_GET(o, ptr); \ 67 ELM_SPINNER_DATA_GET(o, ptr); \
68 if (!ptr) \ 68 if (!ptr) \
69 { \ 69 { \
70 CRITICAL("No widget data for object %p (%s)", \ 70 CRI("No widget data for object %p (%s)", \
71 o, evas_object_type_get(o)); \ 71 o, evas_object_type_get(o)); \
72 return val; \ 72 return val; \
73 } 73 }
diff --git a/src/lib/elm_widget_thumb.h b/src/lib/elm_widget_thumb.h
index 1f1ca876e..8ecdc79af 100644
--- a/src/lib/elm_widget_thumb.h
+++ b/src/lib/elm_widget_thumb.h
@@ -72,7 +72,7 @@ struct _Elm_Thumb_Smart_Data
72 ELM_THUMB_DATA_GET(o, ptr); \ 72 ELM_THUMB_DATA_GET(o, ptr); \
73 if (!ptr) \ 73 if (!ptr) \
74 { \ 74 { \
75 CRITICAL("No widget data for object %p (%s)", \ 75 CRI("No widget data for object %p (%s)", \
76 o, evas_object_type_get(o)); \ 76 o, evas_object_type_get(o)); \
77 return; \ 77 return; \
78 } 78 }
@@ -81,7 +81,7 @@ struct _Elm_Thumb_Smart_Data
81 ELM_THUMB_DATA_GET(o, ptr); \ 81 ELM_THUMB_DATA_GET(o, ptr); \
82 if (!ptr) \ 82 if (!ptr) \
83 { \ 83 { \
84 CRITICAL("No widget data for object %p (%s)", \ 84 CRI("No widget data for object %p (%s)", \
85 o, evas_object_type_get(o)); \ 85 o, evas_object_type_get(o)); \
86 return val; \ 86 return val; \
87 } 87 }
diff --git a/src/lib/elm_widget_toolbar.h b/src/lib/elm_widget_toolbar.h
index 6e96040b0..66d18024c 100644
--- a/src/lib/elm_widget_toolbar.h
+++ b/src/lib/elm_widget_toolbar.h
@@ -102,7 +102,7 @@ struct _Elm_Toolbar_Item_State
102 ELM_TOOLBAR_DATA_GET(o, ptr); \ 102 ELM_TOOLBAR_DATA_GET(o, ptr); \
103 if (!ptr) \ 103 if (!ptr) \
104 { \ 104 { \
105 CRITICAL("No widget data for object %p (%s)", \ 105 CRI("No widget data for object %p (%s)", \
106 o, evas_object_type_get(o)); \ 106 o, evas_object_type_get(o)); \
107 return; \ 107 return; \
108 } 108 }
@@ -111,7 +111,7 @@ struct _Elm_Toolbar_Item_State
111 ELM_TOOLBAR_DATA_GET(o, ptr); \ 111 ELM_TOOLBAR_DATA_GET(o, ptr); \
112 if (!ptr) \ 112 if (!ptr) \
113 { \ 113 { \
114 CRITICAL("No widget data for object %p (%s)", \ 114 CRI("No widget data for object %p (%s)", \
115 o, evas_object_type_get(o)); \ 115 o, evas_object_type_get(o)); \
116 return val; \ 116 return val; \
117 } 117 }
diff --git a/src/lib/elm_widget_video.h b/src/lib/elm_widget_video.h
index e2979e5e4..1907c1ce8 100644
--- a/src/lib/elm_widget_video.h
+++ b/src/lib/elm_widget_video.h
@@ -38,7 +38,7 @@ struct _Elm_Video_Smart_Data
38 ELM_VIDEO_DATA_GET(o, ptr); \ 38 ELM_VIDEO_DATA_GET(o, ptr); \
39 if (!ptr) \ 39 if (!ptr) \
40 { \ 40 { \
41 CRITICAL("No widget data for object %p (%s)", \ 41 CRI("No widget data for object %p (%s)", \
42 o, evas_object_type_get(o)); \ 42 o, evas_object_type_get(o)); \
43 return; \ 43 return; \
44 } 44 }
@@ -47,7 +47,7 @@ struct _Elm_Video_Smart_Data
47 ELM_VIDEO_DATA_GET(o, ptr); \ 47 ELM_VIDEO_DATA_GET(o, ptr); \
48 if (!ptr) \ 48 if (!ptr) \
49 { \ 49 { \
50 CRITICAL("No widget data for object %p (%s)", \ 50 CRI("No widget data for object %p (%s)", \
51 o, evas_object_type_get(o)); \ 51 o, evas_object_type_get(o)); \
52 return val; \ 52 return val; \
53 } 53 }
diff --git a/src/lib/elm_widget_web.h b/src/lib/elm_widget_web.h
index 147f41164..85df9a15e 100644
--- a/src/lib/elm_widget_web.h
+++ b/src/lib/elm_widget_web.h
@@ -129,7 +129,7 @@ struct _View_Smart_Data
129 ELM_WEB_DATA_GET(o, ptr); \ 129 ELM_WEB_DATA_GET(o, ptr); \
130 if (!ptr) \ 130 if (!ptr) \
131 { \ 131 { \
132 CRITICAL("No widget data for object %p (%s)", \ 132 CRI("No widget data for object %p (%s)", \
133 o, evas_object_type_get(o)); \ 133 o, evas_object_type_get(o)); \
134 return; \ 134 return; \
135 } 135 }
@@ -138,7 +138,7 @@ struct _View_Smart_Data
138 ELM_WEB_DATA_GET(o, ptr); \ 138 ELM_WEB_DATA_GET(o, ptr); \
139 if (!ptr) \ 139 if (!ptr) \
140 { \ 140 { \
141 CRITICAL("No widget data for object %p (%s)", \ 141 CRI("No widget data for object %p (%s)", \
142 o, evas_object_type_get(o)); \ 142 o, evas_object_type_get(o)); \
143 return val; \ 143 return val; \
144 } 144 }
diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index 8ccb89dca..f8c2c794b 100644
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -34,7 +34,7 @@ static const Elm_Win_Trap *trap = NULL;
34 ELM_WIN_DATA_GET(o, ptr); \ 34 ELM_WIN_DATA_GET(o, ptr); \
35 if (!ptr) \ 35 if (!ptr) \
36 { \ 36 { \
37 CRITICAL("No widget data for object %p (%s)", \ 37 CRI("No widget data for object %p (%s)", \
38 o, evas_object_type_get(o)); \ 38 o, evas_object_type_get(o)); \
39 return; \ 39 return; \
40 } 40 }
@@ -43,7 +43,7 @@ static const Elm_Win_Trap *trap = NULL;
43 ELM_WIN_DATA_GET(o, ptr); \ 43 ELM_WIN_DATA_GET(o, ptr); \
44 if (!ptr) \ 44 if (!ptr) \
45 { \ 45 { \
46 CRITICAL("No widget data for object %p (%s)", \ 46 CRI("No widget data for object %p (%s)", \
47 o, evas_object_type_get(o)); \ 47 o, evas_object_type_get(o)); \
48 return val; \ 48 return val; \
49 } 49 }
@@ -2812,12 +2812,12 @@ _win_constructor(Eo *obj, void *_pd, va_list *list)
2812 2812
2813#define FALLBACK_TRY(engine) \ 2813#define FALLBACK_TRY(engine) \
2814 if (!tmp_sd.ee) { \ 2814 if (!tmp_sd.ee) { \
2815 CRITICAL(engine " engine creation failed. Trying default."); \ 2815 CRI(engine " engine creation failed. Trying default."); \
2816 } while (0) 2816 } while (0)
2817#define FALLBACK_STORE(engine) \ 2817#define FALLBACK_STORE(engine) \
2818 if (tmp_sd.ee) \ 2818 if (tmp_sd.ee) \
2819 { \ 2819 { \
2820 CRITICAL(engine "Fallback to %s successful.", engine); \ 2820 CRI(engine "Fallback to %s successful.", engine); \
2821 fallback = engine; \ 2821 fallback = engine; \
2822 } 2822 }
2823 2823
@@ -5448,7 +5448,7 @@ elm_win_trap_set(const Elm_Win_Trap *t)
5448 5448
5449 if ((t) && (t->version != ELM_WIN_TRAP_VERSION)) 5449 if ((t) && (t->version != ELM_WIN_TRAP_VERSION))
5450 { 5450 {
5451 CRITICAL("trying to set a trap version %lu while %lu was expected!", 5451 CRI("trying to set a trap version %lu while %lu was expected!",
5452 t->version, ELM_WIN_TRAP_VERSION); 5452 t->version, ELM_WIN_TRAP_VERSION);
5453 return EINA_FALSE; 5453 return EINA_FALSE;
5454 } 5454 }
diff --git a/src/lib/els_cursor.c b/src/lib/els_cursor.c
index e611af529..654942355 100644
--- 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);
119 { \ 119 { \
120 if (!(obj)) \ 120 if (!(obj)) \
121 { \ 121 { \
122 CRITICAL("Null pointer: " #obj); \ 122 CRI("Null pointer: " #obj); \
123 return __VA_ARGS__; \ 123 return __VA_ARGS__; \
124 } \ 124 } \
125 cur = evas_object_data_get((obj), _cursor_key); \ 125 cur = evas_object_data_get((obj), _cursor_key); \
diff --git a/src/lib/els_tooltip.c b/src/lib/els_tooltip.c
index 0e6c71aee..011e2742f 100644
--- a/src/lib/els_tooltip.c
+++ b/src/lib/els_tooltip.c
@@ -22,7 +22,7 @@ static const char _tooltip_key[] = "_elm_tooltip";
22 { \ 22 { \
23 if (!(obj)) \ 23 if (!(obj)) \
24 { \ 24 { \
25 CRITICAL("Null pointer: " #obj); \ 25 CRI("Null pointer: " #obj); \
26 return __VA_ARGS__; \ 26 return __VA_ARGS__; \
27 } \ 27 } \
28 tt = evas_object_data_get((obj), _tooltip_key); \ 28 tt = evas_object_data_get((obj), _tooltip_key); \
diff --git a/src/modules/prefs/private.h b/src/modules/prefs/private.h
index 6ad8661ae..22e831722 100644
--- a/src/modules/prefs/private.h
+++ b/src/modules/prefs/private.h
@@ -3,13 +3,13 @@
3#endif 3#endif
4#include "Elementary.h" 4#include "Elementary.h"
5 5
6#undef CRITICAL 6#undef CRI
7#undef ERR 7#undef ERR
8#undef WRN 8#undef WRN
9#undef INF 9#undef INF
10#undef DBG 10#undef DBG
11 11
12#define CRITICAL(...) EINA_LOG_DOM_CRIT(_elm_prefs_log_dom, __VA_ARGS__) 12#define CRI(...) EINA_LOG_DOM_CRIT(_elm_prefs_log_dom, __VA_ARGS__)
13#define ERR(...) EINA_LOG_DOM_ERR (_elm_prefs_log_dom, __VA_ARGS__) 13#define ERR(...) EINA_LOG_DOM_ERR (_elm_prefs_log_dom, __VA_ARGS__)
14#define WRN(...) EINA_LOG_DOM_WARN(_elm_prefs_log_dom, __VA_ARGS__) 14#define WRN(...) EINA_LOG_DOM_WARN(_elm_prefs_log_dom, __VA_ARGS__)
15#define INF(...) EINA_LOG_DOM_INFO(_elm_prefs_log_dom, __VA_ARGS__) 15#define INF(...) EINA_LOG_DOM_INFO(_elm_prefs_log_dom, __VA_ARGS__)