Mercurial > sat_docs
annotate flatpak/main_loop.patch @ 142:2602c690806b
flatpak (sat_wrapper): don't use packages from $HOME in PYTHONPATH to avoid conflicts:
before this change, packages from ~/.local/lib/python2.7/site-packages when included, and
this could conflict with the ones from Flatpak, resulting in unwanted side effects (e.g.
OMEMO not available).
author | Goffi <goffi@goffi.org> |
---|---|
date | Sun, 23 Jun 2019 19:45:37 +0200 |
parents | d7761eb3f20b |
children |
rev | line source |
---|---|
132
d7761eb3f20b
flatpak: Flatpak manifests for backend and active frontends, first draft
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
1 diff --git a/urwid/main_loop.py b/urwid/main_loop.py |
d7761eb3f20b
flatpak: Flatpak manifests for backend and active frontends, first draft
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
2 index 10ea5e1..59252bf 100755 |
d7761eb3f20b
flatpak: Flatpak manifests for backend and active frontends, first draft
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
3 --- a/urwid/main_loop.py |
d7761eb3f20b
flatpak: Flatpak manifests for backend and active frontends, first draft
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
4 +++ b/urwid/main_loop.py |
d7761eb3f20b
flatpak: Flatpak manifests for backend and active frontends, first draft
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
5 @@ -130,10 +130,11 @@ class MainLoop(object): |
d7761eb3f20b
flatpak: Flatpak manifests for backend and active frontends, first draft
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
6 event_loop = SelectEventLoop() |
d7761eb3f20b
flatpak: Flatpak manifests for backend and active frontends, first draft
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
7 self.event_loop = event_loop |
d7761eb3f20b
flatpak: Flatpak manifests for backend and active frontends, first draft
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
8 |
d7761eb3f20b
flatpak: Flatpak manifests for backend and active frontends, first draft
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
9 - if hasattr(self.screen, 'signal_handler_setter'): |
d7761eb3f20b
flatpak: Flatpak manifests for backend and active frontends, first draft
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
10 - # Tell the screen what function it must use to set |
d7761eb3f20b
flatpak: Flatpak manifests for backend and active frontends, first draft
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
11 - # signal handlers |
d7761eb3f20b
flatpak: Flatpak manifests for backend and active frontends, first draft
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
12 - self.screen.signal_handler_setter = self.event_loop.set_signal_handler |
d7761eb3f20b
flatpak: Flatpak manifests for backend and active frontends, first draft
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
13 + # disabled to work around outdated GLib version in org.freedesktop.Platform |
d7761eb3f20b
flatpak: Flatpak manifests for backend and active frontends, first draft
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
14 + # if hasattr(self.screen, 'signal_handler_setter'): |
d7761eb3f20b
flatpak: Flatpak manifests for backend and active frontends, first draft
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
15 + # # Tell the screen what function it must use to set |
d7761eb3f20b
flatpak: Flatpak manifests for backend and active frontends, first draft
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
16 + # # signal handlers |
d7761eb3f20b
flatpak: Flatpak manifests for backend and active frontends, first draft
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
17 + # self.screen.signal_handler_setter = self.event_loop.set_signal_handler |
d7761eb3f20b
flatpak: Flatpak manifests for backend and active frontends, first draft
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
18 |
d7761eb3f20b
flatpak: Flatpak manifests for backend and active frontends, first draft
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
19 self._watch_pipes = {} |
d7761eb3f20b
flatpak: Flatpak manifests for backend and active frontends, first draft
Goffi <goffi@goffi.org>
parents:
diff
changeset
|
20 |