jf_simon
/
enlightenment_my
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

non-resiable "presentation mode" dialogs and -Wextra/trailing whitespace cleanups. 

SVN revision: 47060
This commit is contained in:
Gustavo Sverzut Barbieri 2010-03-09 00:31:44 +00:00
parent f195132338
commit ba79908621
2 changed files with 89 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

186
src/bin/e_desklock.c
View File

@ -36,7 +36,7 @@ struct _E_Desklock_Data
Eina_List *handlers; Eina_List *handlers;
Ecore_X_Window elock_grab_break_wnd; Ecore_X_Window elock_grab_break_wnd;
char passwd[PASSWD_LEN]; char passwd[PASSWD_LEN];
int state; int state;
}; };
#ifdef HAVE_PAM #ifdef HAVE_PAM
struct _E_Desklock_Auth struct _E_Desklock_Auth
@ -45,7 +45,7 @@ struct _E_Desklock_Auth
struct pam_conv conv; struct pam_conv conv;
pam_handle_t *handle; pam_handle_t *handle;
} pam; } pam;
char user[PATH_MAX]; char user[PATH_MAX];
char passwd[PATH_MAX]; char passwd[PATH_MAX];
}; };
@ -102,10 +102,10 @@ e_desklock_init(void)
/* A poller to tick every 256 ticks, watching for an idle user */ /* A poller to tick every 256 ticks, watching for an idle user */
_e_desklock_idle_poller = ecore_poller_add(ECORE_POLLER_CORE, 256, _e_desklock_idle_poller = ecore_poller_add(ECORE_POLLER_CORE, 256,
_e_desklock_cb_idle_poller, NULL); _e_desklock_cb_idle_poller, NULL);
if (e_config->desklock_background) if (e_config->desklock_background)
e_filereg_register(e_config->desklock_background); e_filereg_register(e_config->desklock_background);
E_EVENT_DESKLOCK = ecore_event_type_new(); E_EVENT_DESKLOCK = ecore_event_type_new();
return 1; return 1;
@ -157,27 +157,27 @@ e_desklock_show(void)
int zone_counter; int zone_counter;
int total_zone_num; int total_zone_num;
E_Event_Desklock *ev; E_Event_Desklock *ev;
if (_e_custom_desklock_exe) return 0; if (_e_custom_desklock_exe) return 0;
if (e_config->desklock_use_custom_desklock) if (e_config->desklock_use_custom_desklock)
{ {
_e_custom_desklock_exe_handler = ecore_event_handler_add(ECORE_EXE_EVENT_DEL, _e_custom_desklock_exe_handler = ecore_event_handler_add(ECORE_EXE_EVENT_DEL,
_e_desklock_cb_custom_desklock_exit, _e_desklock_cb_custom_desklock_exit,
NULL); NULL);
e_util_library_path_strip(); e_util_library_path_strip();
_e_custom_desklock_exe = ecore_exe_run(e_config->desklock_custom_desklock_cmd, NULL); _e_custom_desklock_exe = ecore_exe_run(e_config->desklock_custom_desklock_cmd, NULL);
e_util_library_path_restore(); e_util_library_path_restore();
return 1; return 1;
} }
#ifndef HAVE_PAM #ifndef HAVE_PAM
e_util_dialog_show(_("Error - no PAM support"), e_util_dialog_show(_("Error - no PAM support"),
_("No PAM support was built into Enlightenment, so<br>" _("No PAM support was built into Enlightenment, so<br>"
"desk locking is disabled.")); "desk locking is disabled."));
return 0; return 0;
#endif #endif
if (edd) return 0; if (edd) return 0;
#ifdef HAVE_PAM #ifdef HAVE_PAM
@ -187,7 +187,7 @@ e_desklock_show(void)
if (!e_config->desklock_personal_passwd) if (!e_config->desklock_personal_passwd)
{ {
E_Zone *zone; E_Zone *zone;
zone = e_util_zone_current_get(e_manager_current_get()); zone = e_util_zone_current_get(e_manager_current_get());
if (zone) if (zone)
e_configure_registry_call("screen/screen_lock", zone->container, NULL); e_configure_registry_call("screen/screen_lock", zone->container, NULL);
@ -196,10 +196,10 @@ e_desklock_show(void)
#ifdef HAVE_PAM #ifdef HAVE_PAM
} }
#endif #endif
edd = E_NEW(E_Desklock_Data, 1); edd = E_NEW(E_Desklock_Data, 1);
if (!edd) return 0; if (!edd) return 0;
edd->elock_wnd = ecore_x_window_input_new(e_manager_current_get()->root, edd->elock_wnd = ecore_x_window_input_new(e_manager_current_get()->root,
0, 0, 1, 1); 0, 0, 1, 1);
ecore_x_window_show(edd->elock_wnd); ecore_x_window_show(edd->elock_wnd);
managers = e_manager_list(); managers = e_manager_list();
@ -209,12 +209,12 @@ e_desklock_show(void)
{ {
Ecore_X_Window *windows; Ecore_X_Window *windows;
int wnum; int wnum;
windows = ecore_x_window_children_get(man->root, &wnum); windows = ecore_x_window_children_get(man->root, &wnum);
if (windows) if (windows)
{ {
int i; int i;
for (i = 0; i < wnum; i++) for (i = 0; i < wnum; i++)
{ {
Ecore_X_Window_Attributes att; Ecore_X_Window_Attributes att;
@ -247,10 +247,10 @@ e_desklock_show(void)
return 0; return 0;
} }
works: works:
last_active_zone = current_zone = last_active_zone = current_zone =
e_zone_current_get(e_container_current_get(e_manager_current_get())); e_zone_current_get(e_container_current_get(e_manager_current_get()));
zone_counter = 0; zone_counter = 0;
total_zone_num = _e_desklock_zone_num_get(); total_zone_num = _e_desklock_zone_num_get();
EINA_LIST_FOREACH(managers, l, man) EINA_LIST_FOREACH(managers, l, man)
@ -267,10 +267,10 @@ e_desklock_show(void)
edp->popup_wnd = e_popup_new(zone, 0, 0, zone->w, zone->h); edp->popup_wnd = e_popup_new(zone, 0, 0, zone->w, zone->h);
evas_event_feed_mouse_move(edp->popup_wnd->evas, -1000000, -1000000, evas_event_feed_mouse_move(edp->popup_wnd->evas, -1000000, -1000000,
ecore_x_current_time_get(), NULL); ecore_x_current_time_get(), NULL);
e_popup_layer_set(edp->popup_wnd, ELOCK_POPUP_LAYER); e_popup_layer_set(edp->popup_wnd, ELOCK_POPUP_LAYER);
ecore_evas_raise(edp->popup_wnd->ecore_evas); ecore_evas_raise(edp->popup_wnd->ecore_evas);
evas_event_freeze(edp->popup_wnd->evas); evas_event_freeze(edp->popup_wnd->evas);
edp->bg_object = edje_object_add(edp->popup_wnd->evas); edp->bg_object = edje_object_add(edp->popup_wnd->evas);
@ -321,7 +321,7 @@ e_desklock_show(void)
e_theme_edje_object_set(edp->login_box, e_theme_edje_object_set(edp->login_box,
"base/theme/desklock", "base/theme/desklock",
"e/desklock/login_box"); "e/desklock/login_box");
edje_object_part_text_set(edp->login_box, "e.text.title", edje_object_part_text_set(edp->login_box, "e.text.title",
_("Please enter your unlock password")); _("Please enter your unlock password"));
edje_object_size_min_calc(edp->login_box, &mw, &mh); edje_object_size_min_calc(edp->login_box, &mw, &mh);
if (edje_object_part_exists(edp->bg_object, "e.swallow.login_box")) if (edje_object_part_exists(edp->bg_object, "e.swallow.login_box"))
@ -332,7 +332,7 @@ e_desklock_show(void)
else else
{ {
evas_object_resize(edp->login_box, mw, mh); evas_object_resize(edp->login_box, mw, mh);
evas_object_move(edp->login_box, evas_object_move(edp->login_box,
((zone->w - mw) / 2), ((zone->w - mw) / 2),
((zone->h - mh) / 2)); ((zone->h - mh) / 2));
} }
@ -349,24 +349,24 @@ e_desklock_show(void)
else else
evas_object_show(edp->login_box); evas_object_show(edp->login_box);
/**/ /**/
e_popup_edje_bg_object_set(edp->popup_wnd, edp->bg_object); e_popup_edje_bg_object_set(edp->popup_wnd, edp->bg_object);
evas_event_thaw(edp->popup_wnd->evas); evas_event_thaw(edp->popup_wnd->evas);
e_popup_show(edp->popup_wnd); e_popup_show(edp->popup_wnd);
edd->elock_wnd_list = eina_list_append(edd->elock_wnd_list, edp); edd->elock_wnd_list = eina_list_append(edd->elock_wnd_list, edp);
} }
zone_counter++; zone_counter++;
} }
} }
} }
/* handlers */ /* handlers */
edd->handlers = eina_list_append(edd->handlers, edd->handlers = eina_list_append(edd->handlers,
ecore_event_handler_add(ECORE_EVENT_KEY_DOWN, ecore_event_handler_add(ECORE_EVENT_KEY_DOWN,
_e_desklock_cb_key_down, NULL)); _e_desklock_cb_key_down, NULL));
edd->handlers = eina_list_append(edd->handlers, edd->handlers = eina_list_append(edd->handlers,
ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_DOWN, ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_DOWN,
_e_desklock_cb_mouse_down, NULL)); _e_desklock_cb_mouse_down, NULL));
edd->handlers = eina_list_append(edd->handlers, edd->handlers = eina_list_append(edd->handlers,
@ -394,7 +394,7 @@ e_desklock_hide(void)
{ {
E_Desklock_Popup_Data *edp; E_Desklock_Popup_Data *edp;
E_Event_Desklock *ev; E_Event_Desklock *ev;
if ((!edd) && (!_e_custom_desklock_exe)) return; if ((!edd) && (!_e_custom_desklock_exe)) return;
if (e_config->desklock_use_custom_desklock) if (e_config->desklock_use_custom_desklock)
@ -402,31 +402,31 @@ e_desklock_hide(void)
_e_custom_desklock_exe = NULL; _e_custom_desklock_exe = NULL;
return; return;
} }
if (edd->elock_grab_break_wnd) if (edd->elock_grab_break_wnd)
ecore_x_window_show(edd->elock_grab_break_wnd); ecore_x_window_show(edd->elock_grab_break_wnd);
EINA_LIST_FREE(edd->elock_wnd_list, edp) EINA_LIST_FREE(edd->elock_wnd_list, edp)
{ {
if (edp) if (edp)
{ {
e_popup_hide(edp->popup_wnd); e_popup_hide(edp->popup_wnd);
evas_event_freeze(edp->popup_wnd->evas); evas_event_freeze(edp->popup_wnd->evas);
evas_object_del(edp->bg_object); evas_object_del(edp->bg_object);
evas_object_del(edp->login_box); evas_object_del(edp->login_box);
evas_event_thaw(edp->popup_wnd->evas); evas_event_thaw(edp->popup_wnd->evas);
e_util_defer_object_del(E_OBJECT(edp->popup_wnd)); e_util_defer_object_del(E_OBJECT(edp->popup_wnd));
E_FREE(edp); E_FREE(edp);
} }
} }
E_FREE_LIST(edd->handlers, ecore_event_handler_del); E_FREE_LIST(edd->handlers, ecore_event_handler_del);
e_grabinput_release(edd->elock_wnd, edd->elock_wnd); e_grabinput_release(edd->elock_wnd, edd->elock_wnd);
ecore_x_window_free(edd->elock_wnd); ecore_x_window_free(edd->elock_wnd);
E_FREE(edd); E_FREE(edd);
edd = NULL; edd = NULL;
@ -454,11 +454,9 @@ e_desklock_hide(void)
} }
static int static int
_e_desklock_cb_key_down(void *data, int type, void *event) _e_desklock_cb_key_down(void *data __UNUSED__, int type __UNUSED__, void *event)
{ {
Ecore_Event_Key *ev; Ecore_Event_Key *ev = event;
ev = event;
if (ev->window != edd->elock_wnd || edd->state == E_DESKLOCK_STATE_CHECKING) return 1; if (ev->window != edd->elock_wnd || edd->state == E_DESKLOCK_STATE_CHECKING) return 1;
if (!strcmp(ev->key, "Escape")) if (!strcmp(ev->key, "Escape"))
@ -485,44 +483,44 @@ _e_desklock_cb_key_down(void *data, int type, void *event)
} }
} }
} }
return 1; return 1;
} }
static int static int
_e_desklock_cb_mouse_down(void *data, int type, void *event) _e_desklock_cb_mouse_down(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
{ {
return 1; return 1;
} }
static int static int
_e_desklock_cb_mouse_up(void *data, int type, void *event) _e_desklock_cb_mouse_up(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
{ {
return 1; return 1;
} }
static int static int
_e_desklock_cb_mouse_wheel(void *data, int type, void *event) _e_desklock_cb_mouse_wheel(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
{ {
return 1; return 1;
} }
static int static int
_e_desklock_cb_mouse_move(void *data, int type, void *event) _e_desklock_cb_mouse_move(void *data __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
{ {
E_Desklock_Popup_Data *edp; E_Desklock_Popup_Data *edp;
E_Zone *current_zone; E_Zone *current_zone;
Eina_List *l; Eina_List *l;
current_zone = e_zone_current_get(e_container_current_get(e_manager_current_get())); current_zone = e_zone_current_get(e_container_current_get(e_manager_current_get()));
if (current_zone == last_active_zone) if (current_zone == last_active_zone)
return 1; return 1;
EINA_LIST_FOREACH(edd->elock_wnd_list, l, edp) EINA_LIST_FOREACH(edd->elock_wnd_list, l, edp)
{ {
if (!edp) continue; if (!edp) continue;
if (edp->popup_wnd->zone == last_active_zone) if (edp->popup_wnd->zone == last_active_zone)
evas_object_hide(edp->login_box); evas_object_hide(edp->login_box);
else if (edp->popup_wnd->zone == current_zone) else if (edp->popup_wnd->zone == current_zone)
@ -538,16 +536,16 @@ _e_desklock_passwd_update(void)
char passwd_hidden[PASSWD_LEN] = "", *p, *pp; char passwd_hidden[PASSWD_LEN] = "", *p, *pp;
E_Desklock_Popup_Data *edp; E_Desklock_Popup_Data *edp;
Eina_List *l; Eina_List *l;
if (!edd) return; if (!edd) return;
for (p = edd->passwd, pp = passwd_hidden; *p; p++, pp++) for (p = edd->passwd, pp = passwd_hidden; *p; p++, pp++)
*pp = '*'; *pp = '*';
*pp = 0; *pp = 0;
EINA_LIST_FOREACH(edd->elock_wnd_list, l, edp) EINA_LIST_FOREACH(edd->elock_wnd_list, l, edp)
{ {
edje_object_part_text_set(edp->login_box, "e.text.password", edje_object_part_text_set(edp->login_box, "e.text.password",
passwd_hidden); passwd_hidden);
} }
} }
@ -563,9 +561,9 @@ static void
_e_desklock_backspace(void) _e_desklock_backspace(void)
{ {
int len, val, pos; int len, val, pos;
if (!edd) return; if (!edd) return;
len = strlen(edd->passwd); len = strlen(edd->passwd);
if (len > 0) if (len > 0)
{ {
@ -590,7 +588,7 @@ _e_desklock_zone_num_get(void)
int num; int num;
Eina_List *l, *l2; Eina_List *l, *l2;
E_Manager *man; E_Manager *man;
num = 0; num = 0;
EINA_LIST_FOREACH(e_manager_list(), l, man) EINA_LIST_FOREACH(e_manager_list(), l, man)
{ {
@ -600,7 +598,7 @@ _e_desklock_zone_num_get(void)
num += eina_list_count(con->zones); num += eina_list_count(con->zones);
} }
} }
return num; return num;
} }
@ -667,11 +665,9 @@ _e_desklock_state_set(int state)
#ifdef HAVE_PAM #ifdef HAVE_PAM
static int static int
_e_desklock_cb_exit(void *data, int type, void *event) _e_desklock_cb_exit(void *data __UNUSED__, int type __UNUSED__, void *event)
{ {
Ecore_Exe_Event_Del *ev; Ecore_Exe_Event_Del *ev = event;
ev = event;
if (ev->pid == _e_desklock_child_pid) if (ev->pid == _e_desklock_child_pid)
{ {
_e_desklock_child_pid = -1; _e_desklock_child_pid = -1;
@ -706,7 +702,7 @@ _e_desklock_cb_exit(void *data, int type, void *event)
} }
return 1; return 1;
} }
static int static int
_desklock_auth(char *passwd) _desklock_auth(char *passwd)
{ {
@ -715,8 +711,8 @@ _desklock_auth(char *passwd)
if (_e_desklock_child_pid > 0) if (_e_desklock_child_pid > 0)
{ {
/* parent */ /* parent */
_e_desklock_exit_handler = _e_desklock_exit_handler =
ecore_event_handler_add(ECORE_EXE_EVENT_DEL, _e_desklock_cb_exit, ecore_event_handler_add(ECORE_EXE_EVENT_DEL, _e_desklock_cb_exit,
NULL); NULL);
} }
else if (_e_desklock_child_pid == 0) else if (_e_desklock_child_pid == 0)
@ -726,7 +722,7 @@ _desklock_auth(char *passwd)
E_Desklock_Auth da; E_Desklock_Auth da;
char *current_user, *p; char *current_user, *p;
struct sigaction action; struct sigaction action;
action.sa_handler = SIG_DFL; action.sa_handler = SIG_DFL;
action.sa_flags = SA_ONSTACK | SA_NODEFER | SA_RESETHAND | SA_SIGINFO; action.sa_flags = SA_ONSTACK | SA_NODEFER | SA_RESETHAND | SA_SIGINFO;
sigemptyset(&action.sa_mask); sigemptyset(&action.sa_mask);
@ -735,7 +731,7 @@ _desklock_auth(char *passwd)
sigaction(SIGFPE, &action, NULL); sigaction(SIGFPE, &action, NULL);
sigaction(SIGBUS, &action, NULL); sigaction(SIGBUS, &action, NULL);
sigaction(SIGABRT, &action, NULL); sigaction(SIGABRT, &action, NULL);
current_user = _desklock_auth_get_current_user(); current_user = _desklock_auth_get_current_user();
eina_strlcpy(da.user, current_user, PATH_MAX); eina_strlcpy(da.user, current_user, PATH_MAX);
eina_strlcpy(da.passwd, passwd, PATH_MAX); eina_strlcpy(da.passwd, passwd, PATH_MAX);
@ -744,9 +740,9 @@ _desklock_auth(char *passwd)
da.pam.handle = NULL; da.pam.handle = NULL;
da.pam.conv.conv = NULL; da.pam.conv.conv = NULL;
da.pam.conv.appdata_ptr = NULL; da.pam.conv.appdata_ptr = NULL;
pamerr = _desklock_pam_init(&da); pamerr = _desklock_pam_init(&da);
if (pamerr != PAM_SUCCESS) if (pamerr != PAM_SUCCESS)
{ {
free(current_user); free(current_user);
exit(pamerr); exit(pamerr);
@ -789,24 +785,24 @@ _desklock_pam_init(E_Desklock_Auth *da)
const char *pam_prof; const char *pam_prof;
char *current_host; char *current_host;
char *current_user; char *current_user;
if (!da) return -1; if (!da) return -1;
da->pam.conv.conv = _desklock_auth_pam_conv; da->pam.conv.conv = _desklock_auth_pam_conv;
da->pam.conv.appdata_ptr = da; da->pam.conv.appdata_ptr = da;
da->pam.handle = NULL; da->pam.handle = NULL;
/* try other pam profiles - and system-auth (login for fbsd users) is a fallback */ /* try other pam profiles - and system-auth (login for fbsd users) is a fallback */
pam_prof = "login"; pam_prof = "login";
if (ecore_file_exists("/etc/pam.d/enlightenment")) if (ecore_file_exists("/etc/pam.d/enlightenment"))
pam_prof = "enlightenment"; pam_prof = "enlightenment";
else if (ecore_file_exists("/etc/pam.d/xscreensaver")) else if (ecore_file_exists("/etc/pam.d/xscreensaver"))
pam_prof = "xscreensaver"; pam_prof = "xscreensaver";
else if (ecore_file_exists("/etc/pam.d/kscreensaver")) else if (ecore_file_exists("/etc/pam.d/kscreensaver"))
pam_prof = "kscreensaver"; pam_prof = "kscreensaver";
else if (ecore_file_exists("/etc/pam.d/system-auth")) else if (ecore_file_exists("/etc/pam.d/system-auth"))
pam_prof = "system-auth"; pam_prof = "system-auth";
else if (ecore_file_exists("/etc/pam.d/system")) else if (ecore_file_exists("/etc/pam.d/system"))
pam_prof = "system"; pam_prof = "system";
else if (ecore_file_exists("/etc/pam.d/xdm")) else if (ecore_file_exists("/etc/pam.d/xdm"))
pam_prof = "xdm"; pam_prof = "xdm";
@ -814,7 +810,7 @@ _desklock_pam_init(E_Desklock_Auth *da)
pam_prof = "gdm"; pam_prof = "gdm";
else if (ecore_file_exists("/etc/pam.d/kdm")) else if (ecore_file_exists("/etc/pam.d/kdm"))
pam_prof = "kdm"; pam_prof = "kdm";
if ((pamerr = pam_start(pam_prof, da->user, &(da->pam.conv), if ((pamerr = pam_start(pam_prof, da->user, &(da->pam.conv),
&(da->pam.handle))) != PAM_SUCCESS) &(da->pam.handle))) != PAM_SUCCESS)
return pamerr; return pamerr;
@ -826,7 +822,7 @@ _desklock_pam_init(E_Desklock_Auth *da)
free(current_user); free(current_user);
return pamerr; return pamerr;
} }
current_host = _desklock_auth_get_current_host(); current_host = _desklock_auth_get_current_host();
if ((pamerr = pam_set_item(da->pam.handle, PAM_RHOST, current_host)) != PAM_SUCCESS) if ((pamerr = pam_set_item(da->pam.handle, PAM_RHOST, current_host)) != PAM_SUCCESS)
{ {
@ -834,7 +830,7 @@ _desklock_pam_init(E_Desklock_Auth *da)
free(current_host); free(current_host);
return pamerr; return pamerr;
} }
free(current_user); free(current_user);
free(current_host); free(current_host);
return 0; return 0;
@ -846,12 +842,12 @@ _desklock_auth_pam_conv(int num_msg, const struct pam_message **msg, struct pam_
int replies = 0; int replies = 0;
E_Desklock_Auth *da = (E_Desklock_Auth *)appdata_ptr; E_Desklock_Auth *da = (E_Desklock_Auth *)appdata_ptr;
struct pam_response *reply = NULL; struct pam_response *reply = NULL;
reply = (struct pam_response *)malloc(sizeof(struct pam_response) *num_msg); reply = (struct pam_response *)malloc(sizeof(struct pam_response) *num_msg);
if (!reply) if (!reply)
return PAM_CONV_ERR; return PAM_CONV_ERR;
for (replies = 0; replies < num_msg; replies++) for (replies = 0; replies < num_msg; replies++)
{ {
switch (msg[replies]->msg_style) switch (msg[replies]->msg_style)
@ -886,25 +882,23 @@ _desklock_auth_get_current_host(void)
#endif #endif
static int static int
_e_desklock_cb_custom_desklock_exit(void *data, int type, void *event) _e_desklock_cb_custom_desklock_exit(void *data __UNUSED__, int type __UNUSED__, void *event)
{ {
Ecore_Exe_Event_Del *ev; Ecore_Exe_Event_Del *ev = event;
ev = event;
if (ev->exe != _e_custom_desklock_exe) return 1; if (ev->exe != _e_custom_desklock_exe) return 1;
if (ev->exit_code != 0) if (ev->exit_code != 0)
{ {
/* do something profound here... like notify someone */ /* do something profound here... like notify someone */
} }
e_desklock_hide(); e_desklock_hide();
return 0; return 0;
} }
static int static int
_e_desklock_cb_idle_poller(void *data) _e_desklock_cb_idle_poller(void *data __UNUSED__)
{ {
if ((e_config->desklock_autolock_idle) && (!e_config->mode.presentation)) if ((e_config->desklock_autolock_idle) && (!e_config->mode.presentation))
{ {
@ -923,11 +917,11 @@ _e_desklock_cb_idle_poller(void *data)
{ {
/* /*
* Unfortunately, not all "desklocks" stay up for as long as * Unfortunately, not all "desklocks" stay up for as long as
* the user is idle or until it is unlocked. * the user is idle or until it is unlocked.
* *
* 'xscreensaver-command -lock' for example sends a command * 'xscreensaver-command -lock' for example sends a command
* to xscreensaver and then terminates. So, we have another * to xscreensaver and then terminates. So, we have another
* check (_e_desklock_user_idle) which lets us know that we * check (_e_desklock_user_idle) which lets us know that we
* have locked the screen due to idleness. * have locked the screen due to idleness.
*/ */
if (!_e_desklock_user_idle) if (!_e_desklock_user_idle)
@ -1043,9 +1037,7 @@ _e_desklock_ask_presentation_mode(void)
_e_desklock_ask_presentation_no_forever, NULL); _e_desklock_ask_presentation_no_forever, NULL);
e_dialog_button_focus_num(dia, 0); e_dialog_button_focus_num(dia, 0);
e_dialog_resizable_set(dia, 1);
e_widget_list_homogeneous_set(dia->box_object, 0); e_widget_list_homogeneous_set(dia->box_object, 0);
e_util_win_auto_resize_fill(dia->win);
e_win_centered_set(dia->win, 1); e_win_centered_set(dia->win, 1);
e_dialog_show(dia); e_dialog_show(dia);

2
src/bin/e_screensaver.c
View File

@ -114,9 +114,7 @@ _e_screensaver_ask_presentation_mode(void)
_e_screensaver_ask_presentation_no_forever, NULL); _e_screensaver_ask_presentation_no_forever, NULL);
e_dialog_button_focus_num(dia, 0); e_dialog_button_focus_num(dia, 0);
e_dialog_resizable_set(dia, 1);
e_widget_list_homogeneous_set(dia->box_object, 0); e_widget_list_homogeneous_set(dia->box_object, 0);
e_util_win_auto_resize_fill(dia->win);
e_win_centered_set(dia->win, 1); e_win_centered_set(dia->win, 1);
e_dialog_show(dia); e_dialog_show(dia);