From 3dd3d22fd0d21b82611734e513b660232f2f54df Mon Sep 17 00:00:00 2001
From: Marcos Pinto <markybob@dipconsultants.com>
Date: Sat, 15 Dec 2007 18:40:03 +0000
Subject: [PATCH] catch (more) delete

---
 plugins/BlocklistImport/ui.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/plugins/BlocklistImport/ui.py b/plugins/BlocklistImport/ui.py
index 51492cbfd..97c413474 100644
--- a/plugins/BlocklistImport/ui.py
+++ b/plugins/BlocklistImport/ui.py
@@ -113,6 +113,7 @@ class GTKProgress(gtk.Dialog):
 
         self.connect('response', self.response)
         self.connect('close', self.cancel)
+        self.connect("delete_event", self.cancel)
 
         self.hide_all()
 
@@ -147,10 +148,12 @@ class GTKProgress(gtk.Dialog):
     def response(self, dialog, response):
         self.cancel(dialog)
 
-    def cancel(self, dialog):
+    def cancel(self, dialog, signal=None):
         print "Cancelling"
         self.plugin.cancelled = True
         self.hide_all()
+        if signal:
+            return True
 
     def start(self):
         self.show_all()
@@ -181,11 +184,14 @@ class GTKError(gtk.Dialog):
 
         self.connect('response', self.ok)
         self.connect('close', self.cancel)
+        self.connect("delete_event", self.cancel)
 
         self.show_all()
 
     def ok(self, dialog, response):
         self.hide_all()
 
-    def cancel(self, dialog):
+    def cancel(self, dialog, signal):
         self.hide_all()
+        if signal:
+            return True