Evas_Object *img_edje = elm_layout_edje_get(icon->img_obj.obj);
retv_if(!img_edje, ECORE_CALLBACK_CANCEL);
- char signal_to_emit[32] = {'\0',};
- sprintf(signal_to_emit,icon->signal_to_emit_prefix,icon->animation_state);
+ char signal_to_emit[SIGNAL_SIZE] = {'\0',};
+
+ snprintf(signal_to_emit, SIGNAL_SIZE, icon->signal_to_emit_prefix, icon->animation_state);
edje_object_signal_emit(img_edje, signal_to_emit,"prog");
int label_font_size = ICON_FONT_SIZE;
Eina_Bool buf_result = EINA_FALSE;
- retif(data == NULL || buf == NULL, NULL, "Invalid parameter!");
+ retvm_if(data == NULL || buf == NULL, NULL, "Invalid parameter!");
temp_buf = eina_strbuf_new();
if (font_name != NULL)
Eina_Bool icon_del(icon_s *icon)
{
Evas_Object *icon_obj;
- retif(icon == NULL, EINA_FALSE, "Invalid parameter!");
+ retvm_if(icon == NULL, EINA_FALSE, "Invalid parameter!");
_reset_on_timer_icon_animation(icon);
{
icon_s *wish_add_icon;
int area = icon->area;
- retif(icon == NULL, FAIL, "Invalid parameter!");
+ retvm_if(icon == NULL, FAIL, "Invalid parameter!");
wish_add_icon = list_try_to_find_icon_to_show(icon->area, icon->priority);
if (wish_add_icon == NULL)
static int _hide_others_in_view_list(icon_s *icon)
{
icon_s *wish_remove_icon = NULL;
- retif(icon == NULL, FAIL, "Invalid parameter!");
+ retvm_if(icon == NULL, FAIL, "Invalid parameter!");
if (INDICATOR_ICON_AREA_SYSTEM == icon->area || INDICATOR_ICON_AREA_NOTI == icon->area || INDICATOR_ICON_AREA_MINICTRL == icon->area)
{
wish_remove_icon = list_try_to_find_icon_to_remove(INDICATOR_ICON_AREA_NOTI,0);
box_unpack(wish_remove_icon);
- retif(wish_remove_icon == NULL, FAIL, "Unexpected Error : CAN_ADD_WITH_DEL_NOTI");
+ retvm_if(wish_remove_icon == NULL, FAIL, "Unexpected Error : CAN_ADD_WITH_DEL_NOTI");
break;
case CAN_ADD_WITH_DEL_SYSTEM:
wish_remove_icon = list_try_to_find_icon_to_remove(INDICATOR_ICON_AREA_SYSTEM,0);
box_unpack(wish_remove_icon);
- retif(wish_remove_icon == NULL, FAIL, "Unexpected Error : CAN_ADD_WITH_DEL_SYSTEM");
+ retvm_if(wish_remove_icon == NULL, FAIL, "Unexpected Error : CAN_ADD_WITH_DEL_SYSTEM");
break;
case CAN_ADD_WITH_DEL_MINICTRL:
wish_remove_icon = list_try_to_find_icon_to_remove(INDICATOR_ICON_AREA_MINICTRL,0);
box_unpack(wish_remove_icon);
- retif(wish_remove_icon == NULL, FAIL, "Unexpected Error : CAN_ADD_WITH_DEL_MINICTRL");
+ retvm_if(wish_remove_icon == NULL, FAIL, "Unexpected Error : CAN_ADD_WITH_DEL_MINICTRL");
break;
case CAN_ADD_WITHOUT_DEL:
break;
case CANNOT_ADD:
return FAIL;
- break;
}
return OK;
Evas_Object *img_eo;
char buf[PATH_MAX];
- retif(icon == NULL || icon->ad == NULL, FAIL, "Invalid parameter!");
+ retvm_if(icon == NULL || icon->ad == NULL, FAIL, "Invalid parameter!");
ad = icon->ad;
memset(buf, 0x00, sizeof(buf));
util_start_noti_ani(icon);
/* Check absolute path */
- retif(icon->img_obj.data == NULL, FAIL,"Invalid parameter!");
+ retvm_if(icon->img_obj.data == NULL, FAIL,"Invalid parameter!");
if (strncmp(icon->img_obj.data, "/", 1) != 0) {
snprintf(buf, sizeof(buf), "%s/%s", util_get_icon_dir(),icon->img_obj.data);
elm_image_file_set(img_eo, buf, NULL);
} else {
- retif(icon->img_obj.data[0] == '\0', FAIL,"Invalid parameter!");
+ retvm_if(icon->img_obj.data[0] == '\0', FAIL,"Invalid parameter!");
elm_image_file_set(img_eo, icon->img_obj.data, NULL);
}
{
int ret;
- retif(icon == NULL, , "Invalid parameter!");
+ retm_if(icon == NULL, "Invalid parameter!");
struct appdata *ad = (struct appdata *)icon->ad;
icon->wish_to_show = EINA_FALSE;
ret = box_unpack(icon);
if (ret == FAIL)
- SECURE_ERR("Failed to unpack %s!", icon->name);
+ _E("Failed to unpack!");
_show_others_in_same_priority(icon);
static int _cnt = -1;
char buf[1024];
- retif(data == NULL, , "Cannot get layout!");
+ retm_if(data == NULL, "Cannot get layout!");
if (_cnt != count) {
memset(buf, 0x00, sizeof(buf));
void icon_set_update_flag(unsigned int val)
{
- DBG("SET UPDATE FLAG %d",val);
+ _D("SET UPDATE FLAG %d",val);
update_icon_flag = val;
}
box_unpack(wish_remove_icon);
system_cnt = box_get_count(SYSTEM_LIST);
- SECURE_DBG("system remove %s %d",wish_remove_icon->name,system_cnt);
}
} else {
while (system_cnt < box_get_enabled_system_count()) {
box_pack_append(wish_add_icon);
system_cnt = box_get_count(SYSTEM_LIST);
- SECURE_DBG("system insert %s %d",wish_add_icon->name,system_cnt);
if(system_cnt == box_get_enabled_system_count()) {
- SECURE_DBG("quit adding %d %d",system_cnt,box_get_enabled_system_count());
break;
}
}
int minictrl_cnt = box_get_count(MINICTRL_LIST);
if (minictrl_cnt > box_get_minictrl_list()) {
- DBG("11 minictrl_cnt : %d // box_get_minictrl_list : %d", minictrl_cnt, box_get_minictrl_list());
+ _D("11 minictrl_cnt : %d // box_get_minictrl_list : %d", minictrl_cnt, box_get_minictrl_list());
while (minictrl_cnt > box_get_minictrl_list()) {
- DBG("22 minictrl_cnt : %d // box_get_minictrl_list : %d", minictrl_cnt, box_get_minictrl_list());
+ _D("22 minictrl_cnt : %d // box_get_minictrl_list : %d", minictrl_cnt, box_get_minictrl_list());
icon_s *wish_remove_icon = NULL;
wish_remove_icon = list_try_to_find_icon_to_remove(INDICATOR_ICON_AREA_MINICTRL,0);
if (wish_remove_icon == NULL) {
- DBG("icon_reset_list NULL!");
+ _D("icon_reset_list NULL!");
break;
}
box_unpack(wish_remove_icon);
minictrl_cnt = box_get_count(MINICTRL_LIST);
- SECURE_DBG("minictrl remove %s %d",wish_remove_icon->name,minictrl_cnt);
}
} else {
while (minictrl_cnt < box_get_minictrl_list()) {
box_pack_append(wish_add_icon);
minictrl_cnt = box_get_count(MINICTRL_LIST);
- SECURE_DBG("minictrl insert %s %d",wish_add_icon->name,minictrl_cnt);
if(minictrl_cnt==box_get_minictrl_list()) {
- SECURE_DBG("quit adding %d %d", minictrl_cnt, box_get_minictrl_list());
break;
}
}
box_unpack(wish_remove_icon);
noti_cnt = box_get_count(NOTI_LIST);
- SECURE_DBG("remove %s %d",wish_remove_icon->name,noti_cnt);
}
} else {
while (noti_cnt < box_get_enabled_noti_count()) {
box_pack_append(wish_add_icon);
noti_cnt = box_get_count(NOTI_LIST);
- SECURE_DBG("insert %s %d", wish_add_icon->name, noti_cnt);
if(noti_cnt==box_get_enabled_noti_count()) {
- SECURE_DBG("quit adding %d %d", noti_cnt, box_get_enabled_noti_count());
break;
}
}
void icon_handle_more_notify_icon(win_info* win)
{
- retif(win == NULL, , "Invalid parameter!");
- DBG("icon_handle_more_notify_icon called !!");
+ retm_if(win == NULL, "Invalid parameter!");
+ _D("icon_handle_more_notify_icon called !!");
/* int system_cnt = box_get_count(SYSTEM_LIST);
int minictrl_cnt = box_get_count(MINICTRL_LIST);
int noti_cnt = list_get_noti_count();
- DBG("System count : %d, Minictrl count : %d, Notification count : %d", system_cnt, minictrl_cnt, noti_cnt);
+ _D("System count : %d, Minictrl count : %d, Notification count : %d", system_cnt, minictrl_cnt, noti_cnt);
if(win->type == INDICATOR_WIN_PORT)
{
- DBG("PORT :: %d", (system_cnt + minictrl_cnt + noti_cnt));
+ _D("PORT :: %d", (system_cnt + minictrl_cnt + noti_cnt));
if((system_cnt + minictrl_cnt + noti_cnt) > MAX_NOTI_ICONS_PORT)
{
_show_hide_more_noti(win, true);
- DBG("PORT :: handle_more_notify_show");
+ _D("PORT :: handle_more_notify_show");
}
else
{*/
_show_hide_more_noti(win, false);
- DBG("PORT :: handle_more_notify_hide");
+ _D("PORT :: handle_more_notify_hide");
/*}
}*/
}
{
icon_s *icon = (icon_s *)input;
- retif(input == NULL,NULL, "Invalid parameter!");
+ retvm_if(input == NULL, NULL, "Invalid parameter!");
icon_s *obj = NULL;
obj = calloc(1, sizeof(icon_s));