Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix:Do not set GDK_BACKEND to x11 in terminals. #1911

Merged
merged 1 commit into from
Oct 1, 2021
Merged

fix:Do not set GDK_BACKEND to x11 in terminals. #1911

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions guake/terminal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,10 @@ def __init__(self, guake):

self.setup_drag_and_drop()

self.ENVV_EXCLUDE_LIST = ["GDK_BACKEND"]
self.envv = [f"{i}={os.environ[i]}" for i in os.environ if i not in self.ENVV_EXCLUDE_LIST]
self.envv.append(f"GUAKE_TAB_UUID={self.uuid}")

def setup_drag_and_drop(self):
self.targets = Gtk.TargetList()
self.targets.add_uri_targets(DropTargets.URIS)
Expand Down Expand Up @@ -550,12 +554,13 @@ def spawn_sync_pid(self, directory):
Vte.PtyFlags.DEFAULT,
directory,
argv,
[f"GUAKE_TAB_UUID={self.uuid}"],
GLib.SpawnFlags.DO_NOT_REAP_CHILD,
self.envv,
mlouielu marked this conversation as resolved.
Show resolved Hide resolved
GLib.SpawnFlags(Vte.SPAWN_NO_PARENT_ENVV | GLib.SpawnFlags.DO_NOT_REAP_CHILD),
None,
None,
None,
)

try:
tuple_type = gi._gi.ResultTuple # pylint: disable=c-extension-no-member
except: # pylint: disable=bare-except
Expand Down
6 changes: 6 additions & 0 deletions releasenotes/notes/fix_gdk_backend-be5c40f221c1e528.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
release_summary: >
Stopped setting GDK_BACKEND to x11 in terminals.

fixes:
- |
- GDK_BACKEND is propagated to the shell in terminal #1871