diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2013-09-26 12:26:54 +0200 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2013-09-26 16:02:49 +0200 |
| commit | 48a0b475ea349abda6963e576315c546440af2b3 (patch) | |
| tree | a5ea8701889d7d995dc3600cd962c6e3eca8d247 | |
| parent | b2a2aeae630cc8ee049734620d8d1117b1079874 (diff) | |
| download | telepathy-logger-48a0b475ea349abda6963e576315c546440af2b3.tar.gz | |
stop using tp-glib sealed variables
https://bugs.freedesktop.org/show_bug.cgi?id=69846
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | telepathy-logger/call-channel.c | 5 | ||||
| -rw-r--r-- | telepathy-logger/text-channel.c | 5 |
3 files changed, 5 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 8ca1db9..93863b0 100644 --- a/configure.ac +++ b/configure.ac @@ -72,6 +72,7 @@ DBUS_GLIB_REQUIRED=0.82 TELEPATHY_GLIB_REQUIRED=0.21.2 AC_DEFINE(TP_VERSION_MIN_REQUIRED, TP_VERSION_0_22, [Ignore post 0.22 deprecations]) AC_DEFINE(TP_VERSION_MAX_ALLOWED, TP_VERSION_0_22, [Prevent post 0.22 APIs]) +AC_DEFINE(TP_SEAL_ENABLE, 1, [Prevent to use sealed variables]) GLIB_REQUIRED=2.32 dnl MIN_REQUIRED must stay to 2.30 because of GValueArray diff --git a/telepathy-logger/call-channel.c b/telepathy-logger/call-channel.c index 5ef6766..f8e57c0 100644 --- a/telepathy-logger/call-channel.c +++ b/telepathy-logger/call-channel.c @@ -463,7 +463,6 @@ _tpl_call_channel_new_with_factory (TpSimpleClientFactory *factory, const GHashTable *tp_chan_props, GError **error) { - TpProxy *conn_proxy = TP_PROXY (conn); TplCallChannel *self; /* Do what tpl_channel_new does + set TplCallChannel @@ -479,8 +478,8 @@ _tpl_call_channel_new_with_factory (TpSimpleClientFactory *factory, self = g_object_new (TPL_TYPE_CALL_CHANNEL, "factory", factory, "connection", conn, - "dbus-daemon", conn_proxy->dbus_daemon, - "bus-name", conn_proxy->bus_name, + "dbus-daemon", tp_proxy_get_dbus_daemon (conn), + "bus-name", tp_proxy_get_bus_name (conn), "object-path", object_path, "handle-type", (guint) TP_UNKNOWN_HANDLE_TYPE, "channel-properties", tp_chan_props, diff --git a/telepathy-logger/text-channel.c b/telepathy-logger/text-channel.c index f34eeec..edfea1d 100644 --- a/telepathy-logger/text-channel.c +++ b/telepathy-logger/text-channel.c @@ -703,7 +703,6 @@ _tpl_text_channel_new_with_factory (TpSimpleClientFactory *factory, const GHashTable *tp_chan_props, GError **error) { - TpProxy *conn_proxy = TP_PROXY (conn); TplTextChannel *self; /* Do what tpl_channel_new does + set TplTextChannel specific */ @@ -719,8 +718,8 @@ _tpl_text_channel_new_with_factory (TpSimpleClientFactory *factory, /* TpChannel properties */ "factory", factory, "connection", conn, - "dbus-daemon", conn_proxy->dbus_daemon, - "bus-name", conn_proxy->bus_name, + "dbus-daemon", tp_proxy_get_dbus_daemon (conn), + "bus-name", tp_proxy_get_bus_name (conn), "object-path", object_path, "handle-type", (guint) TP_UNKNOWN_HANDLE_TYPE, "channel-properties", tp_chan_props, |