[pyatspi2] More method name fixes



commit 8af0a9f213a614ffae8f41607359001540b59fa2
Author: Mike Gorse <mgorse novell com>
Date:   Mon Nov 16 08:51:01 2009 -0500

    More method name fixes

 pyatspi/accessible.py  |   10 +++++-----
 pyatspi/cache.py       |    6 +++---
 pyatspi/deviceevent.py |    2 +-
 pyatspi/table.py       |    4 ++--
 pyatspi/text.py        |    4 ++--
 5 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/pyatspi/accessible.py b/pyatspi/accessible.py
index b0b5079..192a10b 100644
--- a/pyatspi/accessible.py
+++ b/pyatspi/accessible.py
@@ -218,7 +218,7 @@ class AccessibleImpl (BaseProxy):
                 return [key + ':' + value for key, value in attr.iteritems()]
 
         def getChildAtIndex(self, index):
-                count = Int32(self._pgetter(self.dbus_interface, "childCount"))
+                count = Int32(self._pgetter(self.dbus_interface, "ChildCount"))
                 if index >= count:
                         raise IndexError
                 func = self.get_dbus_method("GetChildAtIndex", dbus_interface=ATSPI_ACCESSIBLE)
@@ -251,17 +251,17 @@ class AccessibleImpl (BaseProxy):
                 return _marshal_state_set(func())
 
         def get_childCount(self):
-                return Int32(self._pgetter(self.dbus_interface, "childCount"))
+                return Int32(self._pgetter(self.dbus_interface, "ChildCount"))
 
         def get_description(self):
-                return self._pgetter(self.dbus_interface, "description")
+                return self._pgetter(self.dbus_interface, "Description")
 
         def get_name(self):
-                return self._pgetter(self.dbus_interface, "name")
+                return self._pgetter(self.dbus_interface, "Name")
 
         def get_parent(self):
                 return self.acc_factory.create_accessible(self._app_name,
-                                                          self._pgetter (self.dbus_interface, "parent"),
+                                                          self._pgetter (self.dbus_interface, "Parent"),
                                                           ATSPI_ACCESSIBLE)
 
         def get_interfaces (self):
diff --git a/pyatspi/cache.py b/pyatspi/cache.py
index 395b248..74e2f8f 100644
--- a/pyatspi/cache.py
+++ b/pyatspi/cache.py
@@ -95,7 +95,7 @@ class ApplicationCache(object):
 
                 self._regsig = connection.add_signal_receiver(self._update_handler,
                                                               dbus_interface=ATSPI_REGISTRY_INTERFACE,
-                                                              signal_name="updateApplications")
+                                                              signal_name="UpdateApplications")
 
                 obj = connection.get_object(ATSPI_REGISTRY_NAME,
                                             ATSPI_REGISTRY_PATH,
@@ -237,8 +237,8 @@ class AccessibleCache(object):
         _PATH = '/org/freedesktop/atspi/tree'
         _INTERFACE = 'org.freedesktop.atspi.Tree'
         _GET_METHOD = 'GetTree'
-        _UPDATE_SIGNAL = 'updateAccessible'
-        _REMOVE_SIGNAL = 'removeAccessible'
+        _UPDATE_SIGNAL = 'UpdateAccessible'
+        _REMOVE_SIGNAL = 'RemoveAccessible'
 
         def __init__(self, event_dispatcher, connection, bus_name):
                 """
diff --git a/pyatspi/deviceevent.py b/pyatspi/deviceevent.py
index 83ac949..ebbca52 100644
--- a/pyatspi/deviceevent.py
+++ b/pyatspi/deviceevent.py
@@ -493,7 +493,7 @@ class KeyboardDeviceEventListener(_service.Object):
         @_service.method(dbus_interface=ATSPI_DEVICE_EVENT_LISTENER_INTERFACE,
                          in_signature="(uinnisb)",
                          out_signature="b")
-        def notifyEvent(self, ev):
+        def NotifyEvent(self, ev):
                 """
                 Notifies the L{Registry} that an event has occurred. Wraps the raw event 
                 object in our L{Event} class to support automatic ref and unref calls. An
diff --git a/pyatspi/table.py b/pyatspi/table.py
index 778a2d3..7151d44 100644
--- a/pyatspi/table.py
+++ b/pyatspi/table.py
@@ -312,7 +312,7 @@ class Table(Accessible):
                 return func(row)
 
         def get_caption(self):
-                (name, path) = self._pgetter(self._dbus_interface, "caption")
+                (name, path) = self._pgetter(self._dbus_interface, "Caption")
                 if (name == ""):
                         name = self._app_name
                 return self.acc_factory.create_accessible(name, path,
@@ -363,7 +363,7 @@ class Table(Accessible):
         nSelectedRows = property(fget=get_nSelectedRows, doc=_nSelectedRowsDoc)
 
         def get_summary(self):
-                (name, path) = self._pgetter(self._dbus_interface, "summary")
+                (name, path) = self._pgetter(self._dbus_interface, "Summary")
                 if (name == ""):
                         name = self._app_name
                 return self.acc_factory.create_accessible(name, path,
diff --git a/pyatspi/text.py b/pyatspi/text.py
index e4f9685..9051262 100644
--- a/pyatspi/text.py
+++ b/pyatspi/text.py
@@ -535,7 +535,7 @@ class Text(Accessible):
                 return func(selectionNum, startOffset, endOffset)
 
         def get_caretOffset(self):
-                return Int32(self._pgetter(self.dbus_interface, "caretOffset"))
+                return Int32(self._pgetter(self.dbus_interface, "CaretOffset"))
         _caretOffsetDoc = \
                 """
                 The current offset of the text caret in the Text object. This
@@ -548,7 +548,7 @@ class Text(Accessible):
         caretOffset = property(fget=get_caretOffset, doc=_caretOffsetDoc)
 
         def get_characterCount(self):
-                return Int32(self._pgetter(self.dbus_interface, "characterCount"))
+                return Int32(self._pgetter(self.dbus_interface, "CharacterCount"))
         _characterCountDoc = \
                 """
                 The total current number of characters in the Text object, including



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