← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/synergy/oneiric

« back to all changes in this revision

Viewing changes to debian/ubuntu-applied-patches/call_xinitthreads.patch

  • Committer: Bazaar Package Importer
  • Author(s): Andreas Wenning
  • Date: 2009-05-08 22:36:26 UTC
  • mfrom: (2.1.4 sid)
  • Revision ID: james.westby@ubuntu.com-20090508223626-s9d7i1i31c6gouxp
Tags: 1.3.1-6ubuntu1
* Merge from debian unstable, remaining changes:
  - debian/rules: disable FORTIFY, since fixing the code seems to have
    negative results (see LP 250869 -- Ubuntu specific workaround until
    debian bug 488460 is fully solved).

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/ubuntu-applied-patches/call_xinitthreads.patch
1
 
#
2
 
# Ubuntu: https://bugs.launchpad.net/bugs/299152
3
 
# Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=520008
4
 
# Upstream: http://sourceforge.net/support/tracker.php?aid=2037563
5
 
# Description: Call to XInitThreads() needed; patch taken from debian version 1.3.1-6 of synergy
6
 
#
7
 
diff -u synergy-1.3.1/lib/platform/CXWindowsScreen.cpp synergy-1.3.1/lib/platform/CXWindowsScreen.cpp
8
 
--- synergy-1.3.1/lib/platform/CXWindowsScreen.cpp
9
 
+++ synergy-1.3.1/lib/platform/CXWindowsScreen.cpp
10
 
@@ -20,6 +20,7 @@
11
 
 #include "CXWindowsUtil.h"
12
 
 #include "CClipboard.h"
13
 
 #include "CKeyMap.h"
14
 
+#include "XArch.h"
15
 
 #include "XScreen.h"
16
 
 #include "CLog.h"
17
 
 #include "CStopwatch.h"
18
 
@@ -97,6 +98,11 @@
19
 
 
20
 
        s_screen = this;
21
 
 
22
 
+       if (XInitThreads() == 0)
23
 
+       {
24
 
+               throw XArch("XInitThreads() returned zero");
25
 
+       }
26
 
+
27
 
        // set the X I/O error handler so we catch the display disconnecting
28
 
        XSetIOErrorHandler(&CXWindowsScreen::ioErrorHandler);
29