[PATCH 6/7] shell: use a more suggestive name
Tiago Vignatti
tiago.vignatti at intel.com
Fri Feb 24 08:08:44 PST 2012
Signed-off-by: Tiago Vignatti <tiago.vignatti at intel.com>
---
src/shell.c | 6 +++---
weston-desktop-shell.ini | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/shell.c b/src/shell.c
index 270f789..0029a1e 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -148,13 +148,13 @@ shell_configuration(struct wl_shell *shell)
{
char *config_file;
char *path = NULL;
- int duration = 60;
+ int display_off = 60;
int screensaver = 300;
struct config_key saver_keys[] = {
{ "path", CONFIG_KEY_STRING, &path },
{ "screensaver", CONFIG_KEY_INTEGER, &screensaver },
- { "duration", CONFIG_KEY_INTEGER, &duration },
+ { "display-off", CONFIG_KEY_INTEGER, &display_off },
};
struct config_section cs[] = {
@@ -166,7 +166,7 @@ shell_configuration(struct wl_shell *shell)
free(config_file);
shell->screensaver.path = path;
- shell->screensaver.duration = duration;
+ shell->screensaver.duration = display_off;
weston_timer_init(shell->compositor, idle_handler, screensaver);
}
diff --git a/weston-desktop-shell.ini b/weston-desktop-shell.ini
index 01289a8..72486bc 100644
--- a/weston-desktop-shell.ini
+++ b/weston-desktop-shell.ini
@@ -23,5 +23,5 @@ path=./clients/flower
[screensaver]
#path=./clients/wscreensaver
screensaver=300
-duration=600
+display-off=600
--
1.7.5.4
More information about the wayland-devel
mailing list