[meld/flatpak-ci] meldapp: Remove global app singleton and adjust start script
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld/flatpak-ci] meldapp: Remove global app singleton and adjust start script
- Date: Fri, 20 Dec 2019 20:52:03 +0000 (UTC)
commit 9a64c25f3efedd7402d71661711a4f82f5bd929b
Author: Kai Willadsen <kai willadsen gmail com>
Date: Fri Dec 20 08:01:50 2019 +1000
meldapp: Remove global app singleton and adjust start script
bin/meld | 11 +++++++----
meld/meldapp.py | 3 ---
2 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/bin/meld b/bin/meld
old mode 100755
new mode 100644
index 426df3b6..8ffa5f88
--- a/bin/meld
+++ b/bin/meld
@@ -412,10 +412,13 @@ if __name__ == '__main__':
setup_settings()
environment_hacks()
- import meld.meldapp
+ from meld.meldapp import MeldApp
+ app = MeldApp()
+
if sys.platform != 'win32':
from gi.repository import GLib
- GLib.unix_signal_add(GLib.PRIORITY_DEFAULT, signal.SIGINT,
- lambda *args: meld.meldapp.app.quit(), None)
- status = meld.meldapp.app.run(sys.argv)
+ GLib.unix_signal_add(
+ GLib.PRIORITY_DEFAULT, signal.SIGINT, lambda *args: app.quit())
+
+ status = app.run(sys.argv)
sys.exit(status)
diff --git a/meld/meldapp.py b/meld/meldapp.py
index 965ca5e5..386e01b2 100644
--- a/meld/meldapp.py
+++ b/meld/meldapp.py
@@ -392,6 +392,3 @@ class MeldApp(Gtk.Application):
parser.command_line = None
return tab if len(comparisons) == 1 else None
-
-
-app = MeldApp()
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]