From 675def039652e69d8fd5f229eff2128116e1d328 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Fri, 28 Aug 2015 12:31:55 +0000
Subject: Remove the lock-server option which is a bit redundant, it isn't that
 different without it.

---
 server.c | 27 +--------------------------
 1 file changed, 1 insertion(+), 26 deletions(-)

(limited to 'server.c')

diff --git a/server.c b/server.c
index d39e3f56..f9b0dc52 100644
--- a/server.c
+++ b/server.c
@@ -64,7 +64,6 @@ void	server_child_signal(void);
 void	server_child_exited(pid_t, int);
 void	server_child_stopped(pid_t, int);
 void	server_second_callback(int, short, void *);
-void	server_lock_server(void);
 void	server_lock_sessions(void);
 
 /* Set marked pane. */
@@ -506,10 +505,7 @@ server_second_callback(unused int fd, unused short events, unused void *arg)
 {
 	struct timeval		 tv;
 
-	if (options_get_number(&global_s_options, "lock-server"))
-		server_lock_server();
-	else
-		server_lock_sessions();
+	server_lock_sessions();
 
 	evtimer_del(&server_ev_second);
 	memset(&tv, 0, sizeof tv);
@@ -517,27 +513,6 @@ server_second_callback(unused int fd, unused short events, unused void *arg)
 	evtimer_add(&server_ev_second, &tv);
 }
 
-/* Lock the server if ALL sessions have hit the time limit. */
-void
-server_lock_server(void)
-{
-	struct session  *s;
-	int		 timeout;
-	time_t           t;
-
-	t = time(NULL);
-	RB_FOREACH(s, sessions, &sessions) {
-		if (s->flags & SESSION_UNATTACHED)
-			continue;
-		timeout = options_get_number(&s->options, "lock-after-time");
-		if (timeout <= 0 || t <= s->activity_time.tv_sec + timeout)
-			return;	/* not timed out */
-	}
-
-	server_lock();
-	recalculate_sizes();
-}
-
 /* Lock any sessions which have timed out. */
 void
 server_lock_sessions(void)
-- 
cgit