Handle shutting down more cleanly in the gtkui

ChangeLog

@@ -2,6 +2,9 @@ Deluge 0.9.05 - "1.0.0_RC5" (In Development)
  Core:
   * Fix deluged running with ssh X forwarding by removing the Gnome lib import
   * Save resume data periodically to help prevent data loss
+ 
+ GtkUI:
+  * Handle shutting down more cleanly
   
  Plugins:
   * Improve the Blocklist plugin preferences page.

deluge/ui/gtkui/gtkui.py

@@ -216,7 +216,7 @@ class GtkUI:
         else:           
             self.shutdown()
 
-    def shutdown(self, data=None):
+    def shutdown(self, *args, **kwargs):
         log.debug("gtkui shutting down..")
 
         # Make sure the config is saved.
@@ -229,7 +229,10 @@ class GtkUI:
                 client.shutdown()
             except:
                 pass
-
+        try:
+            gtk.main_quit()
+        except RuntimeError:
+            pass
             
     def _on_new_core(self, data):
         component.start()