Attachment 86634 Details for Bug 69846 – stop using tp-glib sealed variables

[patch] stop using tp-glib sealed variables

0002-stop-using-tp-glib-sealed-variables.patch (text/plain), 2.80 KB, created by Guillaume Desmottes on 2013-09-26 12:10:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guillaume Desmottes

Created: 2013-09-26 12:10:27 UTC

Size: 2.80 KB

patch

obsolete

>From a285a0ba4a0e13a7602470d79db64fa033e3e994 Mon Sep 17 00:00:00 2001
>From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
>Date: Thu, 26 Sep 2013 12:26:54 +0200
>Subject: [PATCH 2/3] stop using tp-glib sealed variables
>
>---
> configure.ac                    | 1 +
> telepathy-logger/call-channel.c | 5 ++---
> 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,
>-- 
>1.8.3.1
>

Actions: View | Splinter Review

Attachments on bug 69846: 86633 | 86634 | 86635 | 86636

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.