[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, debian, updated. upstream/0.9.5.5-717-g0f98819

[Sebastian Krzyszkowiak]

The following commit has been merged in the debian branch:
commit 65bb02955a68e33b99261bbf11bf2acb7152865b
Author: Sebastian Krzyszkowiak <seba.dos1 at gmail.com>
Date:   Wed Dec 9 22:06:36 2009 +0100

    opimd: rename Field dbus methods due to problems with duplicated names
    ***Breaks API!***

diff --git a/framework/subsystems/opimd/pimd_calls.py b/framework/subsystems/opimd/pimd_calls.py
index 8c22249..c2b4e33 100644
--- a/framework/subsystems/opimd/pimd_calls.py
+++ b/framework/subsystems/opimd/pimd_calls.py
@@ -416,11 +416,11 @@ class CallDomain(Domain, GenericDomain):
         self.update(num_id, data, entryif = callif, entry = call)
 
     @dbus_method(_DIN_FIELDS, "ss", "")
-    def Add(self, name, type):
+    def AddField(self, name, type):
         self.add_new_field(name, type)
 
     @dbus_method(_DIN_FIELDS, "", "a{ss}")
-    def List(self):
+    def ListFields(self):
         return self.list_fields()
 
     @dbus_method(_DIN_FIELDS, "s", "as")
@@ -428,10 +428,10 @@ class CallDomain(Domain, GenericDomain):
         return self.list_fields_with_type(type)
 
     @dbus_method(_DIN_FIELDS, "s", "")
-    def Delete(self, name):
+    def DeleteField(self, name):
         self.remove_field(name)
 
     @dbus_method(_DIN_FIELDS, "s", "s")
-    def Get(self, name):
+    def GetType(self, name):
         return self.field_type_from_name(name)
 
diff --git a/framework/subsystems/opimd/pimd_contacts.py b/framework/subsystems/opimd/pimd_contacts.py
index ce0baa1..c88e1fa 100644
--- a/framework/subsystems/opimd/pimd_contacts.py
+++ b/framework/subsystems/opimd/pimd_contacts.py
@@ -338,11 +338,11 @@ class ContactDomain(Domain, GenericDomain):
         self.update(num_id, data)
 
     @dbus_method(_DIN_FIELDS, "ss", "")
-    def Add(self, name, type):
+    def AddField(self, name, type):
         self.add_new_field(name, type)
 
     @dbus_method(_DIN_FIELDS, "", "a{ss}")
-    def List(self):
+    def ListFields(self):
         return self.list_fields()
 
     @dbus_method(_DIN_FIELDS, "s", "as")
@@ -350,10 +350,10 @@ class ContactDomain(Domain, GenericDomain):
         return self.list_fields_with_type(type)
 
     @dbus_method(_DIN_FIELDS, "s", "")
-    def Delete(self, name):
+    def DeleteField(self, name):
         self.remove_field(name)
 
     @dbus_method(_DIN_FIELDS, "s", "s")
-    def Get(self, name):
+    def GetType(self, name):
         return self.field_type_from_name(name)
 
diff --git a/framework/subsystems/opimd/pimd_dates.py b/framework/subsystems/opimd/pimd_dates.py
index b7c65ef..43554dc 100644
--- a/framework/subsystems/opimd/pimd_dates.py
+++ b/framework/subsystems/opimd/pimd_dates.py
@@ -330,11 +330,11 @@ class DateDomain(Domain, GenericDomain):
         self.update(num_id, data)
 
     @dbus_method(_DIN_FIELDS, "ss", "")
-    def Add(self, name, type):
+    def AddField(self, name, type):
         self.add_new_field(name, type)
 
     @dbus_method(_DIN_FIELDS, "", "a{ss}")
-    def List(self):
+    def ListFields(self):
         return self.list_fields()
 
     @dbus_method(_DIN_FIELDS, "s", "as")
@@ -342,10 +342,10 @@ class DateDomain(Domain, GenericDomain):
         return self.list_fields_with_type(type)
 
     @dbus_method(_DIN_FIELDS, "s", "")
-    def Delete(self, name):
+    def DeleteField(self, name):
         self.remove_field(name)
 
     @dbus_method(_DIN_FIELDS, "s", "s")
-    def Get(self, name):
+    def GetType(self, name):
         return self.field_type_from_name(name)
 
diff --git a/framework/subsystems/opimd/pimd_generic.py b/framework/subsystems/opimd/pimd_generic.py
index f8f3562..4e64fa4 100644
--- a/framework/subsystems/opimd/pimd_generic.py
+++ b/framework/subsystems/opimd/pimd_generic.py
@@ -984,11 +984,11 @@ class GenericDomain():
         self.update(num_id, data)
 
     @dbus_method(_DIN_FIELDS, "ss", "")
-    def Add(self, name, type):
+    def AddField(self, name, type):
         self.add_new_field(name, type)
 
     @dbus_method(_DIN_FIELDS, "", "a{ss}")
-    def List(self):
+    def ListFields(self):
         return self.list_fields()
 
     @dbus_method(_DIN_FIELDS, "s", "as")
@@ -996,11 +996,11 @@ class GenericDomain():
         return self.list_fields_with_type(type)
 
     @dbus_method(_DIN_FIELDS, "s", "")
-    def Delete(self, name):
+    def DeleteField(self, name):
         self.remove_field(name)
 
     @dbus_method(_DIN_FIELDS, "s", "s")
-    def Get(self, name):
+    def GetType(self, name):
         return self.field_type_from_name(name)
 
 
diff --git a/framework/subsystems/opimd/pimd_messages.py b/framework/subsystems/opimd/pimd_messages.py
index f780167..9835e0e 100644
--- a/framework/subsystems/opimd/pimd_messages.py
+++ b/framework/subsystems/opimd/pimd_messages.py
@@ -577,11 +577,11 @@ class MessageDomain(Domain, GenericDomain):
         self.delete(num_id)
 
     @dbus_method(_DIN_FIELDS, "ss", "")
-    def Add(self, name, type):
+    def AddField(self, name, type):
         self.add_new_field(name, type)
 
     @dbus_method(_DIN_FIELDS, "", "a{ss}")
-    def List(self):
+    def ListFields(self):
         return self.list_fields()
 
     @dbus_method(_DIN_FIELDS, "s", "as")
@@ -589,10 +589,10 @@ class MessageDomain(Domain, GenericDomain):
         return self.list_fields_with_type(type)
 
     @dbus_method(_DIN_FIELDS, "s", "")
-    def Delete(self, name):
+    def DeleteField(self, name):
         self.remove_field(name)
 
     @dbus_method(_DIN_FIELDS, "s", "s")
-    def Get(self, name):
+    def GetType(self, name):
         return self.field_type_from_name(name)
 
diff --git a/framework/subsystems/opimd/pimd_notes.py b/framework/subsystems/opimd/pimd_notes.py
index 8a776ce..1bb337f 100644
--- a/framework/subsystems/opimd/pimd_notes.py
+++ b/framework/subsystems/opimd/pimd_notes.py
@@ -402,11 +402,11 @@ class NoteDomain(Domain, GenericDomain):
         self.update(num_id, data, entryif = noteif, entry = note)
 
     @dbus_method(_DIN_FIELDS, "ss", "")
-    def Add(self, name, type):
+    def AddField(self, name, type):
         self.add_new_field(name, type)
 
     @dbus_method(_DIN_FIELDS, "", "a{ss}")
-    def List(self):
+    def ListFields(self):
         return self.list_fields()
 
     @dbus_method(_DIN_FIELDS, "s", "as")
@@ -414,10 +414,10 @@ class NoteDomain(Domain, GenericDomain):
         return self.list_fields_with_type(type)
 
     @dbus_method(_DIN_FIELDS, "s", "")
-    def Delete(self, name):
+    def DeleteField(self, name):
         self.remove_field(name)
 
     @dbus_method(_DIN_FIELDS, "s", "s")
-    def Get(self, name):
+    def GetType(self, name):
         return self.field_type_from_name(name)
 
diff --git a/framework/subsystems/opimd/pimd_tasks.py b/framework/subsystems/opimd/pimd_tasks.py
index d504e55..d9be3e7 100644
--- a/framework/subsystems/opimd/pimd_tasks.py
+++ b/framework/subsystems/opimd/pimd_tasks.py
@@ -372,11 +372,11 @@ class TaskDomain(Domain, GenericDomain):
         self.update(num_id, data, entryif = taskif, entry = task)
 
     @dbus_method(_DIN_FIELDS, "ss", "")
-    def Add(self, name, type):
+    def AddField(self, name, type):
         self.add_new_field(name, type)
 
     @dbus_method(_DIN_FIELDS, "", "a{ss}")
-    def List(self):
+    def ListFields(self):
         return self.list_fields()
 
     @dbus_method(_DIN_FIELDS, "s", "as")
@@ -384,10 +384,10 @@ class TaskDomain(Domain, GenericDomain):
         return self.list_fields_with_type(type)
 
     @dbus_method(_DIN_FIELDS, "s", "")
-    def Delete(self, name):
+    def DeleteField(self, name):
         self.remove_field(name)
 
     @dbus_method(_DIN_FIELDS, "s", "s")
-    def Get(self, name):
+    def GetType(self, name):
         return self.field_type_from_name(name)
 

-- 
FSO frameworkd Debian packaging