From e1d4f5439e851a8ac4585e021778c13cb1d122ed Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 12 Nov 2013 12:44:35 +0000 Subject: examples: explicitly ask for TelepathyGLib-0.12 TelepathyGLib-1 isn't going to be fully compatible. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=49737 Reviewed-by: Guillaume Desmottes --- examples/client/js/contact-list.js | 3 +++ examples/client/js/debug-client.js | 3 +++ examples/client/python/contact-list.py | 2 ++ examples/client/python/dialler.py | 2 ++ examples/client/python/ensure-channel.py | 3 +++ examples/client/python/file-transfer.py | 3 +++ examples/client/python/ft-handler.py | 3 +++ examples/client/python/inspect-cm.py | 2 ++ examples/client/python/stream-tube-accepter.py | 2 ++ examples/client/python/stream-tube-offerer.py | 2 ++ examples/client/python/text-handler.py | 3 +++ 11 files changed, 28 insertions(+) diff --git a/examples/client/js/contact-list.js b/examples/client/js/contact-list.js index e0112f7d9..f0080f4c5 100755 --- a/examples/client/js/contact-list.js +++ b/examples/client/js/contact-list.js @@ -1,5 +1,8 @@ #! /usr/bin/gjs +const Gi = imports.gi; +Gi.versions.TelepathyGLib = '0.12'; + const Tp = imports.gi.TelepathyGLib; const Mainloop = imports.mainloop; diff --git a/examples/client/js/debug-client.js b/examples/client/js/debug-client.js index cfb1cad49..38118538d 100755 --- a/examples/client/js/debug-client.js +++ b/examples/client/js/debug-client.js @@ -18,6 +18,9 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +const Gi = imports.gi; +Gi.versions.TelepathyGLib = '0.12'; + const GLib = imports.gi.GLib; const Gio = imports.gi.Gio; const Lang = imports.lang; diff --git a/examples/client/python/contact-list.py b/examples/client/python/contact-list.py index 719222470..df854f19b 100755 --- a/examples/client/python/contact-list.py +++ b/examples/client/python/contact-list.py @@ -1,9 +1,11 @@ #!/usr/bin/env python import os +import gi from gi.repository import GObject GObject.threads_init() +gi.require_version('TelepathyGLib', '0.12') from gi.repository import TelepathyGLib as Tp def manager_prepared_cb(manager, result, loop): diff --git a/examples/client/python/dialler.py b/examples/client/python/dialler.py index e988b115e..844a808a3 100755 --- a/examples/client/python/dialler.py +++ b/examples/client/python/dialler.py @@ -20,10 +20,12 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +import gi from gi.repository import GLib from gi.repository import GObject from gi.repository import Gio from gi.repository import Gtk +gi.require_version('TelepathyGLib', '0.12') from gi.repository import TelepathyGLib as Tp import sys diff --git a/examples/client/python/ensure-channel.py b/examples/client/python/ensure-channel.py index 344b7dbd5..9e46239ff 100755 --- a/examples/client/python/ensure-channel.py +++ b/examples/client/python/ensure-channel.py @@ -1,9 +1,12 @@ #!/usr/bin/env python import sys +import gi + from gi.repository import GObject GObject.threads_init() +gi.require_version('TelepathyGLib', '0.12') from gi.repository import TelepathyGLib def usage(): diff --git a/examples/client/python/file-transfer.py b/examples/client/python/file-transfer.py index cccfae857..f56fa1831 100755 --- a/examples/client/python/file-transfer.py +++ b/examples/client/python/file-transfer.py @@ -3,10 +3,13 @@ import sys import os import mimetypes +import gi + from gi.repository import GObject GObject.threads_init() from gi.repository import Gio +gi.require_version('TelepathyGLib', '0.12') from gi.repository import TelepathyGLib def usage(): diff --git a/examples/client/python/ft-handler.py b/examples/client/python/ft-handler.py index d1ac1775e..fe6f24f79 100644 --- a/examples/client/python/ft-handler.py +++ b/examples/client/python/ft-handler.py @@ -1,10 +1,13 @@ #!/usr/bin/env python import sys +import gi + from gi.repository import GObject GObject.threads_init() from gi.repository import Gio +gi.require_version('TelepathyGLib', '0.12') from gi.repository import TelepathyGLib def usage(): diff --git a/examples/client/python/inspect-cm.py b/examples/client/python/inspect-cm.py index 0564078a9..cf3b83800 100644 --- a/examples/client/python/inspect-cm.py +++ b/examples/client/python/inspect-cm.py @@ -1,7 +1,9 @@ #!/usr/bin/env python import sys +import gi from gi.repository import GObject +gi.require_version('TelepathyGLib', '0.12') from gi.repository import TelepathyGLib as Tp def describe(cm): diff --git a/examples/client/python/stream-tube-accepter.py b/examples/client/python/stream-tube-accepter.py index 0720ae7be..b5ed6773d 100755 --- a/examples/client/python/stream-tube-accepter.py +++ b/examples/client/python/stream-tube-accepter.py @@ -2,7 +2,9 @@ import os +import gi from gi.repository import GObject, Gio +gi.require_version('TelepathyGLib', '0.12') from gi.repository import TelepathyGLib as Tp def tube_conn_closed(tube, error): diff --git a/examples/client/python/stream-tube-offerer.py b/examples/client/python/stream-tube-offerer.py index 1f4309d51..69b533242 100755 --- a/examples/client/python/stream-tube-offerer.py +++ b/examples/client/python/stream-tube-offerer.py @@ -3,7 +3,9 @@ import sys import os +import gi from gi.repository import GObject, Gio +gi.require_version('TelepathyGLib', '0.12') from gi.repository import TelepathyGLib as Tp def usage(): diff --git a/examples/client/python/text-handler.py b/examples/client/python/text-handler.py index f9870a70b..7a1d6e87b 100755 --- a/examples/client/python/text-handler.py +++ b/examples/client/python/text-handler.py @@ -1,8 +1,11 @@ #!/usr/bin/env python +import gi + from gi.repository import GObject GObject.threads_init() +gi.require_version('TelepathyGLib', '0.12') from gi.repository import TelepathyGLib def echo_message(channel, msg, pending): -- cgit v1.2.3