gloobus-preview

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

  1. fix-threading
  2. Merge into last_working_branch
Proposed by Balló György
Status: Merged
Merged at revision: 295
Proposed branch: lp:~ballogy/gloobus-preview/fix-threading
Merge into: lp:gloobus-preview
Diff against target: 55 lines (+5/-0)
4 files modified
configure.ac (+1/-0)
src/Makefile.am (+2/-0)
src/gloobus-preview-main.cpp (+1/-0)
src/gloobus-preview-singleton.h (+1/-0)
To merge this branch: bzr merge lp:~ballogy/gloobus-preview/fix-threading
Reviewer Review Type Date Requested Status
Gloobus Developers Pending
Review via email: mp+245305@code.launchpad.net

Description of the change

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

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure.ac'
2--- configure.ac 2012-05-13 19:48:02 +0000
3+++ configure.ac 2014-12-22 06:35:31 +0000
4@@ -55,6 +55,7 @@
5 PKG_CHECK_MODULES(FREETYPE,freetype2)
6 PKG_CHECK_MODULES(GLIB, glib-2.0)
7 PKG_CHECK_MODULES(DBUS, dbus-glib-1)
8+PKG_CHECK_MODULES(X11, x11)
9
10 PKG_CHECK_MODULES(GMODULE, gmodule-2.0) # To compile XCF loader
11 PKG_CHECK_MODULES(GDKPIXBUF, gdk-pixbuf-2.0) # To compile XCF loader
12
13=== modified file 'src/Makefile.am'
14--- src/Makefile.am 2011-11-01 02:03:33 +0000
15+++ src/Makefile.am 2014-12-22 06:35:31 +0000
16@@ -26,6 +26,7 @@
17 $(GTKSOURCEVIEW_CFLAGS) \
18 $(GLIB_CFLAGS) \
19 $(DBUS_CFLAGS) \
20+ $(X11_CFLAGS) \
21 $(BOOST_CPPFLAGS)
22
23 AM_LDADD = \
24@@ -36,6 +37,7 @@
25 $(GTKSOURCEVIEW_LIBS) \
26 $(GLIB_LIBS) \
27 $(DBUS_LIBS) \
28+ $(X11_LIBS) \
29 -ldl
30
31 bin_PROGRAMS = gloobus-preview
32
33=== modified file 'src/gloobus-preview-main.cpp'
34--- src/gloobus-preview-main.cpp 2010-05-16 12:33:24 +0000
35+++ src/gloobus-preview-main.cpp 2014-12-22 06:35:31 +0000
36@@ -43,6 +43,7 @@
37
38 //g_thread_init(NULL);
39 //gdk_threads_init();
40+ XInitThreads();
41 gtk_init (&argc, &argv);
42 //gtk_rc_parse(PACKAGE_DATA_PATH "/gtkrc/customgtk.rc");
43
44
45=== modified file 'src/gloobus-preview-singleton.h'
46--- src/gloobus-preview-singleton.h 2011-10-30 20:42:38 +0000
47+++ src/gloobus-preview-singleton.h 2014-12-22 06:35:31 +0000
48@@ -35,6 +35,7 @@
49 #include <vector>
50 #include <gtk/gtk.h>
51 #include <gdk/gdkkeysyms.h>
52+#include <X11/Xlib.h>
53
54 #include "gloobus-preview-config.h"
55 #include "gloobus-preview-defines.h"

Subscribers

People subscribed via source and target branches