From de0f45487941bf9d151c0915aae614ec9c9f1d77 Mon Sep 17 00:00:00 2001 From: Marcos Pinto Date: Fri, 7 Sep 2007 21:02:22 +0000 Subject: [PATCH] use thread for browser calls --- src/browser.py | 35 ----------------------------------- src/common.py | 17 +++++++++++------ 2 files changed, 11 insertions(+), 41 deletions(-) delete mode 100644 src/browser.py diff --git a/src/browser.py b/src/browser.py deleted file mode 100644 index 375f86011..000000000 --- a/src/browser.py +++ /dev/null @@ -1,35 +0,0 @@ -# -*- coding: utf-8 -*- -# -# browser.py -# -# Copyright (C) Marcos Pinto 2007 -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, write to: -# The Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor -# Boston, MA 02110-1301, USA. -# -# In addition, as a special exception, the copyright holders give -# permission to link the code of portions of this program with the OpenSSL -# library. -# You must obey the GNU General Public License in all respects for all of -# the code used other than OpenSSL. If you modify file(s) with this -# exception, you may extend this exception to your version of the file(s), -# but you are not obligated to do so. If you do not wish to do so, delete -# this exception statement from your version. If you delete this exception -# statement from all source files in the program, then also delete it here. - -import webbrowser -import sys -webbrowser.open(sys.argv[1]) diff --git a/src/common.py b/src/common.py index 8f50cd4a8..b9093b19d 100644 --- a/src/common.py +++ b/src/common.py @@ -129,12 +129,17 @@ def get_pixmap(fname): return os.path.join(PIXMAP_DIR, fname) def open_url_in_browser(link): - import platform - if platform.system() == "Windows": - import webbrowser - webbrowser.open(link) - else: - exec_deluge_command('browser.py', link) + import threading + import time + import webbrowser + class BrowserThread(threading.Thread): + def __init__(self, link): + threading.Thread.__init__(self) + self.url = link + def run(self): + webbrowser.open(self.url) + t = BrowserThread(link) + t.start() def is_url(url): import re