[telepathy-glib/master] account: add two further arguments to ::status-changed to be ready for the future

Jonny Lamb jonny.lamb at collabora.co.uk
Fri Sep 25 11:37:31 PDT 2009


Signed-off-by: Jonny Lamb <jonny.lamb at collabora.co.uk>
---
 telepathy-glib/account-manager.c    |    2 ++
 telepathy-glib/account.c            |    9 +++++++--
 telepathy-glib/signals-marshal.list |    2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/telepathy-glib/account-manager.c b/telepathy-glib/account-manager.c
index a8c920a..5f5c726 100644
--- a/telepathy-glib/account-manager.c
+++ b/telepathy-glib/account-manager.c
@@ -874,6 +874,8 @@ _tp_account_manager_account_status_changed_cb (TpAccount *account,
     TpConnectionStatus old,
     TpConnectionStatus new,
     TpConnectionStatusReason reason,
+    const gchar *dbus_error_name,
+    const GHashTable *details,
     gpointer user_data)
 {
   TpAccountManager *manager = TP_ACCOUNT_MANAGER (user_data);
diff --git a/telepathy-glib/account.c b/telepathy-glib/account.c
index 5c2d01e..b099af4 100644
--- a/telepathy-glib/account.c
+++ b/telepathy-glib/account.c
@@ -1228,6 +1228,10 @@ tp_account_class_init (TpAccountClass *klass)
    * @old_status: old connection status
    * @new_status: new connection status
    * @reason: the reason for the status change
+   * @dbus_error_name: currently unused, but for exposing the dbus error name
+   *                   on a connection error in the future
+   * @details: currently unused, but for exposing the error details
+   *           on a connection error in the future
    *
    * Emitted when the connection status on the account changes.
    *
@@ -1237,8 +1241,9 @@ tp_account_class_init (TpAccountClass *klass)
       G_TYPE_FROM_CLASS (object_class),
       G_SIGNAL_RUN_LAST,
       0, NULL, NULL,
-      _tp_marshal_VOID__UINT_UINT_UINT,
-      G_TYPE_NONE, 3, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT);
+      _tp_marshal_VOID__UINT_UINT_UINT_STRING_POINTER,
+      G_TYPE_NONE, 5, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_STRING,
+      G_TYPE_HASH_TABLE);
 
   /**
    * TpAccount::presence-changed:
diff --git a/telepathy-glib/signals-marshal.list b/telepathy-glib/signals-marshal.list
index 23f8720..cf1dcf7 100644
--- a/telepathy-glib/signals-marshal.list
+++ b/telepathy-glib/signals-marshal.list
@@ -5,6 +5,6 @@ VOID:POINTER,OBJECT
 VOID:POINTER,UINT,INT,STRING
 VOID:STRING,UINT,UINT,BOXED
 VOID:UINT,INT,STRING
-VOID:UINT,UINT,UINT
 VOID:UINT,OBJECT
 VOID:UINT,STRING,STRING
+VOID:UINT,UINT,UINT,STRING,POINTER
-- 
1.5.6.5




More information about the telepathy-commits mailing list