summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordavemds <dave@gurumeditation.it>2013-11-18 20:17:02 +0100
committerdavemds <dave@gurumeditation.it>2013-11-18 20:19:42 +0100
commit2e2d433cae94162463aa85630764ce2666377fd5 (patch)
tree672fb5ade2175f239a594796f604cd780676de19
parent780d1d48d03cf0d8cdff74fad3d248f7821fadb1 (diff)
Espionage: 2 small fixes
1. remove deprecated warning about the usage of ElementTree.find() 2. remove an old hack for popup in the method runner, it still don't respect the size_hint_min however.
-rw-r--r--espionage/espionage.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/espionage/espionage.py b/espionage/espionage.py
index 545d682..af8534a 100644
--- a/espionage/espionage.py
+++ b/espionage/espionage.py
@@ -202,7 +202,7 @@ def recursive_introspect(bus, named_service, object_path, ret_data=None):
202 # print('=' * 80) 202 # print('=' * 80)
203 203
204 # traverse the xml tree 204 # traverse the xml tree
205 if xml_root.find('interface'): 205 if xml_root.find('interface') is not None:
206 # found a new object 206 # found a new object
207 obj = DBusObject(object_path, named_service) 207 obj = DBusObject(object_path, named_service)
208 ret_data.append(obj) 208 ret_data.append(obj)
@@ -484,11 +484,9 @@ class MethodRunner(Popup):
484 self._return_entry = en 484 self._return_entry = en
485 en.size_hint_weight = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND 485 en.size_hint_weight = EVAS_HINT_EXPAND, EVAS_HINT_EXPAND
486 en.size_hint_align = EVAS_HINT_FILL, EVAS_HINT_FILL 486 en.size_hint_align = EVAS_HINT_FILL, EVAS_HINT_FILL
487 en.size_hint_min = 800, 800 # TODO: this should be respected :/
487 en.editable = False 488 en.editable = False
488 en.scrollable = True 489 en.scrollable = True
489 en.disabled = True
490 en.single_line = True # TODO this is wrong, but the only way to show the entry :/
491 en.entry = '<br> <br> <br>'
492 en.show() 490 en.show()
493 vbox.pack_end(en) 491 vbox.pack_end(en)
494 492