Merge branch 'master' of https://code.google.com/p/svte

2 files changed, 3 insertions, 3 deletions

diff --git a/config.mk b/config.mk
index bf83dc0..0885e1d 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 d75334f..7258663 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>
@@ -596,7 +596,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;
   }