Merge lp:~ballogy/gloobus-preview/fix-threading into lp:gloobus-preview

[Balló György]

Avoid X11 threading errors

Without calling XInitThreads, videos crash the application occasionally, when open them. More info:
http://stackoverflow.com/questions/18647475/threading-problems-with-gtk

=== modified file 'configure.ac'
--- configure.ac	2012-05-13 19:48:02 +0000
+++ configure.ac	2014-12-22 06:35:31 +0000
@@ -55,6 +55,7 @@
 PKG_CHECK_MODULES(FREETYPE,freetype2)
 PKG_CHECK_MODULES(GLIB, glib-2.0)
 PKG_CHECK_MODULES(DBUS, dbus-glib-1)
+PKG_CHECK_MODULES(X11, x11)
 
 PKG_CHECK_MODULES(GMODULE, gmodule-2.0)           # To compile XCF loader
 PKG_CHECK_MODULES(GDKPIXBUF, gdk-pixbuf-2.0)      # To compile XCF loader
 
=== modified file 'src/Makefile.am'
--- src/Makefile.am	2011-11-01 02:03:33 +0000
+++ src/Makefile.am	2014-12-22 06:35:31 +0000
@@ -26,6 +26,7 @@
 	$(GTKSOURCEVIEW_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(DBUS_CFLAGS) \
+	$(X11_CFLAGS) \
 	$(BOOST_CPPFLAGS)
 
 AM_LDADD = \
@@ -36,6 +37,7 @@
 	$(GTKSOURCEVIEW_LIBS) \
 	$(GLIB_LIBS) \
 	$(DBUS_LIBS) \
+	$(X11_LIBS) \
 	-ldl
 
 bin_PROGRAMS = gloobus-preview
 
=== modified file 'src/gloobus-preview-main.cpp'
--- src/gloobus-preview-main.cpp	2010-05-16 12:33:24 +0000
+++ src/gloobus-preview-main.cpp	2014-12-22 06:35:31 +0000
@@ -43,6 +43,7 @@
 
 	//g_thread_init(NULL);
 	//gdk_threads_init();
+	XInitThreads();
 	gtk_init (&argc, &argv);
 	//gtk_rc_parse(PACKAGE_DATA_PATH "/gtkrc/customgtk.rc");
 
 
=== modified file 'src/gloobus-preview-singleton.h'
--- src/gloobus-preview-singleton.h	2011-10-30 20:42:38 +0000
+++ src/gloobus-preview-singleton.h	2014-12-22 06:35:31 +0000
@@ -35,6 +35,7 @@
 #include <vector>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
+#include <X11/Xlib.h>
 
 #include "gloobus-preview-config.h"
 #include "gloobus-preview-defines.h"