diff options
| author | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2011-02-01 16:30:01 +0000 |
|---|---|---|
| committer | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2011-02-01 16:30:01 +0000 |
| commit | 2c91e2858ada6667e31d151e9c5e21bd524aeb55 (patch) | |
| tree | e0b0a800bf72c533c5234f6f1ba4520bfc7e0f5e /python | |
| parent | aa9e8445fe220489781a9d8ad6f713f85d9408d6 (diff) | |
| parent | 8352bbd952628ae0b896f46d751157336b8410fb (diff) | |
Merge branch 'initialization'
Diffstat (limited to 'python')
| -rw-r--r-- | python/pytpfarstream.override | 7 | ||||
| -rw-r--r-- | python/pytpfarstreammodule.c | 2 | ||||
| -rwxr-xr-x | python/rebuild-defs.sh | 1 |
3 files changed, 4 insertions, 6 deletions
diff --git a/python/pytpfarstream.override b/python/pytpfarstream.override index e7c2286..e03d534 100644 --- a/python/pytpfarstream.override +++ b/python/pytpfarstream.override @@ -4,10 +4,7 @@ headers #include <gst/gst.h> -#include <telepathy-farstream/channel.h> -#include <telepathy-farstream/content.h> -#include <telepathy-farstream/stream.h> -#include <extensions/extensions.h> +#include <telepathy-farstream/telepathy-farstream.h> #include <telepathy-glib/dbus.h> #include <telepathy-glib/channel.h> @@ -125,8 +122,6 @@ _wrap_tf_channel_new_async(PyGObject *self, PyObject *args, PyObject *kwargs) PyObject *callback; PyObject *ret = NULL; - tf_future_cli_init (); - if (!PyArg_ParseTupleAndKeywords (args, kwargs, "sssO:tf_channel_new_async", kwlist, &busname, &connection_path, &channel_path, &callback)) goto out; diff --git a/python/pytpfarstreammodule.c b/python/pytpfarstreammodule.c index 3077bbd..f6e6f86 100644 --- a/python/pytpfarstreammodule.c +++ b/python/pytpfarstreammodule.c @@ -1,6 +1,7 @@ #include <pygobject.h> #include <gst/gst.h> +#include <telepathy-farstream/telepathy-farstream.h> void tf_register_classes (PyObject *d); @@ -14,6 +15,7 @@ inittpfarstream(void) { PyObject *m, *d; + tf_init (); init_pygobject (); m = Py_InitModule ("tpfarstream", tf_functions); diff --git a/python/rebuild-defs.sh b/python/rebuild-defs.sh index e450d15..f74bdd3 100755 --- a/python/rebuild-defs.sh +++ b/python/rebuild-defs.sh @@ -1,6 +1,7 @@ #!/bin/sh HEADERS=" \ + telepathy-farstream.h \ channel.h \ content.h \ stream.h" |