forked from enlightenment/efl
Compare commits
3 Commits
6cadc4f41e
...
7309b85f27
Author | SHA1 | Date |
---|---|---|
Dmitri Chudinov | 7309b85f27 | |
Dmitri Chudinov | 6d0c8f4c82 | |
Dmitri Chudinov | 847093ae23 |
|
@ -889,6 +889,7 @@ ICON("preferences-desktop-screensaver", "i-screen")
|
||||||
ICON("preferences-desktop-wallpaper", "i-picture-landscape")
|
ICON("preferences-desktop-wallpaper", "i-picture-landscape")
|
||||||
ICON("preferences-system", "i-gear")
|
ICON("preferences-system", "i-gear")
|
||||||
ICON("preferences-other", "i-gear-spanner")
|
ICON("preferences-other", "i-gear-spanner")
|
||||||
|
ICON("preferences-etc", "i-utilities")
|
||||||
ICON("system-file-manager", "i-folder")
|
ICON("system-file-manager", "i-folder")
|
||||||
ICON("applications-accessories", "i-scissor-rule")
|
ICON("applications-accessories", "i-scissor-rule")
|
||||||
ICON("applications-development", "i-gear-curly-braces")
|
ICON("applications-development", "i-gear-curly-braces")
|
||||||
|
|
|
@ -360,7 +360,7 @@ I160("i-monitor-speakers", "monitor-speakers")
|
||||||
I160("i-briefcase", "briefcase")
|
I160("i-briefcase", "briefcase")
|
||||||
I160("i-app-window", "app-window")
|
I160("i-app-window", "app-window")
|
||||||
I160("i-beaker", "beaker")
|
I160("i-beaker", "beaker")
|
||||||
// not used yet I160("i-utilities", "utilities")
|
I160("i-utilities", "utilities")
|
||||||
I160("i-sun", "sun")
|
I160("i-sun", "sun")
|
||||||
I160("i-moon", "moon")
|
I160("i-moon", "moon")
|
||||||
I160("i-moon-clouds", "moon-clouds")
|
I160("i-moon-clouds", "moon-clouds")
|
||||||
|
|
|
@ -3376,7 +3376,7 @@ _profiles_list_unselect_cb(void *data EINA_UNUSED,
|
||||||
Evas_Object *obj,
|
Evas_Object *obj,
|
||||||
void *event_info EINA_UNUSED)
|
void *event_info EINA_UNUSED)
|
||||||
{
|
{
|
||||||
if (elm_list_selected_item_get(obj)) return;
|
if (!elm_list_selected_item_get(obj)) return;
|
||||||
elm_object_disabled_set(evas_object_data_get(obj, "prof_del_btn"),
|
elm_object_disabled_set(evas_object_data_get(obj, "prof_del_btn"),
|
||||||
EINA_TRUE);
|
EINA_TRUE);
|
||||||
elm_object_disabled_set(evas_object_data_get(obj, "prof_reset_btn"),
|
elm_object_disabled_set(evas_object_data_get(obj, "prof_reset_btn"),
|
||||||
|
@ -4383,11 +4383,16 @@ _status_config_full(Evas_Object *win,
|
||||||
"Audio", _cf_audio, win);
|
"Audio", _cf_audio, win);
|
||||||
elm_toolbar_item_append(tb, "preferences-profile",
|
elm_toolbar_item_append(tb, "preferences-profile",
|
||||||
"Profiles", _cf_profiles, win);
|
"Profiles", _cf_profiles, win);
|
||||||
elm_toolbar_item_append(tb, NULL, "Scrolling", _cf_scrolling, win);
|
elm_toolbar_item_append(tb, "system-run",
|
||||||
elm_toolbar_item_append(tb, NULL, "Rendering", _cf_rendering, win);
|
"Scrolling", _cf_scrolling, win);
|
||||||
elm_toolbar_item_append(tb, NULL, "Caches", _cf_caches, win);
|
elm_toolbar_item_append(tb, "preferences-desktop",
|
||||||
elm_toolbar_item_append(tb, NULL, "Focus", _cf_focus, win);
|
"Rendering", _cf_rendering, win);
|
||||||
elm_toolbar_item_append(tb, NULL, "Etc", _cf_etc, win);
|
elm_toolbar_item_append(tb, "appointment-new",
|
||||||
|
"Caches", _cf_caches, win);
|
||||||
|
elm_toolbar_item_append(tb, "magnifying-glass",
|
||||||
|
"Focus", _cf_focus, win);
|
||||||
|
elm_toolbar_item_append(tb, "preferences-etc",
|
||||||
|
"Etc", _cf_etc, win);
|
||||||
|
|
||||||
elm_box_pack_end(bx0, tb);
|
elm_box_pack_end(bx0, tb);
|
||||||
evas_object_show(tb);
|
evas_object_show(tb);
|
||||||
|
|
|
@ -447,7 +447,11 @@ _ecore_main_fdh_poll_add(Efl_Loop_Data *pd EINA_UNUSED, Ecore_Fd_Handler *fdh)
|
||||||
fdh->gfd.events = _gfd_events_from_fdh(fdh);
|
fdh->gfd.events = _gfd_events_from_fdh(fdh);
|
||||||
fdh->gfd.revents = 0;
|
fdh->gfd.revents = 0;
|
||||||
DBG("adding gpoll on %d %08x", fdh->fd, fdh->gfd.events);
|
DBG("adding gpoll on %d %08x", fdh->fd, fdh->gfd.events);
|
||||||
g_source_add_poll(ecore_glib_source, &fdh->gfd);
|
if (ecore_glib_source)
|
||||||
|
g_source_add_poll(ecore_glib_source, &fdh->gfd);
|
||||||
|
else
|
||||||
|
ERR("Failed to add gpoll on %d %08x. GSource is NULL",
|
||||||
|
fdh->fd, fdh->gfd.events);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
return r;
|
return r;
|
||||||
|
@ -939,29 +943,6 @@ quit:
|
||||||
static void
|
static void
|
||||||
_ecore_main_loop_setup(Eo *obj, Efl_Loop_Data *pd)
|
_ecore_main_loop_setup(Eo *obj, Efl_Loop_Data *pd)
|
||||||
{
|
{
|
||||||
// Please note that this function is being also called in case of a bad
|
|
||||||
// fd to reset the main loop.
|
|
||||||
#ifdef HAVE_SYS_EPOLL_H
|
|
||||||
pd->epoll_fd = epoll_create(1);
|
|
||||||
if (pd->epoll_fd < 0) WRN("Failed to create epoll fd!");
|
|
||||||
else
|
|
||||||
{
|
|
||||||
eina_file_close_on_exec(pd->epoll_fd, EINA_TRUE);
|
|
||||||
|
|
||||||
pd->epoll_pid = getpid();
|
|
||||||
|
|
||||||
// add polls on all our file descriptors
|
|
||||||
Ecore_Fd_Handler *fdh;
|
|
||||||
EINA_INLIST_FOREACH(pd->fd_handlers, fdh)
|
|
||||||
{
|
|
||||||
if (fdh->delete_me) continue;
|
|
||||||
_ecore_epoll_add(pd->epoll_fd, fdh->fd,
|
|
||||||
_ecore_poll_events_from_fdh(fdh), fdh);
|
|
||||||
_ecore_main_fdh_poll_add(pd, fdh);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if (obj == ML_OBJ)
|
if (obj == ML_OBJ)
|
||||||
{
|
{
|
||||||
#ifdef HAVE_LIBUV
|
#ifdef HAVE_LIBUV
|
||||||
|
@ -1072,6 +1053,30 @@ _ecore_main_loop_setup(Eo *obj, Efl_Loop_Data *pd)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Please note that this function is being also called in case of a bad
|
||||||
|
// fd to reset the main loop.
|
||||||
|
#ifdef HAVE_SYS_EPOLL_H
|
||||||
|
pd->epoll_fd = epoll_create(1);
|
||||||
|
if (pd->epoll_fd < 0) WRN("Failed to create epoll fd!");
|
||||||
|
else
|
||||||
|
{
|
||||||
|
eina_file_close_on_exec(pd->epoll_fd, EINA_TRUE);
|
||||||
|
|
||||||
|
pd->epoll_pid = getpid();
|
||||||
|
|
||||||
|
// add polls on all our file descriptors
|
||||||
|
Ecore_Fd_Handler *fdh;
|
||||||
|
EINA_INLIST_FOREACH(pd->fd_handlers, fdh)
|
||||||
|
{
|
||||||
|
if (fdh->delete_me) continue;
|
||||||
|
_ecore_epoll_add(pd->epoll_fd, fdh->fd,
|
||||||
|
_ecore_poll_events_from_fdh(fdh), fdh);
|
||||||
|
_ecore_main_fdh_poll_add(pd, fdh);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
_ecore_main_timechanges_start(obj);
|
_ecore_main_timechanges_start(obj);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue