[nanny] Update "update_pkg_filter" API



commit a6c82a3a58d699e0cf245246e7e444cd812ac4f6
Author: Roberto Majadas <roberto majadas openshine com>
Date:   Sun Jan 16 19:33:02 2011 +0100

    Update "update_pkg_filter" API

 client/common/src/DBusClient.py                |    4 ++--
 client/common/src/PyroClient.py                |    4 ++--
 client/gnome/admin/src/ConfigureProxyDialog.py |   10 +++++++++-
 daemon/src/FilterManager.py                    |    3 ++-
 daemon/src/NannyDBus.py                        |    6 +++---
 daemon/src/NannyPyroBus.py                     |    4 ++--
 6 files changed, 20 insertions(+), 11 deletions(-)
---
diff --git a/client/common/src/DBusClient.py b/client/common/src/DBusClient.py
index b86ee35..ab04598 100644
--- a/client/common/src/DBusClient.py
+++ b/client/common/src/DBusClient.py
@@ -170,8 +170,8 @@ class DBusClient(gobject.GObject):
     def remove_pkg_filter (self, pkg_id):
         return self.nanny_wcf.RemovePkgFilter(pkg_id)
     
-    def update_pkg_filter (self, pkg_id, new_db_path):
-        return self.nanny_wcf.UpdatePkgFilter(pkg_id, new_db_path)
+    def update_pkg_filter (self, pkg_id):
+        return self.nanny_wcf.UpdatePkgFilter(pkg_id)
     
     def list_pkg_filters (self):
         return self.nanny_wcf.ListPkgFilters()
diff --git a/client/common/src/PyroClient.py b/client/common/src/PyroClient.py
index da000ec..347993f 100644
--- a/client/common/src/PyroClient.py
+++ b/client/common/src/PyroClient.py
@@ -115,8 +115,8 @@ class PyroClient(gobject.GObject):
     def remove_pkg_filter (self, pkg_id):
         return self.nanny_wcf.RemovePkgFilter(pkg_id)
     
-    def update_pkg_filter (self, pkg_id, new_db_path):
-        return self.nanny_wcf.UpdatePkgFilter(pkg_id, new_db_path)
+    def update_pkg_filter (self, pkg_id):
+        return self.nanny_wcf.UpdatePkgFilter(pkg_id)
     
     def list_pkg_filters (self):
         return self.nanny_wcf.ListPkgFilters()
diff --git a/client/gnome/admin/src/ConfigureProxyDialog.py b/client/gnome/admin/src/ConfigureProxyDialog.py
index db4f2ad..b0bec63 100644
--- a/client/gnome/admin/src/ConfigureProxyDialog.py
+++ b/client/gnome/admin/src/ConfigureProxyDialog.py
@@ -619,7 +619,15 @@ class ConfigureProxyDialog (gtk.Dialog):
         d.destroy()
     
     def __on_update_bl_button_cb(self, widget):
-        pass
+        try:
+            selection = self.packaged_blacklist_treeview.get_selection()
+            model, iter = selection.get_selected()
+            pkg_id = model.get_value(iter, 0)
+        except:
+            return
+
+        self.dbus_client.update_pkg_filter (pkg_id)
+        widget.set_sensitive(False)
 
     def __load_dialog (self):
         ui_file = os.path.join (nanny.client.gnome.admin.ui_files_dir, "nac_wcf_edit_dialog.ui")
diff --git a/daemon/src/FilterManager.py b/daemon/src/FilterManager.py
index 927b9cb..dc79f9d 100644
--- a/daemon/src/FilterManager.py
+++ b/daemon/src/FilterManager.py
@@ -366,7 +366,8 @@ class FilterManager (gobject.GObject) :
         
         return True
                 
-    def update_pkg_filter(self, pkg_id, new_db):
+    def update_pkg_filter(self, pkg_id):
+        print "UPDATE -----> PKG_ID : %s" % pkg_id
         pass
 
     def __update_pkg_checker_timeout(self):
diff --git a/daemon/src/NannyDBus.py b/daemon/src/NannyDBus.py
index 363c0e0..1b5b8ea 100644
--- a/daemon/src/NannyDBus.py
+++ b/daemon/src/NannyDBus.py
@@ -253,11 +253,11 @@ class NannyDBus(dbus.service.Object):
         return self.quarterback.filter_manager.remove_pkg_filter(str(pkg_id))
 
     @dbus.service.method("org.gnome.Nanny.WebDatabase",
-                         in_signature='ss', out_signature='b',
+                         in_signature='s', out_signature='b',
                          sender_keyword='sender', connection_keyword='conn')
-    def UpdatePkgFilter(self, pkg_id, new_db_path, sender=None, conn=None):
+    def UpdatePkgFilter(self, pkg_id, sender=None, conn=None):
         self._check_polkit_privilege(sender, conn, 'org.gnome.nanny.admin')
-        return self.quarterback.filter_manager.update_pkg_filter(str(pkg_id), str (new_db_path))
+        return self.quarterback.filter_manager.update_pkg_filter(str(pkg_id))
     
     @dbus.service.method("org.gnome.Nanny.WebDatabase",
                          in_signature='', out_signature='as')
diff --git a/daemon/src/NannyPyroBus.py b/daemon/src/NannyPyroBus.py
index ba35a62..c207aac 100644
--- a/daemon/src/NannyPyroBus.py
+++ b/daemon/src/NannyPyroBus.py
@@ -173,8 +173,8 @@ class OrgGnomeNannyWebDatabase(Pyro.core.ObjBase):
     def RemovePkgFilter(self, pkg_id):
         return PyroBlockingCallFromThread(reactor, self.quarterback.filter_manager.remove_pkg_filter, str(pkg_id))
 
-    def UpdatePkgFilter(self, pkg_id, new_db_path):
-        return PyroBlockingCallFromThread(reactor, self.quarterback.filter_manager.update_pkg_filter, str(pkg_id), str (new_db_path))
+    def UpdatePkgFilter(self, pkg_id):
+        return PyroBlockingCallFromThread(reactor, self.quarterback.filter_manager.update_pkg_filter, str(pkg_id))
 
     def ListPkgFilters(self):
         return PyroBlockingCallFromThread(reactor, self.quarterback.filter_manager.list_pkg_filter)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]