vte r2151 - in trunk: . gnome-pty-helper

[chpe svn gnome org]

Author: chpe
Date: Tue Nov 18 14:10:30 2008
New Revision: 2151
URL: http://svn.gnome.org/viewvc/vte?rev=2151&view=rev

Log:
Remove glib from gnome-pty-helper. Bug #560977.

Modified:
   trunk/ChangeLog
   trunk/gnome-pty-helper/Makefile.am
   trunk/gnome-pty-helper/configure.in
   trunk/gnome-pty-helper/gnome-pty-helper.c

Modified: trunk/gnome-pty-helper/Makefile.am
==============================================================================
--- trunk/gnome-pty-helper/Makefile.am	(original)
+++ trunk/gnome-pty-helper/Makefile.am	Tue Nov 18 14:10:30 2008
@@ -1,8 +1,5 @@
 libexec_PROGRAMS = gnome-pty-helper
 
-AM_CFLAGS = $(GLIB_CFLAGS)
-AM_LDFLAGS = $(LDFLAGS) $(GLIB_LIBS)
-
 gnome_pty_helper_SOURCES = \
 	gnome-pty.h \
 	gnome-login-support.c \

Modified: trunk/gnome-pty-helper/configure.in
==============================================================================
--- trunk/gnome-pty-helper/configure.in	(original)
+++ trunk/gnome-pty-helper/configure.in	Tue Nov 18 14:10:30 2008
@@ -1,6 +1,9 @@
-AC_INIT(gnome-pty.h)
+AC_INIT([gnome-pty-helper],[1.95.0],[http://bugzilla.gnome.org/enter_bug.cgi?product=vte])
 
-AM_INIT_AUTOMAKE(gnome-pty-helper,1.95.0)
+AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-bzip2])
+
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_SRCDIR([gnome-pty.h])
 
 AC_ISC_POSIX
 AC_PROG_CC
@@ -9,7 +12,6 @@
 
 AM_MAINTAINER_MODE
 
-PKG_CHECK_MODULES(GLIB,glib-2.0)
 AC_CHECK_HEADERS(sys/syslimits.h sys/time.h sys/types.h sys/un.h alloca.h lastlog.h libutil.h paths.h pty.h stropts.h termios.h ttyent.h util.h utmp.h utmpx.h pty.h util.h libutil.h ttyent.h)
 have_openpty=0
 AC_CHECK_LIB(c,grantpt,true,[AC_CHECK_LIB(pt,grantpt)])
@@ -40,6 +42,6 @@
 	;;
 esac
 
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_FILES([Makefile])
 
-AC_OUTPUT(Makefile)
+AC_OUTPUT

Modified: trunk/gnome-pty-helper/gnome-pty-helper.c
==============================================================================
--- trunk/gnome-pty-helper/gnome-pty-helper.c	(original)
+++ trunk/gnome-pty-helper/gnome-pty-helper.c	Tue Nov 18 14:10:30 2008
@@ -53,7 +53,6 @@
 #include <stdio.h>
 #include <utmp.h>
 #include <grp.h>
-#include <glib/galloca.h>
 #include "gnome-pty.h"
 #include "gnome-login-support.h"
 
@@ -476,7 +475,7 @@
 	struct group *group_info;
 	struct termios term;
 
-	term_name = (char *) g_alloca (path_max () + 1);
+	term_name = (char *) alloca (path_max () + 1);
 
 	if (term_name == NULL) {
 		exit (1);
@@ -658,12 +657,12 @@
 	}
 }
 
-static volatile gboolean done;
+static volatile int done;
 
 static void
 exit_handler (int signum)
 {
-	done = TRUE;
+	done = 1;
 }
 
 
@@ -702,7 +701,7 @@
 	if (!display_name)
 		display_name = "localhost";
 
-	done = FALSE;
+	done = 0;
 
 	/* Make sure we clean up utmp/wtmp even under vncserver */
 	signal (SIGHUP, exit_handler);
@@ -715,7 +714,7 @@
 		res = n_read (STDIN_FILENO, &op, sizeof (op));
 
 		if (res != sizeof (op)) {
-			done = TRUE;
+			done = 1;
 			continue;
 		}