[nanny] Fix remove filter UI Freeze

[Roberto Majadas <telemaco src gnome org>]

commit c5635860eb01c8dee222f909c8252de9407af76f
Author: Roberto Majadas <roberto majadas openshine com>
Date:   Wed Dec 23 00:10:16 2009 +0100

    Fix remove filter UI Freeze

 client/common/src/DBusClient.py                |    2 +-
 client/gnome/admin/src/ConfigureProxyDialog.py |   11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)
---
diff --git a/client/common/src/DBusClient.py b/client/common/src/DBusClient.py
index 2dbbae7..e77b96e 100644
--- a/client/common/src/DBusClient.py
+++ b/client/common/src/DBusClient.py
@@ -137,7 +137,7 @@ class DBusClient(gobject.GObject):
         return self.nanny_wcf.ListFilters (uid)
 
     def remove_filter (self, filter_id, reply_handler, error_handler):
-        return self.nanny_wcf.RemoveFilter (filter_id, reply_handler=reply_handler, error_handler=error_handler)
+        return self.nanny_wcf.RemoveFilter (filter_id, reply_handler=reply_handler, error_handler=error_handler, timeout=2000000)
 
     def __on_user_notification_cb (self, block_status, user_id, app_id, next_change, available_time):
         self.emit ('user-notification', block_status, user_id, app_id, next_change, available_time)
diff --git a/client/gnome/admin/src/ConfigureProxyDialog.py b/client/gnome/admin/src/ConfigureProxyDialog.py
index 5eb3af9..8bdfdba 100644
--- a/client/gnome/admin/src/ConfigureProxyDialog.py
+++ b/client/gnome/admin/src/ConfigureProxyDialog.py
@@ -207,9 +207,9 @@ class ConfigureProxyDialog (gtk.Dialog):
         if ret != gtk.RESPONSE_OK:
             return
 
+        self.progress_dialog = ProgressDialog (_("Removing filter. Please, wait..."))
         selection = self.blacklist_treeview.get_selection()
         if selection.count_selected_rows () > 0:
-            self.progress_dialog = ProgressDialog (_("Downloading the list. Please, wait..."))
             model, paths = selection.get_selected_rows()
             if paths:
                 for path in paths:
@@ -217,8 +217,7 @@ class ConfigureProxyDialog (gtk.Dialog):
                     self.dbus_client.remove_filter (id,
                                                     self.__on_remove_filter_reply,
                                                     self.__on_remove_filter_error)
-
-        self.__fill_treeviews ()
+                    
 
     def __on_whitelist_remove_button_clicked (self, widget, data=None):
         dlg = gtk.MessageDialog(type=gtk.MESSAGE_WARNING, buttons=gtk.BUTTONS_OK_CANCEL)
@@ -230,9 +229,9 @@ class ConfigureProxyDialog (gtk.Dialog):
         if ret != gtk.RESPONSE_OK:
             return
 
+        self.progress_dialog = ProgressDialog (_("Removing filter. Please, wait..."))
         selection = self.whitelist_treeview.get_selection()
         if selection.count_selected_rows () > 0:
-            self.progress_dialog = ProgressDialog (_("Downloading the list. Please, wait..."))
             model, paths = selection.get_selected_rows()
             if paths:
                 for path in paths:
@@ -241,8 +240,6 @@ class ConfigureProxyDialog (gtk.Dialog):
                                                     self.__on_remove_filter_reply,
                                                     self.__on_remove_filter_error)
 
-        self.__fill_treeviews ()
-
     def __on_remove_filter_reply (self, value):
         self.progress_dialog.destroy()
         self.progress_dialog = None
@@ -289,7 +286,7 @@ class ConfigureProxyDialog (gtk.Dialog):
 
         store = gtk.ListStore (gobject.TYPE_INT, gobject.TYPE_STRING)
         store.append ((0, _("Download list from the Internet")))
-        store.append ((1, _("Insert manual URL")))
+        store.append ((1, _("Insert manual domain or URL")))
 
         combobox = xml.get_object ('wcfed_type_combobox')
         cell = gtk.CellRendererText()