#1123 hide gtk2 vs gtk3 switch

git-svn-id: https://xpra.org/svn/Xpra/trunk@22661 3bb7dfac-3a0b-4e04-842a-767bc560f471
Xpra-org · May 8, 2019 · c2bae64 · c2bae64
1 parent a43fff1
commit c2bae64
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/xpra/scripts/server.py b/src/xpra/scripts/server.py
@@ -961,10 +961,7 @@ def noerr(fn, *args):
                 from xpra.x11.vfb_util import verify_display_ready
                 if not verify_display_ready(xvfb, display_name, shadowing):
                     return 1
-                if not PYTHON3:
-                    from xpra.x11.gtk2.gdk_display_util import verify_gdk_display       #@UnusedImport
-                else:
-                    from xpra.x11.gtk3.gdk_display_util import verify_gdk_display       #@Reimport
+                from xpra.x11.gtk_x11.gdk_display_source import verify_gdk_display
                 display = verify_gdk_display(display_name)
                 if not display:
                     return 1

diff --git a/src/xpra/x11/gtk_x11/gdk_display_source.py b/src/xpra/x11/gtk_x11/gdk_display_source.py
@@ -6,8 +6,10 @@
 import sys
 if sys.version_info[0]==2:
     from xpra.x11.gtk2 import gdk_display_source    #@UnresolvedImport, @UnusedImport
+    from xpra.x11.gtk2.gdk_display_util import verify_gdk_display       #@UnusedImport
 else:
     from xpra.x11.gtk3 import gdk_display_source    #@UnresolvedImport, @Reimport
+    from xpra.x11.gtk3.gdk_display_util import verify_gdk_display       #@Reimport @UnusedImport
 
 init_gdk_display_source     = gdk_display_source.init_gdk_display_source
 close_gdk_display_source    = gdk_display_source.close_gdk_display_source