Evas_Object *win, *box, *cs;
char buf[PATH_MAX];
- win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
+ win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_text_set(efl_added, "Bg EOAPI (Efl.Ui.Win)"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE),
efl_ui_win_alpha_set(efl_added, 1));
Evas_Object *rd, *rdg;
char buf[PATH_MAX];
- win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
+ win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_text_set(efl_added, "Bg EOAPI (Efl.Ui.Bg)"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE),
efl_ui_win_alpha_set(efl_added, EINA_FALSE));
Evas_Object *win, *bx, *o;
char buf[PATH_MAX];
- win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
+ win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_text_set(efl_added, "Efl.Ui.Box_Stack"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
current_date = time(NULL) + SEC_PER_YEAR;
localtime_r(¤t_date, &max_date);
- win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
+ win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_text_set(efl_added, "Efl Ui Calendar"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
Evas_Object *win, *img;
char buf[PATH_MAX];
- win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
+ win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_text_set(efl_added, "Efl Gfx Map"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
Evas_Object *win, *img;
char buf[PATH_MAX];
- win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
+ win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_text_set(efl_added, "Evas Map"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
Elm_Genlist_Item_Class *itc;
char buf[PATH_MAX];
- win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
+ win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_text_set(efl_added, "Evas masking demo"),
efl_ui_win_autodel_set(efl_added, 1));
Eo *win, *table, *o, *snap, *box;
const char *path;
- win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
+ win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_text_set(efl_added, "Evas Snapshot"),
efl_ui_win_autodel_set(efl_added, 1));
{
Eo *win, *box, *box2, *o, *text = NULL, *spinner, *code, *split, *flip, *tb;
- win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
+ win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_text_set(efl_added, "Gfx Filter Editor"),
efl_ui_win_autodel_set(efl_added, 1));
elm_config_accel_preference_set(accel);
eina_stringshare_del(accel);
#else
- win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
+ win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_name_set(efl_added, "glview"),
efl_text_set(efl_added, "GLView"),
efl_ui_win_accel_preference_set(efl_added, "gl:depth"));
{
Evas_Object *win, *bx, *nstate;
- win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
+ win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_text_set(efl_added, "N-state widget"),
elm_win_autodel_set(efl_added, EINA_TRUE));
content_class[17] = EFL_UI_SPIN_CLASS;
content_class[18] = EFL_UI_SPIN_BUTTON_CLASS;
- win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
+ win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_text_set(efl_added, "Widget Part Background"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
Test_Data *td = data;
pulse_stop(td, NULL);
- efl_unref(ev->object);
+ efl_del(ev->object);
free(td);
}
td = calloc(1, sizeof(*td));
- win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
+ win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_name_set(efl_added, "shadow"),
efl_text_set(efl_added, "Shadow effects"));
efl_event_callback_add(win, EFL_UI_WIN_EVENT_DELETE_REQUEST, _delete_cb, td);
Eo *win, *bx, *zoomable, *rect;
char buf[PATH_MAX];
- win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
+ win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC),
efl_text_set(efl_added, "Efl.Ui.Image_Zoomable animation"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
Eo *win, *bx, *btn;
char buf[PATH_MAX];
- win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
+ win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC),
efl_text_set(efl_added, "Efl.Ui.Button"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE)
{
Evas_Object *win, *bx;
- win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
+ win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC),
efl_text_set(efl_added, "Efl.Ui.Clock"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
{
Eo *win, *panes, *panes_h;
- win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
+ win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC),
efl_text_set(efl_added, "Efl.Ui.Panes"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE)
_win_del(void *data, const Efl_Event *ev EINA_UNUSED)
{
efl_ui_popup_data *p_data = data;
- efl_unref(p_data->panel_win);
+ efl_del(p_data->panel_win);
free(p_data);
printf("window is deleted\n");
}
_panel_win_del(void *data, const Efl_Event *ev EINA_UNUSED)
{
efl_ui_popup_data *p_data = data;
- efl_unref(p_data->win);
+ efl_del(p_data->win);
free(p_data);
printf("window is deleted\n");
}
{
efl_ui_popup_data *p_data = (efl_ui_popup_data*)calloc(1, sizeof(efl_ui_popup_data));
- Eo *win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
+ Eo *win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_text_set(efl_added, "Efl.Ui.Popup"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
efl_event_callback_add(win, EFL_UI_WIN_EVENT_DELETE_REQUEST, _win_del, p_data);
efl_gfx_size_set(win, EINA_SIZE2D(500, 500));
- Eo *panel_win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
+ Eo *panel_win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_text_set(efl_added, "Efl.Ui.Popup Panel"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
efl_event_callback_add(panel_win, EFL_UI_WIN_EVENT_DELETE_REQUEST, _panel_win_del, p_data);
{
char buf[PATH_MAX];
- Eo *win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
+ Eo *win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_text_set(efl_added, "Efl.Ui.Popup.Alert"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
void
test_ui_popup_alert_scroll(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
- Eo *win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
+ Eo *win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_text_set(efl_added, "Efl.Ui.Popup.Alert.Scroll"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
void
test_ui_popup_alert_text(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
- Eo *win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
+ Eo *win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_text_set(efl_added, "Efl.Ui.Popup.Alert.Text"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
char buf[PATH_MAX];
- Eo *win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
+ Eo *win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_text_set(efl_added, "Efl.Ui.Popup.Anchor"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
efl_event_callback_add(win, EFL_UI_WIN_EVENT_DELETE_REQUEST, _win_del, p_data);
pbdata *pd = d;
if (pd->timer) ecore_timer_del(pd->timer);
- efl_unref(pd->win);
+ efl_del(pd->win);
free(pd);
}
pd = (pbdata *)calloc(1, sizeof(pbdata));
- pd->win = win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
+ pd->win = win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC),
efl_text_set(efl_added, "Efl.Ui.Progressbar"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE),
Eo *win, *sc, *sc2, *sc3, *bx, *bx2, *gd, *gd2;
int i, j;
- win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
+ win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC),
efl_text_set(efl_added, "Efl Ui Scroller"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
double step;
char buf[PATH_MAX];
- win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
+ win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC),
efl_text_set(efl_added, "Efl.Ui.Slider"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
Eo *win, *bx, *hbx;
double step;
- win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
+ win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC),
efl_text_set(efl_added, "Efl.Ui.Slider_Interval"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
{
Eo *win, *bx, *sp;
- win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
+ win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC),
efl_text_set(efl_added, "Efl.Ui.Spin"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
{
Eo *win, *bx;
- win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
+ win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC),
efl_text_set(efl_added, "Efl.Ui.Spin_Button"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
Eo *win, *table, *bt, *rc, *en;
api_data *api = calloc(1, sizeof(*api));
- win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
+ win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_name_set(efl_added, "table"),
efl_text_set(efl_added, "Table"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE),
{
Efl_Canvas_Object *dia, *lb;
- dia = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
+ dia = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_type_set(efl_added, EFL_UI_WIN_DIALOG_BASIC),
efl_ui_win_name_set(efl_added, "window-dia-4"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE),
{
const char *indi_name;
- Eo *win = efl_add_ref(EFL_UI_WIN_SOCKET_CLASS, NULL,
+ Eo *win = efl_add(EFL_UI_WIN_SOCKET_CLASS, efl_main_loop_get(),
efl_text_set(efl_added, "indicator"),
efl_ui_win_autodel_set(efl_added, EINA_TRUE),
efl_ui_win_alpha_set(efl_added, EINA_TRUE));
indicator = _create_indicator();
// FIXME: Resizing window should no cause sizing issues!
- win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
+ win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_type_set(efl_added, EFL_UI_WIN_BASIC),
efl_text_set(efl_added, "Efl.Win.Indicator"),
efl_gfx_size_hint_max_set(efl_added, EINA_SIZE2D(300, -1)),
Evas_Object *bg, *bx, *bt, *lb, *win;
if (level >= 3)
- win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
+ win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_name_set(efl_added, "window-stack"),
efl_ui_win_type_set(efl_added, ELM_WIN_NAVIFRAME_BASIC),
efl_text_set(efl_added, title),
efl_ui_win_autodel_set(efl_added, EINA_TRUE));
else
- win = efl_add_ref(EFL_UI_WIN_CLASS, NULL,
+ win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
efl_ui_win_name_set(efl_added, "window-stack"),
efl_ui_win_type_set(efl_added, ELM_WIN_DIALOG_BASIC),
efl_text_set(efl_added, title),
ecore_app_args_set(argc, argv);
- out = efl_add_ref(ECORE_AUDIO_OBJ_OUT_PULSE_CLASS, NULL);
+ out = efl_add(ECORE_AUDIO_OBJ_OUT_PULSE_CLASS, efl_main_loop_get());
- in = efl_add_ref(ECORE_AUDIO_OBJ_IN_CLASS, NULL);
+ in = efl_add(ECORE_AUDIO_OBJ_IN_CLASS, efl_main_loop_get());
if (!in)
{
printf("error when creating ecore audio source.\n");
inputs = eina_list_remove(inputs, event->object);
ret = ecore_audio_obj_out_input_detach(out, event->object);
- efl_unref(event->object);
+ efl_del(event->object);
if (!ret)
printf("Could not detach input %s\n", name);
{
if (!strncmp(argv[i], "tone:", 5))
{
- in = efl_add_ref(ECORE_AUDIO_OBJ_IN_TONE_CLASS, NULL);
+ in = efl_add(ECORE_AUDIO_OBJ_IN_TONE_CLASS, efl_main_loop_get());
if (!in)
{
printf("error when creating ecore audio source.\n");
}
else
{
- in = efl_add_ref(ECORE_AUDIO_OBJ_IN_SNDFILE_CLASS, NULL);
+ in = efl_add(ECORE_AUDIO_OBJ_IN_SNDFILE_CLASS, efl_main_loop_get());
if (!in)
{
printf("error when creating ecore audio source.\n");
printf("Start: %s (%0.2fs)\n", name, length);
- out = efl_add_ref(ECORE_AUDIO_OBJ_OUT_PULSE_CLASS, NULL);
+ out = efl_add(ECORE_AUDIO_OBJ_OUT_PULSE_CLASS, efl_main_loop_get());
ret = ecore_audio_obj_out_input_attach(out, in);
if (!ret)
printf("Could not attach input %s\n", name);
printf("Done: %s\n", name);
ecore_audio_obj_in_output_get(event->object, &out);
- efl_unref(event->object);
- efl_unref(out);
+ efl_del(event->object);
+ efl_del(out);
ecore_main_loop_quit();
ecore_audio_init();
- in = efl_add_ref(ECORE_AUDIO_OBJ_IN_SNDFILE_CLASS, NULL);
+ in = efl_add(ECORE_AUDIO_OBJ_IN_SNDFILE_CLASS, efl_main_loop_get());
efl_name_set(in, basename(argv[1]));
ret = ecore_audio_obj_source_set(in, argv[1]);
if (!ret) {
printf("Could not set %s as input\n", argv[1]);
- efl_unref(in);
+ efl_del(in);
return 1;
}
efl_event_callback_add(in, ECORE_AUDIO_EV_IN_STOPPED, _play_finished, NULL);
- out = efl_add_ref(ECORE_AUDIO_OBJ_OUT_SNDFILE_CLASS, NULL);
+ out = efl_add(ECORE_AUDIO_OBJ_OUT_SNDFILE_CLASS, efl_main_loop_get());
ret = ecore_audio_obj_source_set(out, argv[2]);
if (!ret) {
printf("Could not set %s as output\n", argv[2]);
- efl_unref(in);
- efl_unref(out);
+ efl_del(in);
+ efl_del(out);
return 1;
}
ret = ecore_audio_obj_out_input_attach(out, in);
if (!ret) {
printf("Could not attach input\n");
- efl_unref(out);
- efl_unref(in);
+ efl_del(out);
+ efl_del(in);
return 1;
}
ctxt.enterer = ecore_idle_enterer_add(_enterer_cb, &ctxt);
ctxt.exiter = ecore_idle_exiter_add(_exiter_cb, &ctxt);
ctxt.idler = ecore_idler_add(_idler_cb, &ctxt);
-// ctxt.idler = efl_add_ref(ECORE_IDLER_CLASS, NULL, ecore_idler_constructor(efl_added, _idler_cb, &ctxt));
+// ctxt.idler = efl_add(ECORE_IDLER_CLASS, efl_main_loop_get(), ecore_idler_constructor(efl_added, _idler_cb, &ctxt));
ctxt.handler = ecore_event_handler_add(_event_type,
_event_handler_cb,
&ctxt);
poller2 = ecore_poller_add(ECORE_POLLER_CORE, 8, _poller_print_cb, str2);
poller3 = ecore_poller_add(ECORE_POLLER_CORE, 30, _poller_quit_cb, str3);
-// poller1 = efl_add_ref(ECORE_POLLER_CLASS, NULL, // ecore_poller_constructor(efl_added, ECORE_POLLER_CORE, 4, _poller_print_cb, str1));
-// poller2 = efl_add_ref(ECORE_POLLER_CLASS, NULL, // ecore_poller_constructor(efl_added, ECORE_POLLER_CORE, 8, _poller_print_cb, str2));
-// poller3 = efl_add_ref(ECORE_POLLER_CLASS, NULL, // ecore_poller_constructor(efl_added, ECORE_POLLER_CORE, 20, _poller_quit_cb, str3));
+// poller1 = efl_add(ECORE_POLLER_CLASS, efl_main_loop_get(), // ecore_poller_constructor(efl_added, ECORE_POLLER_CORE, 4, _poller_print_cb, str1));
+// poller2 = efl_add(ECORE_POLLER_CLASS, efl_main_loop_get(), // ecore_poller_constructor(efl_added, ECORE_POLLER_CORE, 8, _poller_print_cb, str2));
+// poller3 = efl_add(ECORE_POLLER_CLASS, efl_main_loop_get(), // ecore_poller_constructor(efl_added, ECORE_POLLER_CORE, 20, _poller_quit_cb, str3));
ecore_main_loop_begin();
// ecore_poller_interval_set(poller2, 16, NULL);
ecore_main_loop_begin();
-// efl_unref(poller1);
-// efl_unref(poller2);
-// efl_unref(poller3);
+// efl_del(poller1);
+// efl_del(poller2);
+// efl_del(poller3);
ecore_poller_del(poller1);
ecore_poller_del(poller2);
ecore_poller_del(poller3);
if (strcmp(input_fname, ":stdin:") == 0)
{
- input = efl_add_ref(EFL_IO_STDIN_CLASS, NULL,
+ input = efl_add(EFL_IO_STDIN_CLASS, ev->object,
efl_event_callback_array_add(efl_added, input_cbs(), NULL));
if (!input)
{
else
{
/* regular file, open with flags: read-only and close-on-exec */
- input = efl_add_ref(EFL_IO_FILE_CLASS, NULL,
+ input = efl_add(EFL_IO_FILE_CLASS, ev->object,
efl_file_set(efl_added, input_fname, NULL), /* mandatory */
efl_io_file_flags_set(efl_added, O_RDONLY), /* default */
efl_io_closer_close_on_exec_set(efl_added, EINA_TRUE), /* recommended, set *after* flags, or include O_CLOEXEC in flags -- be careful with _WIN32 that doesn't support it. */
if (strcmp(output_fname, ":stdout:") == 0)
{
- output = efl_add_ref(EFL_IO_STDOUT_CLASS, NULL,
+ output = efl_add(EFL_IO_STDOUT_CLASS, ev->object,
efl_event_callback_array_add(efl_added, output_cbs(), NULL) /* optional */
);
if (!output)
}
else if (strcmp(output_fname, ":stderr:") == 0)
{
- output = efl_add_ref(EFL_IO_STDERR_CLASS, NULL,
+ output = efl_add(EFL_IO_STDERR_CLASS, ev->object,
efl_event_callback_array_add(efl_added, output_cbs(), NULL) /* optional */
);
if (!output)
* When finished get the efl_io_buffer_slice_get(), see
* _copier_done().
*/
- output = efl_add_ref(EFL_IO_BUFFER_CLASS, NULL,
+ output = efl_add(EFL_IO_BUFFER_CLASS, ev->object,
efl_event_callback_array_add(efl_added, output_cbs(), NULL), /* optional */
efl_event_callback_array_add(efl_added, output_buffer_cbs(), NULL) /* optional */
);
/* regular file, open with flags: write-only, close-on-exec,
* create if did not exist and truncate if exist.
*/
- output = efl_add_ref(EFL_IO_FILE_CLASS, NULL,
+ output = efl_add(EFL_IO_FILE_CLASS, ev->object,
efl_file_set(efl_added, output_fname, NULL), /* mandatory */
efl_io_file_flags_set(efl_added, O_WRONLY | O_CREAT | O_TRUNC), /* mandatory for write */
efl_io_closer_close_on_exec_set(efl_added, EINA_TRUE), /* recommended, set *after* flags, or include O_CLOEXEC in flags -- be careful with _WIN32 that doesn't support it. */
* the line_delimiter, then wait for a reply from the server, then
* write another.
*/
- send_queue = efl_add_ref(EFL_IO_QUEUE_CLASS, NULL,
+ send_queue = efl_add(EFL_IO_QUEUE_CLASS, ev->object,
efl_name_set(efl_added, "send_queue"),
efl_io_queue_limit_set(efl_added, buffer_limit));
if (!send_queue)
* Our example's usage is to peek its data with slice_get() then
* clear().
*/
- receive_queue = efl_add_ref(EFL_IO_QUEUE_CLASS, NULL,
+ receive_queue = efl_add(EFL_IO_QUEUE_CLASS, ev->object,
efl_name_set(efl_added, "receive_queue"),
efl_io_queue_limit_set(efl_added, buffer_limit),
efl_event_callback_add(efl_added, EFL_IO_QUEUE_EVENT_SLICE_CHANGED, _receiver_data, NULL));
error_sender:
efl_del(dialer);
error_dialer:
- efl_unref(receive_queue);
+ efl_del(receive_queue);
error_receive_queue:
- efl_unref(send_queue);
+ efl_del(send_queue);
end:
EINA_LIST_FREE(commands, cmd)
{
return;
}
- send_buffer = efl_add_ref(EFL_IO_BUFFER_CLASS, NULL,
+ send_buffer = efl_add(EFL_IO_BUFFER_CLASS, efl_main_loop_get(),
efl_io_buffer_adopt_readonly(efl_added, hello_world_slice));
/* Unlimited buffer to store the received data. */
- recv_buffer = efl_add_ref(EFL_IO_BUFFER_CLASS, NULL);
+ recv_buffer = efl_add(EFL_IO_BUFFER_CLASS, efl_main_loop_get());
/* an input copier that takes data from send_buffer and pushes to client */
d->send_copier = efl_add(EFL_IO_COPIER_CLASS, efl_parent_get(client),
cipher = EFL_NET_SSL_CIPHER_TLSV1_2;
}
- ssl_ctx = efl_add_ref(EFL_NET_SSL_CONTEXT_CLASS, NULL,
+ ssl_ctx = efl_add(EFL_NET_SSL_CONTEXT_CLASS, efl_main_loop_get(),
efl_net_ssl_context_certificates_set(efl_added, eina_list_iterator_new(certificates)),
efl_net_ssl_context_private_keys_set(efl_added, eina_list_iterator_new(private_keys)),
efl_net_ssl_context_certificate_revocation_lists_set(efl_added, eina_list_iterator_new(crls)),
cipher = EFL_NET_SSL_CIPHER_TLSV1_2;
}
- ssl_ctx = efl_add_ref(EFL_NET_SSL_CONTEXT_CLASS, NULL,
+ ssl_ctx = efl_add(EFL_NET_SSL_CONTEXT_CLASS, ev->object,
efl_net_ssl_context_certificates_set(efl_added, eina_list_iterator_new(certificates)),
efl_net_ssl_context_private_keys_set(efl_added, eina_list_iterator_new(private_keys)),
efl_net_ssl_context_certificate_revocation_lists_set(efl_added, eina_list_iterator_new(crls)),
efl_del(dialer);
dialer = NULL;
- efl_unref(ssl_ctx);
+ efl_del(ssl_ctx);
ssl_ctx = NULL;
EINA_LIST_FREE(pending_send, str) free(str);
/* create a new SSL context with command line configurations.
* another option would be to use the default dialer context */
#ifndef USE_DEFAULT_CONTEXT
- ssl_ctx = efl_add_ref(EFL_NET_SSL_CONTEXT_CLASS, NULL,
+ ssl_ctx = efl_add(EFL_NET_SSL_CONTEXT_CLASS, ev->object,
efl_net_ssl_context_certificates_set(efl_added, eina_list_iterator_new(certificates)),
efl_net_ssl_context_private_keys_set(efl_added, eina_list_iterator_new(private_keys)),
efl_net_ssl_context_certificate_revocation_lists_set(efl_added, eina_list_iterator_new(crls)),
efl_io_closer_close(dialer); /* just del won't do as ssl has an extra ref */
efl_del(dialer);
no_ssl_ctx:
- efl_unref(ssl_ctx);
+ efl_del(ssl_ctx);
end:
EINA_LIST_FREE(pending_send, str) free(str);
efl_del(server);
server = NULL;
- efl_unref(ssl_ctx);
+ efl_del(ssl_ctx);
ssl_ctx = NULL;
EINA_LIST_FREE(certificates, str) free(str);
cipher = EFL_NET_SSL_CIPHER_TLSV1_2;
}
- ssl_ctx = efl_add_ref(EFL_NET_SSL_CONTEXT_CLASS, NULL,
+ ssl_ctx = efl_add(EFL_NET_SSL_CONTEXT_CLASS, ev->object,
efl_net_ssl_context_certificates_set(efl_added, eina_list_iterator_new(certificates)),
efl_net_ssl_context_private_keys_set(efl_added, eina_list_iterator_new(private_keys)),
efl_net_ssl_context_certificate_revocation_lists_set(efl_added, eina_list_iterator_new(crls)),
efl_del(server);
server = NULL;
end_ctx:
- efl_unref(ssl_ctx);
+ efl_del(ssl_ctx);
end:
EINA_LIST_FREE(certificates, str) free(str);
monitor_stuff(void *data)
{
const char *path = data;
- Eio_Sentry *sentry = efl_add_ref(EIO_SENTRY_CLASS, NULL);
+ Eio_Sentry *sentry = efl_add(EIO_SENTRY_CLASS, efl_main_loop_get());
efl_event_callback_add(sentry, EIO_SENTRY_EVENT_FILE_CREATED, (Efl_Event_Cb)&sentry_cb, NULL);
printf("Starting monitoring path %s\n", path);
unsigned int i, s;
char buf[256];
- model = efl_add_ref(EFL_MODEL_ITEM_CLASS, NULL);
+ model = efl_add(EFL_MODEL_ITEM_CLASS, efl_main_loop_get());
eina_value_setup(&vtext, EINA_VALUE_TYPE_STRING);
for (i = 0; i < (NUM_ITEMS); i++)
if (argv[1] != NULL) dirname = argv[1];
else dirname = EFL_MODEL_TEST_FILENAME_PATH;
- model = efl_add_ref(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_added, dirname));
+ model = efl_add(EIO_MODEL_CLASS, efl_main_loop_get(), eio_model_path_set(efl_added, dirname));
factory = efl_add(EFL_UI_LAYOUT_FACTORY_CLASS, win);
efl_ui_model_connect(factory, "elm.text", "filename");
efl_ui_layout_factory_theme_config(factory, "list", "item", "default");
Efl_Model_Item *model, *child;
unsigned int i, len;
- model = efl_add_ref(EFL_MODEL_ITEM_CLASS, NULL);
+ model = efl_add(EFL_MODEL_ITEM_CLASS, efl_main_loop_get());
eina_value_setup(&vtext, EINA_VALUE_TYPE_STRING);
eina_value_setup(&value, EINA_VALUE_TYPE_UCHAR);
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
elm_app_info_set(efl_main, "elementary", "images/plant_01.jpg");
- win = efl_add_ref(EFL_UI_WIN_CLASS, NULL, "TEST", ELM_WIN_BASIC,
- efl_ui_win_autodel_set(efl_added, EINA_TRUE));
+ win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(), "TEST", ELM_WIN_BASIC,
+ efl_ui_win_autodel_set(efl_added, EINA_TRUE));
efl_gfx_size_set(win, EINA_SIZE2D(300, 400));
scroller = efl_add(EFL_UI_SCROLLER_CLASS, win);
Eina_Value* value = info->value;
eina_value_get(value, &path);
- model = efl_add_ref(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_added, path));
+ model = efl_add(EIO_MODEL_CLASS, efl_main_loop_get(), eio_model_path_set(efl_added, path));
elm_view_list_model_set(priv->fileview, model);
}
else dirname = EFL_MODEL_TEST_FILENAME_PATH;
//treemodel
- priv.treemodel = efl_add_ref(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_added, dirname));
+ priv.treemodel = efl_add(EIO_MODEL_CLASS, efl_main_loop_get(), eio_model_path_set(efl_added, dirname));
eio_model_children_filter_set(priv.treemodel, _filter_cb, NULL);
//treeview
genlist = elm_genlist_add(win);
- priv.treeview = efl_add_ref(ELM_VIEW_LIST_CLASS, NULL, elm_view_list_genlist_set(efl_added, genlist, ELM_GENLIST_ITEM_TREE, NULL));
+ priv.treeview = efl_add(ELM_VIEW_LIST_CLASS, efl_main_loop_get(), elm_view_list_genlist_set(efl_added, genlist, ELM_GENLIST_ITEM_TREE, NULL));
elm_view_list_property_connect(priv.treeview, "filename", "elm.text");
elm_view_list_property_connect(priv.treeview, "icon", "elm.swallow.icon");
elm_view_list_model_set(priv.treeview, priv.treemodel);
//listview
genlist = elm_genlist_add(win);
- priv.fileview = efl_add_ref(ELM_VIEW_LIST_CLASS, NULL, elm_view_list_genlist_set(efl_added, genlist, ELM_GENLIST_ITEM_NONE, "double_label"));
+ priv.fileview = efl_add(ELM_VIEW_LIST_CLASS, efl_main_loop_get(), elm_view_list_genlist_set(efl_added, genlist, ELM_GENLIST_ITEM_NONE, "double_label"));
elm_view_list_property_connect(priv.fileview, "filename", "elm.text");
elm_view_list_property_connect(priv.fileview, "mime_type", "elm.text.sub");
bxr = elm_box_add(win);
_widget_init(bxr);
elm_object_part_content_set(vpanes, "right", bxr);
- priv.formview = efl_add_ref(ELM_VIEW_FORM_CLASS, NULL);
+ priv.formview = efl_add(ELM_VIEW_FORM_CLASS, efl_main_loop_get());
/*Label widget */
elm_view_form_widget_add(priv.formview, "filename", _label_init(win, bxr, "File Name"));
evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_show(genlist);
- priv.filemodel = efl_add_ref(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_added, dirname));
- priv.fileview = efl_add_ref(ELM_VIEW_LIST_CLASS, NULL, elm_view_list_genlist_set(efl_added, genlist, ELM_GENLIST_ITEM_TREE, "double_label"));
+ priv.filemodel = efl_add(EIO_MODEL_CLASS, efl_main_loop_get(), eio_model_path_set(efl_added, dirname));
+ priv.fileview = efl_add(ELM_VIEW_LIST_CLASS, efl_main_loop_get(), elm_view_list_genlist_set(efl_added, genlist, ELM_GENLIST_ITEM_TREE, "double_label"));
elm_view_list_model_set(priv.fileview, priv.filemodel);
evas_object_event_callback_add(win, EVAS_CALLBACK_DEL, _cleanup_cb, &priv);
if (argv[1] != NULL) dirname = argv[1];
else dirname = EFL_MODEL_TEST_FILENAME_PATH;
- priv->model = efl_add_ref(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_added, dirname));
+ priv->model = efl_add(EIO_MODEL_CLASS, efl_main_loop_get(), eio_model_path_set(efl_added, dirname));
genlist = elm_genlist_add(win);
- priv->fileview = efl_add_ref(ELM_VIEW_LIST_CLASS, NULL, elm_view_list_genlist_set(efl_added, genlist, ELM_GENLIST_ITEM_NONE, NULL));
+ priv->fileview = efl_add(ELM_VIEW_LIST_CLASS, efl_main_loop_get(), elm_view_list_genlist_set(efl_added, genlist, ELM_GENLIST_ITEM_NONE, NULL));
elm_view_list_property_connect(priv->fileview, "filename", "elm.text");
elm_view_list_model_set(priv->fileview, priv->model);
_widget_init(genlist);
if (!server) return NULL;
- ece_obj = efl_add_ref(ECORE_CON_EET_SERVER_OBJ_CLASS, NULL, ecore_con_eet_base_server_set(efl_added, server));
+ ece_obj = efl_add(ECORE_CON_EET_SERVER_OBJ_CLASS, efl_main_loop_get(), ecore_con_eet_base_server_set(efl_added, server));
return ece_obj;
}
if (!server) return NULL;
- ece_obj = efl_add_ref(ECORE_CON_EET_CLIENT_OBJ_CLASS, NULL, ecore_con_eet_base_server_set(efl_added, server));
+ ece_obj = efl_add(ECORE_CON_EET_CLIENT_OBJ_CLASS, efl_main_loop_get(), ecore_con_eet_base_server_set(efl_added, server));
return ece_obj;
}
EAPI void
ecore_con_eet_server_free(Ecore_Con_Eet *server)
{
- efl_unref(server);
+ efl_del(server);
}
EAPI void
/* legacy compatibility: server never verified peer, only dialer did */
- return efl_add_ref(EFL_NET_SSL_CONTEXT_CLASS, NULL,
+ return efl_add(EFL_NET_SSL_CONTEXT_CLASS, efl_main_loop_get(),
efl_net_ssl_context_certificates_set(efl_added, eina_list_iterator_new(svr->ssl.certs)),
efl_net_ssl_context_private_keys_set(efl_added, eina_list_iterator_new(svr->ssl.privkeys)),
efl_net_ssl_context_certificate_revocation_lists_set(efl_added, eina_list_iterator_new(svr->ssl.crls)),
error_server:
efl_del(inner_server);
error_inner_server:
- efl_unref(ssl_ctx);
+ efl_del(ssl_ctx);
error_ssl_ctx:
if (_ecore_con_post_event_server_error(svr, "Couldn't finish SSL setup"))
_ecore_con_post_event_server_del(svr);
if (svr->ssl.verify)
verify_mode = EFL_NET_SSL_VERIFY_MODE_REQUIRED;
- ssl_ctx = efl_add_ref(EFL_NET_SSL_CONTEXT_CLASS, NULL,
+ ssl_ctx = efl_add(EFL_NET_SSL_CONTEXT_CLASS, efl_main_loop_get(),
efl_net_ssl_context_certificates_set(efl_added, eina_list_iterator_new(svr->ssl.certs)),
efl_net_ssl_context_private_keys_set(efl_added, eina_list_iterator_new(svr->ssl.privkeys)),
efl_net_ssl_context_certificate_revocation_lists_set(efl_added, eina_list_iterator_new(svr->ssl.crls)),
error_dialer:
efl_del(inner_dialer);
error_inner_dialer:
- efl_unref(ssl_ctx);
+ efl_del(ssl_ctx);
error_ssl_ctx:
if (_ecore_con_post_event_server_error(svr, "Couldn't finish SSL setup"))
_ecore_con_post_event_server_del(svr);
if (svr->ssl.verify)
verify_mode = EFL_NET_SSL_VERIFY_MODE_REQUIRED;
- ssl_ctx = efl_add_ref(EFL_NET_SSL_CONTEXT_CLASS, NULL,
+ ssl_ctx = efl_add(EFL_NET_SSL_CONTEXT_CLASS, efl_main_loop_get(),
efl_net_ssl_context_certificates_set(efl_added, eina_list_iterator_new(svr->ssl.certs)),
efl_net_ssl_context_private_keys_set(efl_added, eina_list_iterator_new(svr->ssl.privkeys)),
efl_net_ssl_context_certificate_revocation_lists_set(efl_added, eina_list_iterator_new(svr->ssl.crls)),
efl_del(inner_dialer);
error_inner_dialer:
svr->dialer = tcp_dialer; /* put it back */
- efl_unref(ssl_ctx);
+ efl_del(ssl_ctx);
error_ssl_ctx:
if (_ecore_con_post_event_server_error(svr, "Couldn't finish SSL setup"))
_ecore_con_post_event_server_del(svr);
(svr->client_count >= (unsigned int)svr->client_limit))
return ECORE_CALLBACK_CANCEL;
- Ecore_Con_Client *cl_obj = efl_add_ref(EFL_NETWORK_CLIENT_CLASS, NULL);
+ Ecore_Con_Client *cl_obj = efl_add(EFL_NETWORK_CLIENT_CLASS, efl_main_loop_get());
Efl_Network_Client_Data *cl = efl_data_scope_get(obj, EFL_NETWORK_CLIENT_CLASS);
if (!cl)
{
close_event_read:
CloseHandle(svr->event_read);
free_cl:
- efl_unref(cl_obj);
+ efl_del(cl_obj);
return ECORE_CALLBACK_CANCEL;
}
efl_event_callback_legacy_call(ee->evas,
_event_description_get(ev->action), evt);
- efl_del(evt);
+ efl_unref(evt);
}
EAPI void
efl_event_callback_legacy_call(e, _event_description_get(ev->action), evt);
processed = ev->evas_done;
- efl_del(evt);
+ efl_unref(evt);
return processed;
}
efl_event_callback_legacy_call(e, _event_description_get(ev->action), evt);
processed = ev->evas_done;
- efl_del(evt);
+ efl_unref(evt);
return processed;
}
efl_event_callback_legacy_call(e, _event_description_get(ev->action), evt);
processed = ev->evas_done;
- efl_del(evt);
+ efl_unref(evt);
return processed;
}
efl_event_callback_legacy_call(e, _event_description_get(ev->action), evt);
processed = ev->evas_done;
- efl_del(evt);
+ efl_unref(evt);
return processed;
}
efl_event_callback_legacy_call(e, EFL_EVENT_KEY_UP, evt);
processed = ev->evas_done;
- efl_del(evt);
+ efl_unref(evt);
return processed;
}
efl_loop_unregister(efl_main_loop_get(), EFL_GFX_COLOR_CLASS_INTERFACE, _edje_global_obj);
efl_loop_unregister(efl_main_loop_get(), EFL_GFX_TEXT_CLASS_INTERFACE, _edje_global_obj);
efl_loop_unregister(efl_main_loop_get(), EFL_GFX_SIZE_CLASS_INTERFACE, _edje_global_obj);
- efl_unref(_edje_global_obj);
+ efl_del(_edje_global_obj);
_edje_global_obj = NULL;
}
shutdown_efreet:
efl_loop_unregister(efl_main_loop_get(), EFL_GFX_COLOR_CLASS_INTERFACE, _edje_global_obj);
efl_loop_unregister(efl_main_loop_get(), EFL_GFX_TEXT_CLASS_INTERFACE, _edje_global_obj);
efl_loop_unregister(efl_main_loop_get(), EFL_GFX_SIZE_CLASS_INTERFACE, _edje_global_obj);
- efl_unref(_edje_global_obj);
+ efl_del(_edje_global_obj);
_edje_global_obj = NULL;
eina_cow_del(_edje_calc_params_map_cow);
{
if (_edje_color_class_member)
{
- efl_unref(_edje_color_class_member);
+ efl_del(_edje_color_class_member);
_edje_color_class_member = NULL;
}
if (_edje_text_class_member)
{
- efl_unref(_edje_text_class_member);
+ efl_del(_edje_text_class_member);
_edje_text_class_member = NULL;
}
if (_edje_size_class_member)
{
- efl_unref(_edje_size_class_member);
+ efl_del(_edje_size_class_member);
_edje_size_class_member = NULL;
}
}
static void
_play_finished(void *data EINA_UNUSED, const Efl_Event *event)
{
- efl_unref(event->object);
+ efl_del(event->object);
}
static void
_out_fail(void *data EINA_UNUSED, const Efl_Event *event)
{
outfail = EINA_TRUE;
- efl_unref(event->object);
+ efl_del(event->object);
out = NULL;
}
eet_data->vio.tell = eet_snd_file_tell;
eet_data->offset = 0;
- in = efl_add_ref(ECORE_AUDIO_IN_SNDFILE_CLASS, NULL, efl_name_set(efl_added, snd_id_str), ecore_audio_obj_in_speed_set(efl_added, speed), ecore_audio_obj_vio_set(efl_added, &eet_data->vio, eet_data, _free), efl_event_callback_add(efl_added, ECORE_AUDIO_IN_EVENT_IN_STOPPED, _play_finished, NULL));
+ in = efl_add(ECORE_AUDIO_IN_SNDFILE_CLASS, efl_main_loop_get(), efl_name_set(efl_added, snd_id_str), ecore_audio_obj_in_speed_set(efl_added, speed), ecore_audio_obj_vio_set(efl_added, &eet_data->vio, eet_data, _free), efl_event_callback_add(efl_added, ECORE_AUDIO_IN_EVENT_IN_STOPPED, _play_finished, NULL));
if (!out)
{
# ifdef _WIN32
- out = efl_add_ref(ECORE_AUDIO_OUT_WASAPI_CLASS, NULL, efl_event_callback_add(efl_added, ECORE_AUDIO_OUT_WASAPI_EVENT_CONTEXT_FAIL, _out_fail, NULL));
+ out = efl_add(ECORE_AUDIO_OUT_WASAPI_CLASS, efl_main_loop_get(), efl_event_callback_add(efl_added, ECORE_AUDIO_OUT_WASAPI_EVENT_CONTEXT_FAIL, _out_fail, NULL));
# else
# ifdef HAVE_PULSE
- out = efl_add_ref(ECORE_AUDIO_OUT_PULSE_CLASS, NULL, efl_event_callback_add(efl_added, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, _out_fail, NULL));
+ out = efl_add(ECORE_AUDIO_OUT_PULSE_CLASS, efl_main_loop_get(), efl_event_callback_add(efl_added, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, _out_fail, NULL));
# endif
# endif
if (out) outs++;
# endif
# endif
}
- efl_unref(in);
+ efl_del(in);
return EINA_FALSE;
}
ret = ecore_audio_obj_out_input_attach(out, in);
complained = EINA_TRUE;
ERR("Could not attach input");
}
- efl_unref(in);
+ efl_del(in);
return EINA_FALSE;
}
}
tone = &ed->file->sound_dir->tones[i];
if (!strcmp(tone->name, tone_name))
{
- in = efl_add_ref(ECORE_AUDIO_IN_TONE_CLASS, NULL);
+ in = efl_add(ECORE_AUDIO_IN_TONE_CLASS, efl_main_loop_get());
efl_name_set(in, "tone");
efl_key_data_set(in, ECORE_AUDIO_ATTR_TONE_FREQ, &tone->value);
ecore_audio_obj_in_length_set(in, duration);
if (!out)
{
# ifdef _WIN32
- out = efl_add_ref(ECORE_AUDIO_OUT_WASAPI_CLASS, NULL, efl_event_callback_add(efl_added, ECORE_AUDIO_OUT_WASAPI_EVENT_CONTEXT_FAIL, _out_fail, NULL));
+ out = efl_add(ECORE_AUDIO_OUT_WASAPI_CLASS, efl_main_loop_get(), efl_event_callback_add(efl_added, ECORE_AUDIO_OUT_WASAPI_EVENT_CONTEXT_FAIL, _out_fail, NULL));
# else
# ifdef HAVE_PULSE
- out = efl_add_ref(ECORE_AUDIO_OUT_PULSE_CLASS, NULL, efl_event_callback_add(efl_added, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, _out_fail, NULL));
+ out = efl_add(ECORE_AUDIO_OUT_PULSE_CLASS, efl_main_loop_get(), efl_event_callback_add(efl_added, ECORE_AUDIO_OUT_PULSE_EVENT_CONTEXT_FAIL, _out_fail, NULL));
# endif
# endif
if (out) outs++;
if (!ret)
{
ERR("Could not attach input");
- efl_unref(in);
+ efl_del(in);
return EINA_FALSE;
}
}
if (out)
{
// XXX: this causes an abort inside of pa!!!!!
- //efl_unref(out);
+ //efl_del(out);
out = NULL;
outs = 0;
}
eina_stringshare_del(spath);
}
- cevt.child = efl_add_ref(EIO_MODEL_CLASS, priv->obj, eio_model_path_set(efl_added, evt->filename));
+ cevt.child = efl_add(EIO_MODEL_CLASS, priv->obj, eio_model_path_set(efl_added, evt->filename));
priv->children_list = eina_list_append(priv->children_list, cevt.child);
cevt.index = eina_list_count(priv->children_list);
}
else if (efl_isa(elem, EFL_GFX_INTERFACE))
{
- o = efl_add_ref(EFL_UI_FOCUS_COMPOSITION_ADAPTER_CLASS, NULL, efl_ui_focus_composition_adapter_canvas_object_set(efl_added, elem));
+ o = efl_add(EFL_UI_FOCUS_COMPOSITION_ADAPTER_CLASS, efl_provider_find(obj, EFL_LOOP_CLASS), efl_ui_focus_composition_adapter_canvas_object_set(efl_added, elem));
pd->adapters = eina_list_append(pd->adapters, o);
pd->register_target = eina_list_append(pd->register_target , o);
{
if (!pd->factory)
- pd->factory = efl_add_ref(EFL_UI_LAYOUT_FACTORY_CLASS, NULL);
+ pd->factory = efl_add(EFL_UI_LAYOUT_FACTORY_CLASS, efl_provider_find(obj, EFL_LOOP_CLASS));
if(!pd->relayout)
{
}
static void
-_home(void *data, const Efl_Event *event EINA_UNUSED)
+_home(void *data, const Efl_Event *event)
{
Evas_Object *fs = data;
ELM_FILESELECTOR_DATA_GET(fs, sd);
// FIXME: maybe use vpath
if (!sd->model || efl_isa(sd->model, EIO_MODEL_CLASS))
{
- Eio_Model *model = efl_add_ref(EIO_MODEL_CLASS, NULL,
+ Eio_Model *model = efl_add(EIO_MODEL_CLASS, efl_provider_find(event->object, EFL_LOOP_CLASS),
eio_model_path_set(efl_added, eina_environment_home_get()));
_populate(fs, model, NULL, NULL);
efl_unref(model);
else
model_cls = efl_class_get(sd->model);
- Efl_Model *model = efl_add_ref(model_cls, NULL);
+ Efl_Model *model = efl_add(model_cls, efl_provider_find(sd->obj, EFL_LOOP_CLASS));
_model_str_property_set(model, "path", path);
// Call Eo event with model
void
_elm_fileselector_path_set_internal(Evas_Object *obj, const char *_path)
{
- Eio_Model *model = efl_add_ref(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_added, _path));
+ Eio_Model *model = efl_add(EIO_MODEL_CLASS, efl_provider_find(obj, EFL_LOOP_CLASS), eio_model_path_set(efl_added, _path));
if (!model)
{
ERR("Efl.Model allocation error");
if (ecore_file_is_dir(path))
{
- model = efl_add_ref(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_added, path));
+ model = efl_add(EIO_MODEL_CLASS, efl_provider_find(obj, EFL_LOOP_CLASS), eio_model_path_set(efl_added, path));
if (!model)
{
ERR("Efl.Model allocation error");
goto clean_up;
}
- model = efl_add_ref(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_added, path));
+ model = efl_add(EIO_MODEL_CLASS, efl_provider_find(obj, EFL_LOOP_CLASS), eio_model_path_set(efl_added, path));
if (!model)
{
ERR("Efl.Model allocation error");
}
dir = ecore_file_dir_get(path);
- parent = efl_add_ref(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_added, dir));
+ parent = efl_add(EIO_MODEL_CLASS, efl_provider_find(obj, EFL_LOOP_CLASS), eio_model_path_set(efl_added, dir));
if (parent)
{
_schedule_populate(obj, sd, parent, model);
Efl_Future *future = NULL;
if (sd->fsd.model)
efl_unref(sd->fsd.model);
+ // XXX: the efl_ref here smells wrong. fsd.model is only unreffed ONCE so this obj leaks...
sd->fsd.model = efl_ref(model);
future = efl_model_property_get(model, "path");
efl_future_then(future, _replace_path_then, _replace_path_then_error, NULL, sd);
if (path) priv->fsd.path = eina_stringshare_add(path);
else priv->fsd.path = eina_stringshare_add("/");
- priv->fsd.model = efl_add_ref(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_added, priv->fsd.path));
+ priv->fsd.model = efl_add(EIO_MODEL_CLASS, efl_provider_find(obj, EFL_LOOP_CLASS), eio_model_path_set(efl_added, priv->fsd.path));
priv->fsd.expandable = _elm_config->fileselector_expand_enable;
priv->inwin_mode = _elm_config->inwin_dialogs_enable;
{
ELM_FILESELECTOR_BUTTON_DATA_GET_OR_RETURN(obj, sd);
- Efl_Model *model = efl_add_ref(EIO_MODEL_CLASS, NULL, eio_model_path_set(efl_added, path));
+ Efl_Model *model = efl_add(EIO_MODEL_CLASS, efl_provider_find(obj, EFL_LOOP_CLASS), eio_model_path_set(efl_added, path));
if (!model)
{
ERR("Efl.Model allocation error");
if (sd->fsd.model)
efl_unref(sd->fsd.model);
+ // XXX: the efl_ref here smells wrong. fsd.model is only unreffed ONCE so this obj leaks...
sd->fsd.model = efl_ref(model);
eina_stringshare_replace(&sd->fsd.path, path);
{
if (!_init_count)
{
- _instance = efl_add_ref(ELM_ATSPI_BRIDGE_CLASS, NULL);
+ _instance = efl_add(ELM_ATSPI_BRIDGE_CLASS, efl_main_loop_get());
_init_count = 1;
}
}
{
if (_init_count)
{
- efl_unref(_instance);
+ efl_del(_instance);
_init_count = 0;
}
if (manager)
{
elm_obj_sys_notify_servers_set(manager, ELM_SYS_NOTIFY_SERVER_NONE);
- efl_unref(manager);
+ efl_del(manager);
}
}
}
static void
-_hash_unref_cb(Eo *obj)
-{
- efl_unref(obj);
-}
-
-static void
_hash_free_cb(Eo *obj)
{
efl_del(obj);
pd->m_recognizers = eina_hash_pointer_new(EINA_FREE_CB(_hash_free_cb));
pd->m_gesture_contex = eina_hash_pointer_new(NULL);
- pd->m_object_events = eina_hash_pointer_new(EINA_FREE_CB(_hash_unref_cb));
+ pd->m_object_events = eina_hash_pointer_new(EINA_FREE_CB(_hash_free_cb));
pd->m_object_gestures = NULL;
pd->m_gestures_to_delete = NULL;
touch_event = eina_hash_find(pd->m_object_events, &target);
if (!touch_event)
{
- touch_event = efl_add_ref(EFL_CANVAS_GESTURE_TOUCH_CLASS, NULL);
+ touch_event = efl_add(EFL_CANVAS_GESTURE_TOUCH_CLASS, efl_provider_find(obj, EFL_LOOP_CLASS));
eina_hash_add(pd->m_object_events, &target, touch_event);
}
Eina_Bool ret = EINA_FALSE;
Eina_Bool pulse_context_failed = EINA_FALSE;
- in = efl_add_ref(ECORE_AUDIO_IN_SNDFILE_CLASS, NULL);
+ in = efl_add(ECORE_AUDIO_IN_SNDFILE_CLASS, efl_main_loop_get());
fail_if(!in);
efl_name_set(in, "sample.wav");
ret = ecore_audio_obj_source_set(in, TESTS_SRC_DIR"/sample.wav");
fail_if(!ret);
- out = efl_add_ref(ECORE_AUDIO_OUT_PULSE_CLASS, NULL);
+ out = efl_add(ECORE_AUDIO_OUT_PULSE_CLASS, efl_main_loop_get());
fail_if(!out);
ecore_timer_add(1.8, _seek_vol, in);
ecore_main_loop_begin();
fail_if(pulse_context_failed);
- efl_unref(out);
- efl_unref(in);
+ efl_del(out);
+ efl_del(in);
}
END_TEST
#endif
_idle_del(void *data)
{
Eo *in = data;
- efl_unref(in);
+ efl_del(in);
ecore_idler_add(_quit, NULL);
return EINA_FALSE;
int freq = 1000;
Eina_Bool ret = EINA_FALSE;
- in = efl_add_ref(ECORE_AUDIO_IN_TONE_CLASS, NULL);
+ in = efl_add(ECORE_AUDIO_IN_TONE_CLASS, efl_main_loop_get());
fail_if(!in);
efl_key_data_set(in, ECORE_AUDIO_ATTR_TONE_FREQ, &freq);
ecore_audio_obj_in_length_set(in, 2);
- out = efl_add_ref(ECORE_AUDIO_OUT_SNDFILE_CLASS, NULL);
+ out = efl_add(ECORE_AUDIO_OUT_SNDFILE_CLASS, efl_main_loop_get());
fail_if(!out);
ret = ecore_audio_obj_format_set(out, ECORE_AUDIO_FORMAT_OGG);
fail_if(!ret);
fail_if(!ret);
ecore_idler_add(_idle_del, in);
+ ecore_idler_add(_idle_del, out);
ecore_main_loop_begin();
Eina_Bool ret;
char *tmp;
- in = efl_add_ref(ECORE_AUDIO_IN_TONE_CLASS, NULL);
+ in = efl_add(ECORE_AUDIO_IN_TONE_CLASS, efl_main_loop_get());
fail_if(!in);
efl_name_set(in, "tone");
len = ecore_audio_obj_in_remaining_get(in);
fail_if(len != 1.0);
- out = efl_add_ref(ECORE_AUDIO_OUT_SNDFILE_CLASS, NULL);
+ out = efl_add(ECORE_AUDIO_OUT_SNDFILE_CLASS, efl_main_loop_get());
fail_if(!out);
efl_name_set(out, "tmp.wav");
ecore_main_loop_begin();
- efl_unref(in);
- efl_unref(out);
+ efl_del(in);
+ efl_del(out);
//TODO: Compare and fail
ecore_file_remove(TESTS_BUILD_DIR"/tmp.wav");
Ecore_Audio_Format fmt;
const char *src;
- in = efl_add_ref(ECORE_AUDIO_IN_SNDFILE_CLASS, NULL);
+ in = efl_add(ECORE_AUDIO_IN_SNDFILE_CLASS, efl_main_loop_get());
fail_if(!in);
fmt = ecore_audio_obj_format_get(in);
len = ecore_audio_obj_in_seek(in, -1.5, SEEK_END);
fail_if(fabs(rem - 1 - len) > 0.6);
- out = efl_add_ref(ECORE_AUDIO_OUT_SNDFILE_CLASS, NULL);
+ out = efl_add(ECORE_AUDIO_OUT_SNDFILE_CLASS, efl_main_loop_get());
fail_if(!out);
efl_name_set(out, "tmp.wav");
ecore_main_loop_begin();
- efl_unref(in);
- efl_unref(out);
+ efl_del(in);
+ efl_del(out);
//TODO: Compare and fail
ecore_file_remove(TESTS_BUILD_DIR"/tmp.wav");
Eina_List *in3;
Eina_Bool attached;
- Eo *in = efl_add_ref(ECORE_AUDIO_IN_CLASS, NULL);
- Eo *in2 = efl_add_ref(ECORE_AUDIO_IN_CLASS, NULL);
- Eo *out = efl_add_ref(ECORE_AUDIO_OUT_CLASS, NULL);
+ Eo *in = efl_add(ECORE_AUDIO_IN_CLASS, efl_main_loop_get());
+ Eo *in2 = efl_add(ECORE_AUDIO_IN_CLASS, efl_main_loop_get());
+ Eo *out = efl_add(ECORE_AUDIO_OUT_CLASS, efl_main_loop_get());
fail_if(!in);
fail_if(!in2);
fail_if(eina_list_count(in3) != 2);
fail_if(eina_list_data_get(in3) != in);
- efl_unref(in2);
+ efl_del(in2);
in3 = ecore_audio_obj_out_inputs_get(out);
fail_if(eina_list_count(in3) != 1);
fail_if(eina_list_data_get(in3) != in);
- efl_unref(out);
+ efl_del(out);
out2 = ecore_audio_obj_in_output_get(in);
fail_if(out2);
- efl_unref(in);
+ efl_del(in);
}
END_TEST
{
Eo *in, *out;
- in = efl_add_ref(ECORE_AUDIO_IN_CLASS, NULL);
+ in = efl_add(ECORE_AUDIO_IN_CLASS, efl_main_loop_get());
fail_if(!in);
- out = efl_add_ref(ECORE_AUDIO_OUT_CLASS, NULL);
+ out = efl_add(ECORE_AUDIO_OUT_CLASS, efl_main_loop_get());
fail_if(!out);
ecore_audio_obj_vio_set(in, &in_vio, NULL, NULL);
ecore_main_loop_begin();
- efl_unref(out);
- efl_unref(in);
+ efl_del(out);
+ efl_del(in);
}
END_TEST
Ecore_Audio_Vio vio;
Eina_Bool freed = EINA_FALSE;
- Eo *in = efl_add_ref(ECORE_AUDIO_IN_CLASS, NULL);
+ Eo *in = efl_add(ECORE_AUDIO_IN_CLASS, efl_main_loop_get());
fail_if(!in);
fail_if(buf[i] != 0x00);
}
- efl_unref(in);
+ efl_del(in);
}
END_TEST
double volume;
Eo *objs[2], *obj;
- objs[0] = efl_add_ref(ECORE_AUDIO_IN_CLASS, NULL);
+ objs[0] = efl_add(ECORE_AUDIO_IN_CLASS, efl_main_loop_get());
fail_if(!objs[0]);
- objs[1] = efl_add_ref(ECORE_AUDIO_OUT_CLASS, NULL);
+ objs[1] = efl_add(ECORE_AUDIO_OUT_CLASS, efl_main_loop_get());
fail_if(!objs[1]);
for (i=0; i<2; i++) {
volume = ecore_audio_obj_volume_get(obj);
fail_if(volume != 0.5);
- efl_unref(obj);
+ efl_del(obj);
}
}
fail_if(!ecore_init());
//Use a random object..
- obj = efl_add_ref(EFL_IO_BUFFER_CLASS, NULL);
+ obj = efl_add(EFL_IO_BUFFER_CLASS, efl_main_loop_get());
fail_if(!obj);
efl_key_data_set(obj, "free_called", &free_called);
f = eina_future_chain(_int_future_get(),
fail_if(!ecore_init());
//Use a random object..
- obj = efl_add_ref(EFL_IO_BUFFER_CLASS, NULL);
+ obj = efl_add(EFL_IO_BUFFER_CLASS, efl_main_loop_get());
fail_if(!obj);
efl_key_data_set(obj, "err_called", &err_called);
addr.sin_port = htons(12345);
addr.sin_addr.s_addr = htonl(0xabcdefafU);
- o = efl_add_ref(EFL_NET_IP_ADDRESS_CLASS, NULL,
+ o = efl_add(EFL_NET_IP_ADDRESS_CLASS, efl_main_loop_get(),
efl_net_ip_address_family_set(efl_added, AF_INET),
efl_net_ip_address_port_set(efl_added, ntohs(addr.sin_port)),
efl_net_ip_address_set(efl_added, slice));
_ipv4_check(o, &addr);
- efl_unref(o);
+ efl_del(o);
addr.sin_port = htons(8081);
addr.sin_addr.s_addr = htonl(0);
- o = efl_add_ref(EFL_NET_IP_ADDRESS_CLASS, NULL,
+ o = efl_add(EFL_NET_IP_ADDRESS_CLASS, efl_main_loop_get(),
efl_net_ip_address_family_set(efl_added, AF_INET),
efl_net_ip_address_port_set(efl_added, ntohs(addr.sin_port)),
efl_net_ip_address_set(efl_added, slice));
_ipv4_check(o, &addr);
- efl_unref(o);
+ efl_del(o);
addr.sin_port = htons(0);
addr.sin_addr.s_addr = htonl(0x12345678);
- o = efl_add_ref(EFL_NET_IP_ADDRESS_CLASS, NULL,
+ o = efl_add(EFL_NET_IP_ADDRESS_CLASS, efl_main_loop_get(),
efl_net_ip_address_family_set(efl_added, AF_INET),
efl_net_ip_address_set(efl_added, slice));
_ipv4_check(o, &addr);
- efl_unref(o);
+ efl_del(o);
ecore_con_shutdown();
}
ecore_con_init();
TRAP_ERRORS_BEGIN(eina_safety, ERR, "safety check failed: pd->addr.sa_family == 0 is true");
- o = efl_add_ref(EFL_NET_IP_ADDRESS_CLASS, NULL);
+ o = efl_add(EFL_NET_IP_ADDRESS_CLASS, efl_main_loop_get());
ck_assert_ptr_eq(o, NULL);
TRAP_ERRORS_FINISH(1);
TRAP_ERRORS_BEGIN(eina_safety, ERR, NULL);
- o = efl_add_ref(EFL_NET_IP_ADDRESS_CLASS, NULL,
+ o = efl_add(EFL_NET_IP_ADDRESS_CLASS, efl_main_loop_get(),
efl_net_ip_address_family_set(efl_added, 12345));
ck_assert_ptr_eq(o, NULL);
TRAP_ERRORS_FINISH(2);
TRAP_ERRORS_BEGIN(eina_safety, ERR, "safety check failed: pd->addr.sa_family == 0 is true");
- o = efl_add_ref(EFL_NET_IP_ADDRESS_CLASS, NULL,
+ o = efl_add(EFL_NET_IP_ADDRESS_CLASS, efl_main_loop_get(),
efl_net_ip_address_set(efl_added, wrong_slice));
ck_assert_ptr_eq(o, NULL);
TRAP_ERRORS_FINISH(2);
TRAP_ERRORS_BEGIN(eina_safety, ERR, "safety check failed: pd->addr.sa_family == 0 is true");
- o = efl_add_ref(EFL_NET_IP_ADDRESS_CLASS, NULL,
+ o = efl_add(EFL_NET_IP_ADDRESS_CLASS, efl_main_loop_get(),
efl_net_ip_address_port_set(efl_added, 1234));
ck_assert_ptr_eq(o, NULL);
TRAP_ERRORS_FINISH(2);
TRAP_ERRORS_BEGIN(eina_safety, ERR, "safety check failed: pd->addr.sa_family == 0 is true");
- o = efl_add_ref(EFL_NET_IP_ADDRESS_CLASS, NULL,
+ o = efl_add(EFL_NET_IP_ADDRESS_CLASS, efl_main_loop_get(),
efl_net_ip_address_port_set(efl_added, 1234),
efl_net_ip_address_set(efl_added, wrong_slice));
ck_assert_ptr_eq(o, NULL);
TRAP_ERRORS_FINISH(3);
TRAP_ERRORS_BEGIN(eina_safety, ERR, "safety check failed: rw_slice.len != address.len is true");
- o = efl_add_ref(EFL_NET_IP_ADDRESS_CLASS, NULL,
+ o = efl_add(EFL_NET_IP_ADDRESS_CLASS, efl_main_loop_get(),
efl_net_ip_address_family_set(efl_added, AF_INET),
efl_net_ip_address_set(efl_added, wrong_slice));
_ipv4_check(o, &addr);
- efl_unref(o);
+ efl_del(o);
TRAP_ERRORS_FINISH(1);
addr.sin_port = htons(12345);
addr.sin_addr.s_addr = htonl(0xabcdefafU);
- o = efl_add_ref(EFL_NET_IP_ADDRESS_CLASS, NULL,
+ o = efl_add(EFL_NET_IP_ADDRESS_CLASS, efl_main_loop_get(),
efl_net_ip_address_family_set(efl_added, AF_INET),
efl_net_ip_address_port_set(efl_added, ntohs(addr.sin_port)),
efl_net_ip_address_set(efl_added, slice));
efl_net_ip_address_set(o, slice);
TRAP_ERRORS_FINISH(1);
- efl_unref(o);
+ efl_del(o);
ecore_con_shutdown();
}
addr.sin6_port = htons(12345);
_ipv6_set(&addr, 1, 2, 3, 4, 5, 6, 7, 8);
- o = efl_add_ref(EFL_NET_IP_ADDRESS_CLASS, NULL,
+ o = efl_add(EFL_NET_IP_ADDRESS_CLASS, efl_main_loop_get(),
efl_net_ip_address_family_set(efl_added, AF_INET6),
efl_net_ip_address_port_set(efl_added, ntohs(addr.sin6_port)),
efl_net_ip_address_set(efl_added, slice));
_ipv6_check(o, &addr);
- efl_unref(o);
+ efl_del(o);
addr.sin6_port = htons(8081);
_ipv6_set(&addr, 0, 0, 0, 0, 0, 0, 0, 0);
- o = efl_add_ref(EFL_NET_IP_ADDRESS_CLASS, NULL,
+ o = efl_add(EFL_NET_IP_ADDRESS_CLASS, efl_main_loop_get(),
efl_net_ip_address_family_set(efl_added, AF_INET6),
efl_net_ip_address_port_set(efl_added, ntohs(addr.sin6_port)),
efl_net_ip_address_set(efl_added, slice));
_ipv6_check(o, &addr);
- efl_unref(o);
+ efl_del(o);
ecore_con_shutdown();
}
/* generic errors checked at ecore_test_efl_net_ip_address_ipv4_manual_fail */
TRAP_ERRORS_BEGIN(eina_safety, ERR, "safety check failed: rw_slice.len != address.len is true");
- o = efl_add_ref(EFL_NET_IP_ADDRESS_CLASS, NULL,
+ o = efl_add(EFL_NET_IP_ADDRESS_CLASS, efl_main_loop_get(),
efl_net_ip_address_family_set(efl_added, AF_INET6),
efl_net_ip_address_set(efl_added, wrong_slice));
_ipv6_check(o, &addr);
- efl_unref(o);
+ efl_del(o);
TRAP_ERRORS_FINISH(1);
addr.sin6_port = htons(12345);
_ipv6_set(&addr, 0, 0, 0, 0, 0, 0, 0, 1);
- o = efl_add_ref(EFL_NET_IP_ADDRESS_CLASS, NULL,
+ o = efl_add(EFL_NET_IP_ADDRESS_CLASS, efl_main_loop_get(),
efl_net_ip_address_family_set(efl_added, AF_INET6),
efl_net_ip_address_port_set(efl_added, ntohs(addr.sin6_port)),
efl_net_ip_address_set(efl_added, slice));
efl_net_ip_address_set(o, slice);
TRAP_ERRORS_FINISH(1);
- efl_unref(o);
+ efl_del(o);
ecore_con_shutdown();
}
eina_value_setup(&v, EINA_VALUE_TYPE_INT);
- base_model = efl_add_ref(EFL_MODEL_ITEM_CLASS, NULL);
+ base_model = efl_add(EFL_MODEL_ITEM_CLASS, efl_main_loop_get());
ck_assert(!!base_model);
for (i = 0; i < child_number; ++i)
efl_model_property_set(child, "test_p_int", &v);
}
- model = efl_add_ref(EFL_MODEL_COMPOSITE_BOOLEAN_CLASS, NULL,
+ model = efl_add(EFL_MODEL_COMPOSITE_BOOLEAN_CLASS, efl_main_loop_get(),
efl_ui_view_model_set(efl_added, base_model),
efl_model_composite_boolean_property_add(efl_added, "test_p_true", EINA_TRUE),
efl_model_composite_boolean_property_add(efl_added, "test_p_false", EINA_FALSE));
eina_value_setup(&v, EINA_VALUE_TYPE_INT);
- base_model = efl_add_ref(EFL_MODEL_ITEM_CLASS, NULL);
+ base_model = efl_add(EFL_MODEL_ITEM_CLASS, efl_main_loop_get());
ck_assert(!!base_model);
for (i = 0; i < child_number; ++i)
efl_model_property_set(child, "test_p_int", &v);
}
- model = efl_add_ref(EFL_MODEL_COMPOSITE_SELECTION_CLASS, NULL,
+ model = efl_add(EFL_MODEL_COMPOSITE_SELECTION_CLASS, efl_main_loop_get(),
efl_ui_view_model_set(efl_added, base_model));
ck_assert(!!model);
efl_model_composite_selection_select(model, 2);
cmp_str[i] = strdup(base_str[i]);
}
- model = efl_add_ref(EFL_MODEL_CONTAINER_CLASS, NULL);
+ model = efl_add(EFL_MODEL_CONTAINER_CLASS, efl_main_loop_get());
efl_model_container_child_property_add(model, "test_p_int", EINA_VALUE_TYPE_INT,
eina_carray_iterator_new((void**)cmp_int));
static
Test_Numberwrapper *_new_obj(int n)
{
- return efl_add_ref(TEST_NUMBERWRAPPER_CLASS, NULL, test_numberwrapper_number_set(efl_added, n));
+ return efl_add(TEST_NUMBERWRAPPER_CLASS, efl_main_loop_get(), test_numberwrapper_number_set(efl_added, n));
}
static
usleep(500000);
//monitor directory
- sentry = efl_add_ref(EIO_SENTRY_CLASS, NULL);
+ sentry = efl_add(EIO_SENTRY_CLASS, efl_main_loop_get());
fail_if(!eio_sentry_add(sentry, filename));
usleep(500000);
usleep(500000);
//monitor directory
- sentry = efl_add_ref(EIO_SENTRY_CLASS, NULL);
+ sentry = efl_add(EIO_SENTRY_CLASS, efl_main_loop_get());
fail_if(!eio_sentry_add(sentry, filename));
eio_sentry_remove(sentry, filename);
//sleep to avoid catching event generated by above manipulations
usleep(500000);
- sentry = efl_add_ref(EIO_SENTRY_CLASS, NULL);
+ sentry = efl_add(EIO_SENTRY_CLASS, efl_main_loop_get());
//monitor directory
fail_if(!eio_sentry_add(sentry, filename1));
Eo* sentry;
filename = eina_stringshare_printf("%s/eio_test_sentry_directory_file_created_notify", dirname);
- sentry = efl_add_ref(EIO_SENTRY_CLASS, NULL);
+ sentry = efl_add(EIO_SENTRY_CLASS, efl_main_loop_get());
//sleep to avoid catching event generated by above manipulations
usleep(500000);
filename = eina_stringshare_printf("%s/eio_test_sentry_directory_file_deleted_notify", dirname);
_create_file((void*)filename);
- sentry = efl_add_ref(EIO_SENTRY_CLASS, NULL);
+ sentry = efl_add(EIO_SENTRY_CLASS, efl_main_loop_get());
//sleep to avoid catching event generated by above manipulations
usleep(500000);
filename = eina_stringshare_printf("%s/eio_test_sentry_directory_file_modified_notify", dirname);
_create_file((void*)filename);
- sentry = efl_add_ref(EIO_SENTRY_CLASS, NULL);
+ sentry = efl_add(EIO_SENTRY_CLASS, efl_main_loop_get());
//sleep to avoid catching event generated by above manipulations
usleep(500000);
filename = eina_stringshare_printf("%s/eio_test_sentry_directory_file_closed_notify", dirname);
_create_file((void*)filename);
- sentry = efl_add_ref(EIO_SENTRY_CLASS, NULL);
+ sentry = efl_add(EIO_SENTRY_CLASS, efl_main_loop_get());
//sleep to avoid catching event generated by above manipulations
usleep(500000);
Eo *sentry;
filename = eina_stringshare_printf("%s/eio_test_sentry_directory_directory_created_notify", dirname);
- sentry = efl_add_ref(EIO_SENTRY_CLASS, NULL);
+ sentry = efl_add(EIO_SENTRY_CLASS, efl_main_loop_get());
//sleep to avoid catching event generated by above manipulations
usleep(500000);
filename = eina_stringshare_printf("%s/eio_test_sentry_directory_directory_deleted_notify", dirname);
_create_directory((void*)filename);
- sentry = efl_add_ref(EIO_SENTRY_CLASS, NULL);
+ sentry = efl_add(EIO_SENTRY_CLASS, efl_main_loop_get());
//sleep to avoid catching event generated by above manipulations
usleep(500000);
filename = eina_stringshare_printf("%s/eio_test_sentry_directory_directory_modified_notify", dirname);
_create_directory((void*)filename);
- sentry = efl_add_ref(EIO_SENTRY_CLASS, NULL);
+ sentry = efl_add(EIO_SENTRY_CLASS, efl_main_loop_get());
//sleep to avoid catching event generated by above manipulations
usleep(500000);
START_TEST(eio_test_sentry_directory_directory_self_deleted_notify)
{
Eina_Tmpstr *dirname = _common_init();
- Eo *sentry = efl_add_ref(EIO_SENTRY_CLASS, NULL);
+ Eo *sentry = efl_add(EIO_SENTRY_CLASS, efl_main_loop_get());
//sleep to avoid catching event generated by above manipulations
usleep(500000);
filename = eina_stringshare_printf("%s/filecreated", dirname);
_create_file((void*)filename);
- sentry = efl_add_ref(EIO_SENTRY_CLASS, NULL);
+ sentry = efl_add(EIO_SENTRY_CLASS, efl_main_loop_get());
//sleep to avoid catching event generated by above manipulations
usleep(500000);
filename = eina_stringshare_printf("%s/eio_test_sentry_file_file_attrib_modified_notify", dirname);
_create_file((void*)filename);
- sentry = efl_add_ref(EIO_SENTRY_CLASS, NULL);
+ sentry = efl_add(EIO_SENTRY_CLASS, efl_main_loop_get());
//sleep to avoid catching event generated by above manipulations
usleep(500000);
filename = eina_stringshare_printf("%s/eio_test_sentry_file_file_closed_notify", dirname);
_create_file((void*)filename);
- sentry = efl_add_ref(EIO_SENTRY_CLASS, NULL);
+ sentry = efl_add(EIO_SENTRY_CLASS, efl_main_loop_get());
//sleep to avoid catching event generated by above manipulations
usleep(500000);
filename = eina_stringshare_printf("%s/eio_test_sentry_file_file_self_deleted_notify", dirname);
_create_file((void*)filename);
- sentry = efl_add_ref(EIO_SENTRY_CLASS, NULL);
+ sentry = efl_add(EIO_SENTRY_CLASS, efl_main_loop_get());
//sleep to avoid catching event generated by above manipulations
usleep(500000);
eina_file_mkdtemp("checkFileCreationXXXXXX", &dirname2);
filename = eina_stringshare_printf("%s/eio_test_sentry_two_monitors_one_event", dirname);
- sentry = efl_add_ref(EIO_SENTRY_CLASS, NULL);
+ sentry = efl_add(EIO_SENTRY_CLASS, efl_main_loop_get());
//sleep to avoid catching event generated by above manipulations
usleep(500000);
eina_file_mkdtemp("checkFileCreationXXXXXX", &dirname2);
filename = eina_stringshare_printf("%s/eio_test_sentry_two_monitors_one_removed", dirname);
- sentry = efl_add_ref(EIO_SENTRY_CLASS, NULL);
+ sentry = efl_add(EIO_SENTRY_CLASS, efl_main_loop_get());
//sleep to avoid catching event generated by above manipulations
usleep(500000);
eina_file_mkdtemp("checkFileCreationXXXXXX", &dirname2);
filename = eina_stringshare_printf("%s/eio_test_sentry_two_monitors_one_removed", dirname);
- sentry = efl_add_ref(EIO_SENTRY_CLASS, NULL);
+ sentry = efl_add(EIO_SENTRY_CLASS, efl_main_loop_get());
//sleep to avoid catching event generated by above manipulations
usleep(500000);
filename2 = eina_stringshare_printf("%s/eio_test_sentry_two_files_in_same_directory_2", dirname);
_create_file((void*)filename);
_create_file((void*)filename2);
- sentry = efl_add_ref(EIO_SENTRY_CLASS, NULL);
+ sentry = efl_add(EIO_SENTRY_CLASS, efl_main_loop_get());
//sleep to avoid catching event generated by above manipulations
usleep(500000);
filename2 = eina_stringshare_printf("%s/eio_test_sentry_two_files_in_same_directory_one_removed_2", dirname);
_create_file((void*)filename);
_create_file((void*)filename2);
- sentry = efl_add_ref(EIO_SENTRY_CLASS, NULL);
+ sentry = efl_add(EIO_SENTRY_CLASS, efl_main_loop_get());
//sleep to avoid catching event generated by above manipulations
usleep(500000);
char *args[] = { "exe" };
elm_init(1, args);
- Eo* root = efl_add_ref(ELM_ATSPI_APP_OBJECT_CLASS, NULL);
+ Eo* root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, efl_main_loop_get());
ck_assert(root != NULL);
ck_assert_str_eq(ret, "Test name");
- efl_unref(root);
+ efl_del(root);
elm_shutdown();
}
END_TEST
char *args[] = { "exe" };
elm_init(1, args);
- Eo* root = efl_add_ref(ELM_ATSPI_APP_OBJECT_CLASS, NULL);
+ Eo* root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, efl_main_loop_get());
Efl_Access_Role role;
ck_assert(role == EFL_ACCESS_ROLE_APPLICATION);
- efl_unref(root);
+ efl_del(root);
elm_shutdown();
}
END_TEST
char *args[] = { "exe" };
elm_init(1, args);
- Eo* root = efl_add_ref(ELM_ATSPI_APP_OBJECT_CLASS, NULL);
+ Eo* root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, efl_main_loop_get());
const char *ret = NULL;
ck_assert(ret != NULL);
- efl_unref(root);
+ efl_del(root);
elm_shutdown();
}
END_TEST
char *args[] = { "exe" };
elm_init(1, args);
- Eo* root = efl_add_ref(ELM_ATSPI_APP_OBJECT_CLASS, NULL);
+ Eo* root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, efl_main_loop_get());
const char *ret = NULL;
ck_assert(ret != NULL);
- efl_unref(root);
+ efl_del(root);
elm_shutdown();
}
END_TEST
char *args[] = { "exe" };
elm_init(1, args);
- Eo* root = efl_add_ref(ELM_ATSPI_APP_OBJECT_CLASS, NULL);
+ Eo* root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, efl_main_loop_get());
const char *ret = NULL;
ck_assert(ret == NULL);
- efl_unref(root);
+ efl_del(root);
elm_shutdown();
}
END_TEST
elm_init(1, args);
generate_app();
- Eo* root = efl_add_ref(ELM_ATSPI_APP_OBJECT_CLASS, NULL);
+ Eo* root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, efl_main_loop_get());
Eina_List *child_list = NULL;
ck_assert(win != NULL);
ck_assert(win == g_win);
- efl_unref(root);
+ efl_del(root);
elm_shutdown();
}
END_TEST
elm_init(1, args);
generate_app();
- Eo* root = efl_add_ref(ELM_ATSPI_APP_OBJECT_CLASS, NULL);
+ Eo* root = efl_add(ELM_ATSPI_APP_OBJECT_CLASS, efl_main_loop_get());
Eo *win = NULL;
ck_assert(btn != NULL);
ck_assert(btn == g_btn);
- efl_unref(root);
+ efl_del(root);
elm_shutdown();
}
END_TEST
Eo *cfg = efl_provider_find(efl_main_loop_get(), EFL_CONFIG_INTERFACE);
fail_if(!cfg);
- Eo *win = efl_add_ref(EFL_UI_WIN_CLASS, NULL);
+ Eo *win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get());
Eo *cfg2 = efl_provider_find(win, EFL_CONFIG_INTERFACE);
fail_if(cfg != cfg2);
elm_config_cache_flush_interval_set(42);
fail_if(efl_config_int_get(win, "cache_flush_interval") != 42);
- efl_unref(win);
+ efl_del(win);
elm_shutdown();
}
END_TEST
{
char *args[] = { "exe" };
elm_init(1, args);
- Efl_Ui_Focus_Object *r1 = efl_add_ref(FOCUS_TEST_CLASS, NULL);
- Efl_Ui_Focus_Object *r2 = efl_add_ref(FOCUS_TEST_CLASS, NULL);
+ Efl_Ui_Focus_Object *r1 = efl_add(FOCUS_TEST_CLASS, efl_main_loop_get());
+ Efl_Ui_Focus_Object *r2 = efl_add(FOCUS_TEST_CLASS, efl_main_loop_get());
- Efl_Ui_Focus_Manager *m = efl_add_ref(EFL_UI_FOCUS_MANAGER_CALC_CLASS, NULL,
+ Efl_Ui_Focus_Manager *m = efl_add(EFL_UI_FOCUS_MANAGER_CALC_CLASS, efl_main_loop_get(),
efl_ui_focus_manager_root_set(efl_added, r1)
);
efl_ui_focus_manager_calc_unregister(m, r1);
efl_ui_focus_manager_calc_unregister(m, r1);
- efl_unref(r2);
- efl_unref(r1);
- efl_unref(m);
+ efl_del(r2);
+ efl_del(r1);
+ efl_del(m);
elm_shutdown();
}
Efl_Ui_Focus_Object *r1 = elm_focus_test_object_new("r1", 0, 0, 10, 10);
Efl_Ui_Focus_Object *r2 = elm_focus_test_object_new("r2", 0, 10, 10, 10);
- Efl_Ui_Focus_Manager *m = efl_add_ref(EFL_UI_FOCUS_MANAGER_CALC_CLASS, NULL,
+ Efl_Ui_Focus_Manager *m = efl_add(EFL_UI_FOCUS_MANAGER_CALC_CLASS, efl_main_loop_get(),
efl_ui_focus_manager_root_set(efl_added, r1)
);
fail_if(!efl_ui_focus_manager_calc_register(m, r2, r1, NULL));
fail_if(efl_ui_focus_manager_calc_register(m, r2, r1, NULL));
- efl_unref(r1);
- efl_unref(m);
+ efl_del(r1);
+ efl_del(m);
elm_shutdown();
}
CHECK(north, east, west, NULL, middle)
CHECK(south, east, west, middle, NULL)
- efl_unref(middle);
- efl_unref(south);
- efl_unref(north);
- efl_unref(east);
- efl_unref(west);
+ efl_del(middle);
+ efl_del(south);
+ efl_del(north);
+ efl_del(east);
+ efl_del(west);
elm_shutdown();
}
#undef ck_assert_set_eq
- efl_unref(middle);
- efl_unref(north_east);
- efl_unref(north_west);
- efl_unref(south_east);
- efl_unref(south_west);
+ efl_del(middle);
+ efl_del(north_east);
+ efl_del(north_west);
+ efl_del(south_east);
+ efl_del(south_west);
elm_shutdown();
}
TEST_OBJ_NEW(one, 0, 0, 20, 20);
TEST_OBJ_NEW(two, 20, 0, 20, 20);
- Efl_Ui_Focus_Manager *m = efl_add_ref(EFL_UI_FOCUS_MANAGER_CALC_CLASS, NULL,
+ Efl_Ui_Focus_Manager *m = efl_add(EFL_UI_FOCUS_MANAGER_CALC_CLASS, efl_main_loop_get(),
efl_ui_focus_manager_root_set(efl_added, root)
);
- Efl_Ui_Focus_Manager *m2 = efl_add_ref(EFL_UI_FOCUS_MANAGER_CALC_CLASS, NULL,
+ Efl_Ui_Focus_Manager *m2 = efl_add(EFL_UI_FOCUS_MANAGER_CALC_CLASS, efl_main_loop_get(),
efl_ui_focus_manager_root_set(efl_added, root2)
);
ck_assert_ptr_eq(efl_ui_focus_manager_move(m, EFL_UI_FOCUS_DIRECTION_RIGHT), two);
+ efl_del(m);
+ efl_del(m2);
+
elm_shutdown();
}
END_TEST
char *args[] = { "exe" };
elm_init(1, args);
- m = efl_add_ref(EFL_UI_FOCUS_MANAGER_CALC_CLASS, NULL);
+ m = efl_add(EFL_UI_FOCUS_MANAGER_CALC_CLASS, efl_main_loop_get());
fail_if(m);
+ efl_del(m);
elm_shutdown();
}
END_TEST
TEST_OBJ_NEW(root2, 0, 20, 20, 20);
TEST_OBJ_NEW(child, 0, 20, 20, 20);
- m = efl_add_ref(EFL_UI_FOCUS_MANAGER_CALC_CLASS, NULL,
+ m = efl_add(EFL_UI_FOCUS_MANAGER_CALC_CLASS, efl_main_loop_get(),
efl_ui_focus_manager_root_set(efl_added, root)
);
- m2 = efl_add_ref(EFL_UI_FOCUS_MANAGER_CALC_CLASS, NULL,
+ m2 = efl_add(EFL_UI_FOCUS_MANAGER_CALC_CLASS, efl_main_loop_get(),
efl_ui_focus_manager_root_set(efl_added, root2)
);
ck_assert_ptr_eq(efl_ui_focus_manager_redirect_get(m), m2);
+ efl_del(m);
+ efl_del(m2);
elm_shutdown();
}
END_TEST
TEST_OBJ_NEW(child, 0, 20, 20, 20);
TEST_OBJ_NEW(child2, 0, 20, 20, 20);
- m = efl_add_ref(EFL_UI_FOCUS_MANAGER_CALC_CLASS, NULL,
+ m = efl_add(EFL_UI_FOCUS_MANAGER_CALC_CLASS, efl_main_loop_get(),
efl_ui_focus_manager_root_set(efl_added, root)
);
ck_assert_int_eq(efl_ui_focus_manager_calc_register(m, child2, root, NULL), 1);
ck_assert_int_eq(efl_ui_focus_manager_calc_update_parent(m, child, child2), 1);
+ efl_del(m);
elm_shutdown();
}
END_TEST
TEST_OBJ_NEW(child2, 0, 20, 20, 20);
TEST_OBJ_NEW(child3, 0, 20, 20, 20);
- m = efl_add_ref(EFL_UI_FOCUS_MANAGER_CALC_CLASS, NULL,
+ m = efl_add(EFL_UI_FOCUS_MANAGER_CALC_CLASS, efl_main_loop_get(),
efl_ui_focus_manager_root_set(efl_added, root)
);
order = eina_list_append(order, child2);
ck_assert_int_eq(efl_ui_focus_manager_calc_update_children(m, root, order), 0);
+ efl_del(m);
elm_shutdown();
}
END_TEST
TEST_OBJ_NEW(sub_sub, 0, 0, 10, 10);
TEST_OBJ_NEW(sub_child, 0, 0, 10, 10);
- m = efl_add_ref(EFL_UI_FOCUS_MANAGER_CALC_CLASS, NULL,
+ m = efl_add(EFL_UI_FOCUS_MANAGER_CALC_CLASS, efl_main_loop_get(),
efl_ui_focus_manager_root_set(efl_added, root)
);
efl_ui_focus_manager_focus_set(m, sub_sub);
ck_assert_ptr_eq(efl_ui_focus_manager_focus_get(m), sub_child);
+ efl_del(m);
elm_shutdown();
}
END_TEST
TEST_OBJ_NEW(root2, 0, 20, 20, 20);
TEST_OBJ_NEW(child, 0, 20, 20, 20);
- m = efl_add_ref(EFL_UI_FOCUS_MANAGER_CALC_CLASS, NULL,
+ m = efl_add(EFL_UI_FOCUS_MANAGER_CALC_CLASS, efl_main_loop_get(),
efl_ui_focus_manager_root_set(efl_added, root)
);
focus_test_manager_set(root2, m);
- m2 = efl_add_ref(EFL_UI_FOCUS_MANAGER_CALC_CLASS, NULL,
+ m2 = efl_add(EFL_UI_FOCUS_MANAGER_CALC_CLASS, efl_main_loop_get(),
efl_ui_focus_manager_root_set(efl_added, root2)
);
ck_assert_ptr_eq(efl_ui_focus_manager_redirect_get(m), m2);
+ efl_del(m);
elm_shutdown();
}
END_TEST
TEST_OBJ_NEW(root2, 0, 20, 20, 20);
TEST_OBJ_NEW(child, 0, 20, 20, 20);
- m = efl_add_ref(EFL_UI_FOCUS_MANAGER_CALC_CLASS, NULL,
+ m = efl_add(EFL_UI_FOCUS_MANAGER_CALC_CLASS, efl_main_loop_get(),
efl_ui_focus_manager_root_set(efl_added, root)
);
focus_test_manager_set(root2, m);
- m2 = efl_add_ref(EFL_UI_FOCUS_MANAGER_CALC_CLASS, NULL,
+ m2 = efl_add(EFL_UI_FOCUS_MANAGER_CALC_CLASS, efl_main_loop_get(),
efl_ui_focus_manager_root_set(efl_added, root2)
);
- m3 = efl_add_ref(EFL_UI_FOCUS_MANAGER_CALC_CLASS, NULL,
+ m3 = efl_add(EFL_UI_FOCUS_MANAGER_CALC_CLASS, efl_main_loop_get(),
efl_ui_focus_manager_root_set(efl_added, root2)
);
- m4 = efl_add_ref(EFL_UI_FOCUS_MANAGER_CALC_CLASS, NULL,
+ m4 = efl_add(EFL_UI_FOCUS_MANAGER_CALC_CLASS, efl_main_loop_get(),
efl_ui_focus_manager_root_set(efl_added, root2)
);
ck_assert_ptr_eq(efl_ui_focus_manager_redirect_get(m3), NULL);
ck_assert_ptr_eq(efl_ui_focus_manager_redirect_get(m4), NULL);
+ efl_del(m);
+ efl_del(m2);
+ efl_del(m3);
+ efl_del(m4);
elm_shutdown();
}
END_TEST
TEST_OBJ_NEW(root, 0, 20, 20, 20);
TEST_OBJ_NEW(child2, 0, 20, 20, 20);
- m = efl_add_ref(EFL_UI_FOCUS_MANAGER_CALC_CLASS, NULL,
+ m = efl_add(EFL_UI_FOCUS_MANAGER_CALC_CLASS, efl_main_loop_get(),
efl_ui_focus_manager_root_set(efl_added, root)
);
printf("%s\n", efl_name_get(efl_ui_focus_manager_focus_get(_get_highest_redirect(m))));
ck_assert_ptr_eq(efl_ui_focus_manager_focus_get(_get_highest_redirect(m)), most_right);
+ efl_del(m);
elm_shutdown();
}
END_TEST
{
Efl_Ui_Focus_Object *ret;
- ret = efl_add_ref(FOCUS_TEST_CLASS, NULL,
+ ret = efl_add(FOCUS_TEST_CLASS, efl_main_loop_get(),
efl_name_set(efl_added, name)
);
Q(ret, x, y, w, h);
Efl_Ui_Focus_Manager *m;
root = elm_focus_test_object_new("middle", 40, 40, 20, 20);
- m = efl_add_ref(EFL_UI_FOCUS_MANAGER_CALC_CLASS, NULL,
+ m = efl_add(EFL_UI_FOCUS_MANAGER_CALC_CLASS, efl_main_loop_get(),
efl_ui_focus_manager_root_set(efl_added, root)
);
if (middle)
EFL_OBJECT_OP_FUNC(efl_ui_focus_manager_calc_unregister, _unregister),
);
- Efl_Ui_Focus_Manager *manager = efl_add_ref(EFL_UI_FOCUS_MANAGER_CALC_CLASS, NULL,
+ Efl_Ui_Focus_Manager *manager = efl_add(EFL_UI_FOCUS_MANAGER_CALC_CLASS, efl_main_loop_get(),
efl_ui_focus_manager_root_set(efl_added, root_manager)
);
//flush now all changes
efl_object_override(manager, &manager_tracker);
- Focus_Test_Sub_Main *focus_main = efl_add_ref(FOCUS_TEST_SUB_MAIN_CLASS, NULL);
+ Focus_Test_Sub_Main *focus_main = efl_add(FOCUS_TEST_SUB_MAIN_CLASS, efl_main_loop_get());
efl_key_data_set(focus_main, "__user_manager", manager);
efl_key_data_set(focus_main, "__user_parent", root_manager);
efl_ui_focus_manager_calc_unregister(sub, child1);
efl_ui_focus_manager_calc_unregister(sub, child2);
efl_ui_focus_manager_calc_unregister(sub, child3);
- efl_unref(child1);
- efl_unref(child2);
- efl_unref(child3);
- efl_unref(sub);
- efl_unref(manager);
+ efl_del(child1);
+ efl_del(child2);
+ efl_del(child3);
+ efl_del(sub);
+ efl_del(manager);
elm_shutdown();
}
END_TEST
eina_list_free(unregistered);
unregistered = NULL;
- efl_unref(sub);
- efl_unref(manager);
- efl_unref(root);
- efl_unref(child1);
- efl_unref(child2);
- efl_unref(child3);
+ efl_del(sub);
+ efl_del(manager);
+ efl_del(root);
+ efl_del(child1);
+ efl_del(child2);
+ efl_del(child3);
elm_shutdown();
}
END_TEST
fail_if(!_set_equal(registered, set_add));
fail_if(!_set_equal(unregistered, set_del));
- efl_unref(sub);
- efl_unref(manager);
- efl_unref(root);
- efl_unref(child1);
- efl_unref(child2);
- efl_unref(child3);
+ efl_del(sub);
+ efl_del(manager);
+ efl_del(root);
+ efl_del(child1);
+ efl_del(child2);
+ efl_del(child3);
elm_shutdown();
}
END_TEST
projects / platform / upstream / efl.git / commitdiff