enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 25 Pull Requests 2 Projects Releases Wiki Activity

Formatting. 

SVN revision: 27633
This commit is contained in:
Sebastian Dransfeld 2006-12-29 05:42:04 +00:00
parent c231a0ea8e
commit 26296cdb16
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/bin/e_desklock.c
View File

@ -1,3 +1,6 @@
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
*/
#include "e.h" #include "e.h"
#ifdef HAVE_PAM #ifdef HAVE_PAM
# include <security/pam_appl.h> # include <security/pam_appl.h>
@ -88,7 +91,7 @@ e_desklock_init(void)
if (e_config->desklock_use_timeout) if (e_config->desklock_use_timeout)
ecore_x_screensaver_timeout_set(e_config->desklock_timeout); ecore_x_screensaver_timeout_set(e_config->desklock_timeout);
} }
/* /*
* Effectively hide the X screensaver yet allow * Effectively hide the X screensaver yet allow
* it to generate the timer events for us. * it to generate the timer events for us.
@ -97,7 +100,7 @@ e_desklock_init(void)
ecore_x_screensaver_expose_set(!e_config->desklock_use_custom_screensaver); ecore_x_screensaver_expose_set(!e_config->desklock_use_custom_screensaver);
if (e_config->desklock_background) if (e_config->desklock_background)
e_filereg_register(e_config->desklock_background); e_filereg_register(e_config->desklock_background);
return 1; return 1;
} }
@ -107,7 +110,7 @@ e_desklock_shutdown(void)
{ {
e_desklock_hide(); e_desklock_hide();
if (e_config->desklock_background) if (e_config->desklock_background)
e_filereg_deregister(e_config->desklock_background); e_filereg_deregister(e_config->desklock_background);
return 1; return 1;
} }
@ -315,7 +318,7 @@ e_desklock_show(void)
edd->elock_wnd_list = evas_list_append(edd->elock_wnd_list, edp); edd->elock_wnd_list = evas_list_append(edd->elock_wnd_list, edp);
} }
zone_counter ++; zone_counter++;
} }
} }
} }
@ -351,10 +354,10 @@ e_desklock_hide(void)
if ((!edd) && (!_e_custom_saver_exe)) return; if ((!edd) && (!_e_custom_saver_exe)) return;
if (e_config->desklock_use_custom_screensaver) if (e_config->desklock_use_custom_screensaver)
{ {
_e_custom_saver_exe = NULL; _e_custom_saver_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);
@ -776,9 +779,9 @@ _e_desklock_cb_custom_saver_exit(void *data, int type, void *event)
if (ev->exe != _e_custom_saver_exe) return 1; if (ev->exe != _e_custom_saver_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 */
} }
/* /*
* Miserable HACK alert!!! * Miserable HACK alert!!!

2
src/bin/e_manager.c
View File

@ -755,7 +755,7 @@ _e_manager_cb_screensaver_notify(void *data, int ev_type __UNUSED__, void *ev)
if (e->on) if (e->on)
{ {
if ((e_config->desklock_autolock) || (e_config->desklock_use_custom_screensaver)) if ((e_config->desklock_autolock) || (e_config->desklock_use_custom_screensaver))
e_desklock_show(); e_desklock_show();
} }
return 1; return 1;
} }