[nanny] Remove ro status from list_pkg_filters
- From: Roberto Majadas <telemaco src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nanny] Remove ro status from list_pkg_filters
- Date: Sun, 23 Jan 2011 18:07:39 +0000 (UTC)
commit 253136947697b7f8e36a2d726cc2d9a3a109252d
Author: Roberto Majadas <roberto majadas openshine com>
Date: Sun Jan 16 15:26:36 2011 +0100
Remove ro status from list_pkg_filters
client/gnome/admin/src/ConfigureProxyDialog.py | 10 +++++-----
daemon/src/FilterManager.py | 2 +-
daemon/src/NannyDBus.py | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/client/gnome/admin/src/ConfigureProxyDialog.py b/client/gnome/admin/src/ConfigureProxyDialog.py
index fa45b85..81dd22b 100644
--- a/client/gnome/admin/src/ConfigureProxyDialog.py
+++ b/client/gnome/admin/src/ConfigureProxyDialog.py
@@ -168,9 +168,9 @@ class ConfigureProxyDialog (gtk.Dialog):
custom_blacklist_model.append ((filter_id, "<b>%s</b>\n %s" % (filter_name, filter_description), filter_name, filter_description, filter_regex))
else:
custom_whitelist_model.append ((filter_id, "<b>%s</b>\n %s" % (filter_name, filter_description), filter_name, filter_description, filter_regex))
-
- pkg_filters = self.dbus_client.list_pkg_filters ()
- for filter_id, readonly in pkg_filters:
+
+
+ for filter_id in self.dbus_client.list_pkg_filters () :
filter_name, filter_description = self.dbus_client.get_pkg_filter_metadata(filter_id)
packaged_blacklist_model.append ((filter_id, "<b>%s</b>\n %s" % (filter_name, filter_description)))
@@ -183,7 +183,7 @@ class ConfigureProxyDialog (gtk.Dialog):
server_list = self.dbus_client.list_pkg_filters ()
- for filter_id, ro in server_list:
+ for filter_id in server_list:
included = False
for row in list_store:
if row[0] == filter_id :
@@ -203,7 +203,7 @@ class ConfigureProxyDialog (gtk.Dialog):
id = list_store.get_value(iter, 0)
to_remove = True
- for filter_id, ro in server_list:
+ for filter_id in server_list:
if filter_id == id :
to_remove = False
break
diff --git a/daemon/src/FilterManager.py b/daemon/src/FilterManager.py
index 22edf24..011ad5d 100644
--- a/daemon/src/FilterManager.py
+++ b/daemon/src/FilterManager.py
@@ -346,7 +346,7 @@ class FilterManager (gobject.GObject) :
def list_pkg_filter(self):
ret = []
for x in self.pkg_filters_conf.keys():
- ret.append([x, False])
+ ret.append(x)
return ret
diff --git a/daemon/src/NannyDBus.py b/daemon/src/NannyDBus.py
index 6acccdc..778c293 100644
--- a/daemon/src/NannyDBus.py
+++ b/daemon/src/NannyDBus.py
@@ -260,7 +260,7 @@ class NannyDBus(dbus.service.Object):
return self.quarterback.filter_manager.update_pkg_filter(str(pkg_id), str (new_db_path))
@dbus.service.method("org.gnome.Nanny.WebDatabase",
- in_signature='', out_signature='a(sb)')
+ in_signature='', out_signature='as')
def ListPkgFilters(self):
return self.quarterback.filter_manager.list_pkg_filter()
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]