#1568 GTK3 SIGINT handling has been fixed at last (no idea what version)

git-svn-id: https://xpra.org/svn/Xpra/trunk@17098 3bb7dfac-3a0b-4e04-842a-767bc560f471
Xpra-org · Oct 4, 2017 · 7831a0c · 7831a0c
1 parent 8cce316
commit 7831a0c
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/src/xpra/client/client_base.py b/src/xpra/client/client_base.py
@@ -29,7 +29,7 @@
     ENCRYPTION_CIPHERS, ENCRYPT_FIRST_PACKET, DEFAULT_IV, DEFAULT_SALT, DEFAULT_ITERATIONS, INITIAL_PADDING, DEFAULT_PADDING, ALL_PADDING_OPTIONS, PADDING_OPTIONS
 from xpra.version_util import version_compat_check, get_version_info, XPRA_VERSION
 from xpra.platform.info import get_name
-from xpra.os_util import get_machine_id, get_user_uuid, load_binary_file, SIGNAMES, PYTHON3, PYTHON2, strtobytes, bytestostr, hexstr
+from xpra.os_util import get_machine_id, get_user_uuid, load_binary_file, SIGNAMES, PYTHON3, strtobytes, bytestostr, hexstr
 from xpra.util import flatten_dict, typedict, updict, xor, repr_ellipsized, nonl, envbool, disconnect_is_an_error, dump_all_frames
 from xpra.net.file_transfer import FileTransferHandler
 
@@ -179,9 +179,7 @@ def app_signal(signum, _frame):
             signal.signal(signal.SIGTERM, deadly_signal)
             self.signal_cleanup()
             self.timeout_add(0, self.signal_disconnect_and_quit, 128 + signum, "exit on signal %s" % SIGNAMES.get(signum, signum))
-        if PYTHON2:
-            #breaks GTK3..
-            signal.signal(signal.SIGINT, app_signal)
+        signal.signal(signal.SIGINT, app_signal)
         signal.signal(signal.SIGTERM, app_signal)
 
     def signal_disconnect_and_quit(self, exit_code, reason):