Merge remote-tracking branch 'origin/pr/221'

* origin/pr/221:
  Also set software rendering via the new $GDK_DISABLE variable

Pull request description:

See commit message

Author: marmarek

appvm-scripts/etc/profile.d/qubes-gui.csh

@@ -2,6 +2,7 @@ setenv DISPLAY ":0"
 setenv _JAVA_AWT_WM_NONREPARENTING "1"
 if ( -f /var/run/qubes-service/software-rendering )
   setenv GSK_RENDERER "cairo"
+  setenv GDK_DISABLE "gl vulkan"
   setenv GDK_DEBUG "gl-disable vulkan-disable"
   setenv LIBGL_ALWAYS_SOFTWARE "1"
 endif

appvm-scripts/etc/profile.d/qubes-gui.sh

@@ -1,5 +1,7 @@
 export DISPLAY=:0 _JAVA_AWT_WM_NONREPARENTING=1
 if test -f /var/run/qubes-service/software-rendering; then
-  export GSK_RENDERER="cairo" GDK_DEBUG="gl-disable vulkan-disable" \
+  export GSK_RENDERER="cairo" \
+         GDK_DISABLE="gl vulkan" \
+         GDK_DEBUG="gl-disable vulkan-disable" \
          LIBGL_ALWAYS_SOFTWARE=1
 fi