Update of /cvsroot/tmux/tmux
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv20790

Modified Files:
        cmd-kill-session.c server-fn.c 
Log Message:
Sync OpenBSD patchset 728:

Use server_destroy_session() for kill-session.


Index: server-fn.c
===================================================================
RCS file: /cvsroot/tmux/tmux/server-fn.c,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -d -r1.106 -r1.107
--- server-fn.c 22 Jun 2010 23:26:18 -0000      1.106
+++ server-fn.c 2 Jul 2010 02:43:50 -0000       1.107
@@ -371,6 +371,7 @@
                c->session = NULL;
                server_write_client(c, MSG_EXIT, NULL, 0);
        }
+       recalculate_sizes();
 }
 
 void

Index: cmd-kill-session.c
===================================================================
RCS file: /cvsroot/tmux/tmux/cmd-kill-session.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- cmd-kill-session.c  4 Dec 2009 22:14:47 -0000       1.17
+++ cmd-kill-session.c  2 Jul 2010 02:43:50 -0000       1.18
@@ -45,21 +45,11 @@
 {
        struct cmd_target_data  *data = self->data;
        struct session          *s;
-       struct client           *c;
-       u_int                    i;
 
        if ((s = cmd_find_session(ctx, data->target)) == NULL)
                return (-1);
 
-       for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
-               c = ARRAY_ITEM(&clients, i);
-               if (c != NULL && c->session == s) {
-                       c->session = NULL;
-                       server_write_client(c, MSG_EXIT, NULL, 0);
-               }
-       }
-       recalculate_sizes();
-
+       server_destroy_session(s);
        session_destroy(s);
 
        return (0);


------------------------------------------------------------------------------
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
_______________________________________________
tmux-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tmux-cvs

Reply via email to