Drop unused patches
This commit is contained in:
parent
273cce03ed
commit
fa0b45c629
@ -1,68 +0,0 @@
|
||||
From dca73eb4051d4c56601da757e98deb60c1af6deb Mon Sep 17 00:00:00 2001
|
||||
From: Willie Walker <william.walker@sun.com>
|
||||
Date: Wed, 6 Jan 2010 13:44:46 -0500
|
||||
Subject: [PATCH] Use pyatspi_corba if /desktop/gnome/interface/at-spi-corba is True
|
||||
|
||||
---
|
||||
pyatspi/__init__.py | 44 +++++++++++++++++++++++++++++++-------------
|
||||
1 files changed, 31 insertions(+), 13 deletions(-)
|
||||
|
||||
diff --git a/pyatspi/__init__.py b/pyatspi/__init__.py
|
||||
index 9b508e3..5106df2 100644
|
||||
--- a/pyatspi/__init__.py
|
||||
+++ b/pyatspi/__init__.py
|
||||
@@ -12,20 +12,38 @@
|
||||
#along with this program; if not, write to the Free Software
|
||||
#Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
|
||||
-__version__ = (1, 9, 0)
|
||||
+try:
|
||||
+ import gconf
|
||||
+ gconfClient = gconf.client_get_default()
|
||||
+ useCorba = gconfClient.get_bool("/desktop/gnome/interface/at-spi-corba")
|
||||
+except:
|
||||
+ useCorba = False
|
||||
+finally:
|
||||
+ del gconfClient
|
||||
+ del gconf
|
||||
|
||||
-import constants
|
||||
-from Accessibility import *
|
||||
+if useCorba:
|
||||
+ import sys
|
||||
+ import pyatspi_corba
|
||||
+ sys.modules['pyatspi'] = pyatspi_corba
|
||||
+ del sys
|
||||
+else:
|
||||
+ __version__ = (1, 9, 0)
|
||||
|
||||
-from dbus.mainloop.glib import DBusGMainLoop
|
||||
-DBusGMainLoop (set_as_default=True)
|
||||
-del DBusGMainLoop
|
||||
+ import constants
|
||||
+ from Accessibility import *
|
||||
|
||||
-#This is a re-creation of the namespace pollution implemented
|
||||
-#by PyORBit.
|
||||
-import sys
|
||||
-import Accessibility
|
||||
-sys.modules['Accessibility'] = Accessibility
|
||||
-del sys
|
||||
+ from dbus.mainloop.glib import DBusGMainLoop
|
||||
+ DBusGMainLoop (set_as_default=True)
|
||||
+ del DBusGMainLoop
|
||||
|
||||
-import appevent as event
|
||||
+ #This is a re-creation of the namespace pollution implemented
|
||||
+ #by PyORBit.
|
||||
+ import sys
|
||||
+ import Accessibility
|
||||
+ sys.modules['Accessibility'] = Accessibility
|
||||
+ del sys
|
||||
+
|
||||
+ import appevent as event
|
||||
+
|
||||
+del useCorba
|
||||
--
|
||||
1.5.6.5
|
||||
|
||||
@ -1,57 +0,0 @@
|
||||
diff -up pyatspi-0.3.2/pyatspi/appevent.py.caribou pyatspi-0.3.2/pyatspi/appevent.py
|
||||
--- pyatspi-0.3.2/pyatspi/appevent.py.caribou 2010-06-02 09:40:28.908726573 -0400
|
||||
+++ pyatspi-0.3.2/pyatspi/appevent.py 2010-06-02 09:51:36.593484219 -0400
|
||||
@@ -283,11 +283,11 @@ class Event(object):
|
||||
|
||||
@property
|
||||
def source_name(self):
|
||||
- return source.name
|
||||
+ return self.source.name
|
||||
|
||||
@property
|
||||
def source_role(self):
|
||||
- return source.getRole()
|
||||
+ return self.source.getRole()
|
||||
|
||||
def __str__(self):
|
||||
"""
|
||||
diff -up pyatspi-0.3.2/pyatspi/text.py.caribou pyatspi-0.3.2/pyatspi/text.py
|
||||
--- pyatspi-0.3.2/pyatspi/text.py.caribou 2010-06-02 09:52:17.637502240 -0400
|
||||
+++ pyatspi-0.3.2/pyatspi/text.py 2010-06-02 09:52:58.568477306 -0400
|
||||
@@ -249,7 +249,7 @@ class Text(Accessible):
|
||||
func = self.get_dbus_method("GetCharacterAtOffset", dbus_interface=ATSPI_TEXT)
|
||||
return func(offset)
|
||||
|
||||
- def getCharacterExtents(self, offset, x, y, width, height, coordType):
|
||||
+ def getCharacterExtents(self, offset, coordType):
|
||||
"""
|
||||
Obtain a the bounding box, as x, y, width, and height, of the
|
||||
character or glyph at a particular character offset in this object's
|
||||
@@ -260,18 +260,6 @@ class Text(Accessible):
|
||||
and therefore may apply to more than one character offset.
|
||||
@param : offset
|
||||
the character offset of the character or glyph being queried.
|
||||
- @param : x
|
||||
- the minimum horizontal coordinate of the bounding box of the
|
||||
- glyph representing the character at offset.
|
||||
- @param : y
|
||||
- the minimum vertical coordinate of the bounding box of the glyph
|
||||
- representing the character at offset.
|
||||
- @param : width
|
||||
- the horizontal extent of the bounding box of the glyph representing
|
||||
- the character at offset.
|
||||
- @param : height
|
||||
- the vertical extent of the bounding box of the glyph representing
|
||||
- the character at offset.
|
||||
@param : coordType
|
||||
If 0, the results will be reported in screen coordinates, i.e.
|
||||
in pixels relative to the upper-left corner of the screen, with
|
||||
@@ -281,7 +269,7 @@ class Text(Accessible):
|
||||
down.
|
||||
"""
|
||||
func = self.get_dbus_method("GetCharacterExtents", dbus_interface=ATSPI_TEXT)
|
||||
- return func(offset, x, y, width, height, UInt32(coordType))
|
||||
+ return func(offset, UInt32(coordType))
|
||||
|
||||
def getDefaultAttributeSet(self):
|
||||
"""
|
||||
Loading…
Reference in New Issue
Block a user