[next] telepathy-glib: inspect-cm.py: on errors, exit rather than blocking forever
Simon McVittie
smcv at kemper.freedesktop.org
Mon Nov 11 12:14:03 PST 2013
Module: telepathy-glib
Branch: next
Commit: 45d958eeff097e1df862cbbbb760bf5831201642
URL: http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=45d958eeff097e1df862cbbbb760bf5831201642
Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date: Tue Oct 22 19:11:53 2013 +0100
inspect-cm.py: on errors, exit rather than blocking forever
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=71048
Reviewed-by: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
---
examples/client/python/inspect-cm.py | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/examples/client/python/inspect-cm.py b/examples/client/python/inspect-cm.py
index c653cf7..0564078 100644
--- a/examples/client/python/inspect-cm.py
+++ b/examples/client/python/inspect-cm.py
@@ -28,9 +28,11 @@ def describe(cm):
print("\t\tNo default")
def manager_prepared_cb(cm, result, loop):
- cm.prepare_finish(result)
- describe(cm)
- loop.quit()
+ try:
+ cm.prepare_finish(result)
+ describe(cm)
+ finally:
+ loop.quit()
def inspect(name):
cm = Tp.ConnectionManager(
@@ -41,13 +43,14 @@ def inspect(name):
cm.prepare_async(None, cm, loop)
def cms_cb(source, result, loop):
- cms = Tp.list_connection_managers_finish(result)
-
- for cm in cms:
- describe(cm)
- print("")
-
- loop.quit()
+ try:
+ cms = Tp.list_connection_managers_finish(result)
+
+ for cm in cms:
+ describe(cm)
+ print("")
+ finally:
+ loop.quit()
if __name__ == '__main__':
loop = GObject.MainLoop()
More information about the telepathy-commits
mailing list