diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-12-04 17:46:32 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-12-04 17:46:32 +0000 |
| commit | 2964b27b51d21248883aa52b26c28dbb055e3ce1 (patch) | |
| tree | a17172dc9019b7566cf4c96bc61d1512f26c851b /telepathy-glib/media-interfaces.c | |
| parent | 43a73b2c421accb4d0caecbc0c4cc5e9d60db6b1 (diff) | |
| download | telepathy-glib-2964b27b51d21248883aa52b26c28dbb055e3ce1.tar.gz | |
Fix up various errors in media-interfaces.c (not seen yet because it wasn't actually compiled)
20071204174632-53eee-d7e02b0d91584ced224ea8e7d401b7d1b90df5d2.gz
Diffstat (limited to 'telepathy-glib/media-interfaces.c')
| -rw-r--r-- | telepathy-glib/media-interfaces.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/telepathy-glib/media-interfaces.c b/telepathy-glib/media-interfaces.c index 55a125692..3276b0231 100644 --- a/telepathy-glib/media-interfaces.c +++ b/telepathy-glib/media-interfaces.c @@ -21,6 +21,9 @@ #include "telepathy-glib/media-interfaces.h" +#include <telepathy-glib/dbus.h> +#include <telepathy-glib/interfaces.h> + #include "telepathy-glib/_gen/tp-cli-media-session-handler-body.h" #include "telepathy-glib/_gen/tp-cli-media-stream-handler-body.h" @@ -70,6 +73,8 @@ tp_media_stream_handler_class_init (TpMediaStreamHandlerClass *klass) proxy_class->must_have_unique_name = TRUE; proxy_class->interface = TP_IFACE_QUARK_MEDIA_STREAM_HANDLER; + tp_proxy_class_hook_on_interface_add (proxy_class, + tp_cli_media_stream_handler_add_signals); } /** @@ -92,7 +97,7 @@ tp_media_stream_handler_new (TpDBusDaemon *dbus, { TpMediaStreamHandler *ret = NULL; - if (!tp_dbus_check_valid_bus_name (bus_name, + if (!tp_dbus_check_valid_bus_name (unique_name, TP_DBUS_NAME_TYPE_UNIQUE, error)) goto finally; @@ -101,7 +106,7 @@ tp_media_stream_handler_new (TpDBusDaemon *dbus, ret = TP_MEDIA_STREAM_HANDLER (g_object_new (TP_TYPE_MEDIA_STREAM_HANDLER, "dbus-daemon", dbus, - "bus-name", bus_name, + "bus-name", unique_name, "object-path", object_path, NULL)); @@ -145,6 +150,8 @@ tp_media_session_handler_class_init (TpMediaSessionHandlerClass *klass) proxy_class->must_have_unique_name = TRUE; proxy_class->interface = TP_IFACE_QUARK_MEDIA_SESSION_HANDLER; + tp_proxy_class_hook_on_interface_add (proxy_class, + tp_cli_media_session_handler_add_signals); } /** @@ -162,12 +169,12 @@ tp_media_session_handler_class_init (TpMediaSessionHandlerClass *klass) TpMediaSessionHandler * tp_media_session_handler_new (TpDBusDaemon *dbus, const gchar *unique_name, - const gchar *object_path + const gchar *object_path, GError **error) { TpMediaSessionHandler *ret = NULL; - if (!tp_dbus_check_valid_bus_name (bus_name, + if (!tp_dbus_check_valid_bus_name (unique_name, TP_DBUS_NAME_TYPE_UNIQUE, error)) goto finally; @@ -176,7 +183,7 @@ tp_media_session_handler_new (TpDBusDaemon *dbus, ret = TP_MEDIA_SESSION_HANDLER (g_object_new (TP_TYPE_MEDIA_SESSION_HANDLER, "dbus-daemon", dbus, - "bus-name", bus_name, + "bus-name", unique_name, "object-path", object_path, NULL)); |