From 520061e312d18fae76e3e42209aa1274867c211a Mon Sep 17 00:00:00 2001
From: Wouter Van Rooy <wouter.van.rooy@vasco.com>
Date: Wed, 6 Mar 2013 13:24:49 +0100
Subject: Fixed warning for comparing int and pointer.

Window_width and _height are int. So should be compared to 0 instead of NULL
---
 svte.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/svte.c b/svte.c
index 263a59d..22cdbcc 100644
--- a/svte.c
+++ b/svte.c
@@ -572,7 +572,7 @@ static void parse_config_file(gchar *config_file) {
     config->font = DEFAULT_FONT;
   }
 
-  if (NULL == config->window_width || NULL == config->window_height) {
+  if (0 == config->window_width || 0 == config->window_height) {
     config->window_width = DEFAULT_WINDOW_WIDTH;
     config->window_height = DEFAULT_WINDOW_HEIGHT;
   }
-- 
cgit v1.2.1


From dc5db198cc3f2b5cb867f1be06726a477b13b341 Mon Sep 17 00:00:00 2001
From: Wouter Van Rooy <wouter.vanrooy@gmail.com>
Date: Mon, 2 Sep 2013 22:07:35 +0200
Subject: Fix error Only <glib.h> can be included directly.

New version of Glib no longer allows to include headers from its subdirectories.
---
 config.mk | 2 +-
 svte.c    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config.mk b/config.mk
index e6b173a..29d7470 100644
--- a/config.mk
+++ b/config.mk
@@ -27,7 +27,7 @@ MANPREFIX = ${PREFIX}/share/man
 
 
 # includes and libs
-GTKINC=$(shell pkg-config --cflags gtk+-2.0 vte )
+GTKINC=$(shell pkg-config --cflags gtk+-2.0 vte glib-2.0)
 GTKLIB=-lvte
 
 INCS = -I. -I/usr/include ${GTKINC}
diff --git a/svte.c b/svte.c
index 22cdbcc..f6bd7af 100644
--- a/svte.c
+++ b/svte.c
@@ -19,7 +19,7 @@
 
 #include "defaults.h"
 #include <gdk/gdkkeysyms.h>
-#include <glib/goption.h>
+#include <glib.h>
 #include <gtk/gtk.h>
 #include <vte/vte.h>
 #include <unistd.h>
-- 
cgit v1.2.1