[next] telepathy-glib: fix signature of TpProxy::invalidated callbacks

Simon McVittie smcv at kemper.freedesktop.org
Wed Sep 17 05:22:52 PDT 2014


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

Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Tue May 27 17:42:49 2014 +0200

fix signature of TpProxy::invalidated callbacks

---

 telepathy-glib/account.c    |    5 +++--
 telepathy-glib/channel.c    |    2 +-
 telepathy-glib/connection.c |    6 +++++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/telepathy-glib/account.c b/telepathy-glib/account.c
index c245b6b..cec883c 100644
--- a/telepathy-glib/account.c
+++ b/telepathy-glib/account.c
@@ -395,8 +395,9 @@ tp_account_init (TpAccount *self)
 static void
 _tp_account_invalidated_cb (TpAccount *self,
     guint domain,
-    guint code,
-    gchar *message)
+    gint code,
+    gchar *message,
+    gpointer user_data)
 {
   TpAccountPrivate *priv = self->priv;
 
diff --git a/telepathy-glib/channel.c b/telepathy-glib/channel.c
index a35b437..d7df915 100644
--- a/telepathy-glib/channel.c
+++ b/telepathy-glib/channel.c
@@ -880,7 +880,7 @@ tp_channel_closed_cb (TpChannel *self,
 static void
 tp_channel_connection_invalidated_cb (TpConnection *conn,
                                       guint domain,
-                                      guint code,
+                                      gint code,
                                       gchar *message,
                                       TpChannel *self)
 {
diff --git a/telepathy-glib/connection.c b/telepathy-glib/connection.c
index f88611f..15a3be6 100644
--- a/telepathy-glib/connection.c
+++ b/telepathy-glib/connection.c
@@ -1027,7 +1027,11 @@ tp_connection_status_changed_cb (TpConnection *self,
 }
 
 static void
-tp_connection_invalidated (TpConnection *self)
+tp_connection_invalidated (TpConnection *self,
+    guint domain,
+    gint code,
+    gchar *message,
+    gpointer user_data)
 {
   if (self->priv->introspection_call != NULL)
     {



More information about the telepathy-commits mailing list