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

View File

@ -454,11 +454,9 @@ e_desklock_hide(void)
}
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;
ev = event;
Ecore_Event_Key *ev = event;
if (ev->window != edd->elock_wnd || edd->state == E_DESKLOCK_STATE_CHECKING) return 1;
if (!strcmp(ev->key, "Escape"))
@ -490,25 +488,25 @@ _e_desklock_cb_key_down(void *data, int type, void *event)
}
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;
}
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;
}
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;
}
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_Zone *current_zone;
@ -667,11 +665,9 @@ _e_desklock_state_set(int state)
#ifdef HAVE_PAM
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;
ev = event;
Ecore_Exe_Event_Del *ev = event;
if (ev->pid == _e_desklock_child_pid)
{
_e_desklock_child_pid = -1;
@ -886,11 +882,9 @@ _desklock_auth_get_current_host(void)
#endif
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;
ev = event;
Ecore_Exe_Event_Del *ev = event;
if (ev->exe != _e_custom_desklock_exe) return 1;
if (ev->exit_code != 0)
@ -904,7 +898,7 @@ _e_desklock_cb_custom_desklock_exit(void *data, int type, void *event)
}
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))
{
@ -1043,9 +1037,7 @@ _e_desklock_ask_presentation_mode(void)
_e_desklock_ask_presentation_no_forever, NULL);
e_dialog_button_focus_num(dia, 0);
e_dialog_resizable_set(dia, 1);
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_dialog_show(dia);

View File

@ -114,9 +114,7 @@ _e_screensaver_ask_presentation_mode(void)
_e_screensaver_ask_presentation_no_forever, NULL);
e_dialog_button_focus_num(dia, 0);
e_dialog_resizable_set(dia, 1);
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_dialog_show(dia);