From 8f592b63302f6d65625db3a1bde8ade9b114c371 Mon Sep 17 00:00:00 2001
From: Andrew Resch <andrewresch@gmail.com>
Date: Sat, 27 Oct 2007 04:35:09 +0000
Subject: [PATCH] Fix some exceptions.

---
 deluge/main.py              | 2 +-
 deluge/ui/gtkui/gtkui.py    | 2 +-
 deluge/ui/signalreceiver.py | 6 +++++-
 deluge/ui/ui.py             | 4 ++--
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/deluge/main.py b/deluge/main.py
index 4a6e4dcc3..3709eb729 100644
--- a/deluge/main.py
+++ b/deluge/main.py
@@ -58,7 +58,7 @@ def start_ui():
 
     from deluge.ui.ui import UI
     log.info("Starting ui..")
-    UI()
+    UI(args)
                                                       
 def start_daemon():
     """Entry point for daemon script"""
diff --git a/deluge/ui/gtkui/gtkui.py b/deluge/ui/gtkui/gtkui.py
index f5b5f06b7..bf44caf06 100644
--- a/deluge/ui/gtkui/gtkui.py
+++ b/deluge/ui/gtkui/gtkui.py
@@ -85,7 +85,7 @@ DEFAULT_PREFS = {
 }
 
 class GtkUI:
-    def __init__(self):
+    def __init__(self, args):
         # Initialize gettext
         locale.setlocale(locale.LC_MESSAGES, '')
         locale.bindtextdomain("deluge", 
diff --git a/deluge/ui/signalreceiver.py b/deluge/ui/signalreceiver.py
index b3a8a1938..6def2edbc 100644
--- a/deluge/ui/signalreceiver.py
+++ b/deluge/ui/signalreceiver.py
@@ -93,7 +93,11 @@ class SignalReceiver(
         # shutdowns.. This is because handle_request() is a blocking call.
         receiver = xmlrpclib.ServerProxy("http://localhost:" + str(self.port),
             allow_none=True)
-        receiver.emit_signal("shutdown", None)
+        try:
+            receiver.emit_signal("shutdown", None)
+        except:
+            # We don't care about errors at this point
+            pass
         
     def run(self):
         """This gets called when we start the thread"""
diff --git a/deluge/ui/ui.py b/deluge/ui/ui.py
index 6706c6a68..32b768ead 100644
--- a/deluge/ui/ui.py
+++ b/deluge/ui/ui.py
@@ -40,11 +40,11 @@ DEFAULT_PREFS = {
 }
 
 class UI:
-    def __init__(self):
+    def __init__(self, args):
         log.debug("UI init..")
         self.config = ConfigManager("ui.conf", DEFAULT_PREFS)
         
         if self.config["selected_ui"] == "gtk":
             log.info("Starting GtkUI..")
             from deluge.ui.gtkui.gtkui import GtkUI
-            ui = GtkUI()
+            ui = GtkUI(args)