vte r2044 - in trunk: . src

[kmaraas svn gnome org]

Author: kmaraas
Date: Mon May 19 13:07:31 2008
New Revision: 2044
URL: http://svn.gnome.org/viewvc/vte?rev=2044&view=rev

Log:
2008-05-19  Kjartan Maraas  <kmaraas gnome org>

	* configure.in: automake doesn't like to substitute more
	than one variable at a time.
	* src/vtedraw.c: (_vte_draw_get_using_fontconfig):
	* src/vtetc.c: (_vte_termcap_find_boolean):
	Fix two compiler warnings.

Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/src/vtedraw.c
   trunk/src/vtetc.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Mon May 19 13:07:31 2008
@@ -214,7 +214,8 @@
 		X_LIBS="-L$ac_x_libraries $X_LIBS"
 	fi
 fi
-AC_SUBST([X_CFLAGS X_LIBS])
+AC_SUBST([X_CFLAGS])
+AC_SUBST([X_LIBS])
 
 
 

Modified: trunk/src/vtedraw.c
==============================================================================
--- trunk/src/vtedraw.c	(original)
+++ trunk/src/vtedraw.c	Mon May 19 13:07:31 2008
@@ -327,7 +327,7 @@
 gboolean
 _vte_draw_get_using_fontconfig (struct _vte_draw *draw)
 {
-	g_return_val_if_fail (draw->impl != NULL, 1);
+	g_return_val_if_fail (draw->impl != NULL, TRUE);
 	g_return_val_if_fail (draw->impl->get_using_fontconfig != NULL, FALSE);
 	return draw->impl->get_using_fontconfig (draw);
 }

Modified: trunk/src/vtetc.c
==============================================================================
--- trunk/src/vtetc.c	(original)
+++ trunk/src/vtetc.c	Mon May 19 13:07:31 2008
@@ -323,7 +323,7 @@
   const char *result = _vte_termcap_find_start (termcap, tname, cap);
 
   if (result == NULL)
-    return 0;
+    return FALSE;
 
   result += 2;