summaryrefslogtreecommitdiffstats
path: root/redhat/tdelibs/kdelibs-3.5.13-fix_x11_threading_when_kinit_is_used.patch
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-10-06 12:16:27 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-10-06 12:16:27 -0500
commitecd088049d4aa2e8262f4cc1e0ac45e135964229 (patch)
tree49ed22e9e7852fd3f26854aecf41c96169d59629 /redhat/tdelibs/kdelibs-3.5.13-fix_x11_threading_when_kinit_is_used.patch
parent855439d3f99b0c152c33ae76a06cce9853f9b8dd (diff)
parent01a7863524342e1aec31679e55d08830cc571066 (diff)
downloadtde-packaging-ecd088049d4aa2e8262f4cc1e0ac45e135964229.tar.gz
tde-packaging-ecd088049d4aa2e8262f4cc1e0ac45e135964229.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'redhat/tdelibs/kdelibs-3.5.13-fix_x11_threading_when_kinit_is_used.patch')
-rw-r--r--redhat/tdelibs/kdelibs-3.5.13-fix_x11_threading_when_kinit_is_used.patch20
1 files changed, 0 insertions, 20 deletions
diff --git a/redhat/tdelibs/kdelibs-3.5.13-fix_x11_threading_when_kinit_is_used.patch b/redhat/tdelibs/kdelibs-3.5.13-fix_x11_threading_when_kinit_is_used.patch
deleted file mode 100644
index 1cdb91958..000000000
--- a/redhat/tdelibs/kdelibs-3.5.13-fix_x11_threading_when_kinit_is_used.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-commit 6c806af1c99890adecb42abf52f4d6dc8ae72899
-Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Date: 1337556266 -0500
-
- Initialize X11 threading when kinit is used to launch a program
- This closes Bug 812
- Thanks to Slávek Banko for the patch!
-
-diff --git a/kinit/kinit.cpp b/kinit/kinit.cpp
-index 2a74368..191757d 100644
---- a/kinit/kinit.cpp
-+++ b/kinit/kinit.cpp
-@@ -1615,6 +1615,7 @@ int tdeinit_x_errhandler( Display *dpy, XErrorEvent *err )
- // another X connection for startup notification purposes
- static void setupX()
- {
-+ XInitThreads();
- XSetIOErrorHandler(kdeinit_xio_errhandler);
- XSetErrorHandler(kdeinit_x_errhandler);
- }