Merge from trunk

(bzr r9508.1.89)

2 files changed, 33 insertions, 19 deletions

diff --git a/src/io/CMakeLists.txt b/src/io/CMakeLists.txt
index 13b8f568b..c5606779e 100644
--- a/src/io/CMakeLists.txt
+++ b/src/io/CMakeLists.txt
@@ -1,16 +1,32 @@
-SET(io_SRC
-base64stream.cpp
-ftos.cpp
-gzipstream.cpp
-inkscapestream.cpp
-resource.cpp
-simple-sax.cpp
-#streamtest.cpp
-stringstream.cpp
-sys.cpp
-uristream.cpp
-xsltstream.cpp
+
+set(io_SRC
+	base64stream.cpp
+	ftos.cpp
+	gzipstream.cpp
+	inkjar.cpp
+	inkscapestream.cpp
+	resource.cpp
+	simple-sax.cpp
+	stringstream.cpp
+	sys.cpp
+	uristream.cpp
+	xsltstream.cpp
+
+
+	# -------
+	# Headers
+	base64stream.h
+	ftos.h
+	gzipstream.h
+	inkjar.h
+	inkscapestream.h
+	resource.h
+	simple-sax.h
+	stringstream.h
+	sys.h
+	uristream.h
+	xsltstream.h
 )
-ADD_LIBRARY(io STATIC ${io_SRC})
-TARGET_LINK_LIBRARIES(io
-2geom ${INKSCAPE_LIBS})
\ No newline at end of file
+
+# add_inkscape_lib(io_LIB "${io_SRC}")
+add_inkscape_source("${io_SRC}")
diff --git a/src/io/sys.cpp b/src/io/sys.cpp
index 198be94e6..437a9d18c 100644
--- a/src/io/sys.cpp
+++ b/src/io/sys.cpp
@@ -19,11 +19,9 @@
 #include <glib/gstdio.h>
 #include <glib/gutils.h>
 #include <glibmm/fileutils.h>
-#if GLIB_CHECK_VERSION(2,6,0)
-    #include <glib/gstdio.h>
-#endif
+#include <glib/gstdio.h>
 #include <glibmm/ustring.h>
-#include <gtk/gtkmessagedialog.h>
+#include <gtk/gtk.h>
 
 #include "preferences.h"
 #include "sys.h"