vte r2087 - in trunk: . src

[cpwilson svn gnome org]

Author: cpwilson
Date: Fri Aug 15 20:11:58 2008
New Revision: 2087
URL: http://svn.gnome.org/viewvc/vte?rev=2087&view=rev

Log:
2008-08-15  Chris Wilson  <chris chris-wilson co uk>

	* src/vte.c (vte_terminal_set_pty):
	fcntl(2) specifies that the flags argument is a long. Make it so.



Modified:
   trunk/ChangeLog
   trunk/src/vte.c

Modified: trunk/src/vte.c
==============================================================================
--- trunk/src/vte.c	(original)
+++ trunk/src/vte.c	Fri Aug 15 20:11:58 2008
@@ -12441,9 +12441,9 @@
 void
 vte_terminal_set_pty(VteTerminal *terminal, int pty_master)
 {
-       guint i;
+       long flags;
 
-       g_return_if_fail(VTE_IS_TERMINAL(terminal));
+       g_return_if_fail (VTE_IS_TERMINAL (terminal));
 
        if (pty_master == terminal->pvt->pty_master) {
 	       return;
@@ -12453,8 +12453,8 @@
 	       g_io_channel_unref (terminal->pvt->pty_channel);
        }
        if (terminal->pvt->pty_master != -1) {
-               _vte_pty_close(terminal->pvt->pty_master);
-               close(terminal->pvt->pty_master);
+               _vte_pty_close (terminal->pvt->pty_master);
+               close (terminal->pvt->pty_master);
        }
        terminal->pvt->pty_master = pty_master;
        terminal->pvt->pty_channel = g_io_channel_unix_new (pty_master);
@@ -12462,19 +12462,19 @@
 
 
        /* Set the pty to be non-blocking. */
-       i = fcntl(terminal->pvt->pty_master, F_GETFL);
-       if ((i & O_NONBLOCK) == 0) {
-	       fcntl(terminal->pvt->pty_master, F_SETFL, i | O_NONBLOCK);
+       flags = fcntl (terminal->pvt->pty_master, F_GETFL);
+       if ((flags & O_NONBLOCK) == 0) {
+	       fcntl (terminal->pvt->pty_master, F_SETFL, flags | O_NONBLOCK);
        }
 
-       vte_terminal_set_size(terminal,
-                             terminal->column_count,
-                             terminal->row_count);
+       vte_terminal_set_size (terminal,
+                              terminal->column_count,
+                              terminal->row_count);
 
-       _vte_terminal_setup_utf8(terminal);
+       _vte_terminal_setup_utf8 (terminal);
 
        /* Open channels to listen for input on. */
-       _vte_terminal_connect_pty_read(terminal);
+       _vte_terminal_connect_pty_read (terminal);
 }
 
 /* We need this bit of glue to ensure that accessible objects will always