From 57cc4d45d52e0af562172ac4044f311e1bb00c64 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Fri, 28 Aug 2015 13:01:03 +0000
Subject: Make session_update_activity more useful and use it in more places.

---
 tmux.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tmux.h')

diff --git a/tmux.h b/tmux.h
index 9fae33bd..cc38dab8 100644
--- a/tmux.h
+++ b/tmux.h
@@ -2248,7 +2248,7 @@ struct session	*session_create(const char *, int, char **, const char *,
 void		 session_destroy(struct session *);
 void		 session_unref(struct session *);
 int		 session_check_name(const char *);
-void		 session_update_activity(struct session *);
+void		 session_update_activity(struct session *, struct timeval *);
 struct session	*session_next_session(struct session *);
 struct session	*session_previous_session(struct session *);
 struct winlink	*session_new(struct session *, const char *, int, char **,
-- 
cgit 


From f6a0f8730efab9c52eaccbb62b5b1d27e8be7949 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Fri, 28 Aug 2015 13:12:20 +0000
Subject: Per-session timers for locking, and remove the global one-second
 timer.

---
 tmux.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'tmux.h')

diff --git a/tmux.h b/tmux.h
index cc38dab8..6ac0b578 100644
--- a/tmux.h
+++ b/tmux.h
@@ -993,6 +993,8 @@ struct session {
 	struct timeval	 activity_time;
 	struct timeval	 last_activity_time;
 
+	struct event	 lock_timer;
+
 	u_int		 sx;
 	u_int		 sy;
 
-- 
cgit