casa-mp-base
Public
Commits
David B. Evans authored 6ddc9862383
| 1 - | --- deluge/ui/gtkui/gtkui.py.orig 2014-10-15 14:10:39.000000000 -0700 |
| 2 - | +++ deluge/ui/gtkui/gtkui.py 2014-10-17 15:51:20.000000000 -0700 |
| 1 + | --- deluge/ui/gtkui/gtkui.py.orig 2017-03-06 01:56:20.000000000 -0800 |
| 2 + | +++ deluge/ui/gtkui/gtkui.py 2017-03-10 17:53:51.000000000 -0800 |
| 3 3 | |
| 4 4 | return 1 |
| 5 5 | SetConsoleCtrlHandler(win_handler) |
| 6 6 | |
| 7 7 | - if deluge.common.osx_check() and gtk.gdk.WINDOWING == "quartz": |
| 8 8 | - import gtkosx_application |
| 9 9 | - self.osxapp = gtkosx_application.gtkosx_application_get() |
| 10 10 | - def on_die(*args): |
| 11 11 | - reactor.stop() |
| 12 12 | - self.osxapp.connect("NSApplicationWillTerminate", on_die) |
| 18 18 | +# self.osxapp.connect("NSApplicationWillTerminate", on_die) |
| 19 19 | |
| 20 20 | |
| 21 21 | # Set process name again to fix gtk issue |
| 22 22 | |
| 23 23 | self.statusbar = StatusBar() |
| 24 24 | self.addtorrentdialog = AddTorrentDialog() |
| 25 25 | |
| 26 26 | - if deluge.common.osx_check() and gtk.gdk.WINDOWING == "quartz": |
| 27 27 | - def nsapp_open_file(osxapp, filename): |
| 28 - | - # Will be raised at app launch (python opening main script) |
| 29 - | - if filename.endswith('Deluge-bin'): |
| 28 + | - # Ignore command name which is raised at app launch (python opening main script). |
| 29 + | - if filename == sys.argv[0]: |
| 30 30 | - return True |
| 31 31 | - from deluge.ui.gtkui.ipcinterface import process_args |
| 32 32 | - process_args([filename]) |
| 33 33 | - self.osxapp.connect("NSApplicationOpenFile", nsapp_open_file) |
| 34 34 | - from menubar_osx import menubar_osx |
| 35 35 | - menubar_osx(self, self.osxapp) |
| 36 36 | - self.osxapp.ready() |
| 37 37 | +# if deluge.common.osx_check() and gtk.gdk.WINDOWING == "quartz": |
| 38 38 | +# def nsapp_open_file(osxapp, filename): |
| 39 - | +# # Will be raised at app launch (python opening main script) |
| 40 - | +# if filename.endswith('Deluge-bin'): |
| 39 + | +# # Ignore command name which is raised at app launch (python opening main script). |
| 40 + | +# if filename == sys.argv[0]: |
| 41 41 | +# return True |
| 42 42 | +# from deluge.ui.gtkui.ipcinterface import process_args |
| 43 43 | +# process_args([filename]) |
| 44 44 | +# self.osxapp.connect("NSApplicationOpenFile", nsapp_open_file) |
| 45 45 | +# from menubar_osx import menubar_osx |
| 46 46 | +# menubar_osx(self, self.osxapp) |
| 47 47 | +# self.osxapp.ready() |
| 48 48 | |
| 49 49 | # Initalize the plugins |
| 50 50 | self.plugins = PluginManager() |