[next] telepathy-glib: Don't set TpBaseConnection: self_handle struct member directly

Xavier Claessens xclaesse at kemper.freedesktop.org
Mon May 14 04:28:10 PDT 2012


Module: telepathy-glib
Branch: next
Commit: 3e32871818816a80c9e85893b3866b5112703170
URL:    http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=3e32871818816a80c9e85893b3866b5112703170

Author: Xavier Claessens <xavier.claessens at collabora.co.uk>
Date:   Fri May 11 11:38:56 2012 +0200

Don't set TpBaseConnection:self_handle struct member directly

The setter does more things

---

 examples/cm/call/conn.c               |    4 ++--
 examples/cm/channelspecific/conn.c    |    4 ++--
 examples/cm/contactlist/conn.c        |    4 ++--
 examples/cm/echo-message-parts/conn.c |    4 ++--
 examples/cm/extended/conn.c           |    4 ++--
 tests/lib/simple-conn.c               |    4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/examples/cm/call/conn.c b/examples/cm/call/conn.c
index c72b98a..dba4783 100644
--- a/examples/cm/call/conn.c
+++ b/examples/cm/call/conn.c
@@ -188,8 +188,8 @@ start_connecting (TpBaseConnection *conn,
    * start connecting, then go to state CONNECTED when finished, but here
    * we can do it immediately. */
 
-  conn->self_handle = tp_handle_ensure (contact_repo, self->priv->account,
-      NULL, error);
+  tp_base_connection_set_self_handle (conn,
+      tp_handle_ensure (contact_repo, self->priv->account, NULL, error));
 
   if (conn->self_handle == 0)
     return FALSE;
diff --git a/examples/cm/channelspecific/conn.c b/examples/cm/channelspecific/conn.c
index 3e516d6..711b399 100644
--- a/examples/cm/channelspecific/conn.c
+++ b/examples/cm/channelspecific/conn.c
@@ -195,8 +195,8 @@ start_connecting (TpBaseConnection *conn,
    * start connecting, then go to state CONNECTED when finished, but here
    * we can do it immediately. */
 
-  conn->self_handle = tp_handle_ensure (contact_repo, self->priv->account,
-      NULL, error);
+  tp_base_connection_set_self_handle (conn,
+      tp_handle_ensure (contact_repo, self->priv->account, NULL, error));
 
   if (conn->self_handle == 0)
     return FALSE;
diff --git a/examples/cm/contactlist/conn.c b/examples/cm/contactlist/conn.c
index c033d42..0f7314a 100644
--- a/examples/cm/contactlist/conn.c
+++ b/examples/cm/contactlist/conn.c
@@ -218,8 +218,8 @@ start_connecting (TpBaseConnection *conn,
    * start connecting, then go to state CONNECTED when finished, but here
    * we can do it immediately. */
 
-  conn->self_handle = tp_handle_ensure (contact_repo, self->priv->account,
-      NULL, error);
+  tp_base_connection_set_self_handle (conn,
+      tp_handle_ensure (contact_repo, self->priv->account, NULL, error));
 
   if (conn->self_handle == 0)
     return FALSE;
diff --git a/examples/cm/echo-message-parts/conn.c b/examples/cm/echo-message-parts/conn.c
index ac2793a..fe13194 100644
--- a/examples/cm/echo-message-parts/conn.c
+++ b/examples/cm/echo-message-parts/conn.c
@@ -139,8 +139,8 @@ start_connecting (TpBaseConnection *conn,
    * start connecting, then go to state CONNECTED when finished, but here
    * we can do it immediately. */
 
-  conn->self_handle = tp_handle_ensure (contact_repo, self->priv->account,
-      NULL, NULL);
+  tp_base_connection_set_self_handle (conn,
+      tp_handle_ensure (contact_repo, self->priv->account, NULL, error));
 
   tp_base_connection_change_status (conn, TP_CONNECTION_STATUS_CONNECTED,
       TP_CONNECTION_STATUS_REASON_REQUESTED);
diff --git a/examples/cm/extended/conn.c b/examples/cm/extended/conn.c
index 2cd9546..1ef3a16 100644
--- a/examples/cm/extended/conn.c
+++ b/examples/cm/extended/conn.c
@@ -154,8 +154,8 @@ start_connecting (TpBaseConnection *conn,
    * start connecting, then go to state CONNECTED when finished, but here
    * we can do it immediately. */
 
-  conn->self_handle = tp_handle_ensure (contact_repo, self->priv->account,
-      NULL, NULL);
+  tp_base_connection_set_self_handle (conn,
+      tp_handle_ensure (contact_repo, self->priv->account, NULL, error));
 
   tp_base_connection_change_status (conn, TP_CONNECTION_STATUS_CONNECTED,
       TP_CONNECTION_STATUS_REASON_REQUESTED);
diff --git a/tests/lib/simple-conn.c b/tests/lib/simple-conn.c
index 3082914..60cd356 100644
--- a/tests/lib/simple-conn.c
+++ b/tests/lib/simple-conn.c
@@ -202,8 +202,8 @@ pretend_connected (gpointer data)
   TpHandleRepoIface *contact_repo = tp_base_connection_get_handles (conn,
       TP_HANDLE_TYPE_CONTACT);
 
-  conn->self_handle = tp_handle_ensure (contact_repo, self->priv->account,
-      NULL, NULL);
+  tp_base_connection_set_self_handle (conn,
+      tp_handle_ensure (contact_repo, self->priv->account, NULL, NULL));
 
   if (conn->status == TP_CONNECTION_STATUS_CONNECTING)
     {



More information about the telepathy-commits mailing list