diff options
| author | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-04-29 23:25:35 +0800 |
|---|---|---|
| committer | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-04-29 23:25:35 +0800 |
| commit | b028f1e3930ab201994eccd4ff7d1bc18c50e6f3 (patch) | |
| tree | 4b83e90fe17af81dd8edffaf8084688a9d022bc7 /src/empathy-call-handler.c | |
| parent | cf401b3897d7d4eba4e8dbe5fec9e85079e17446 (diff) | |
| parent | 1c68eae8b655e8904bbb0a90001f01eb6d3b342a (diff) | |
| download | gsoc2013-empathy-b028f1e3930ab201994eccd4ff7d1bc18c50e6f3.tar gsoc2013-empathy-b028f1e3930ab201994eccd4ff7d1bc18c50e6f3.tar.gz gsoc2013-empathy-b028f1e3930ab201994eccd4ff7d1bc18c50e6f3.tar.bz2 gsoc2013-empathy-b028f1e3930ab201994eccd4ff7d1bc18c50e6f3.tar.lz gsoc2013-empathy-b028f1e3930ab201994eccd4ff7d1bc18c50e6f3.tar.xz gsoc2013-empathy-b028f1e3930ab201994eccd4ff7d1bc18c50e6f3.tar.zst gsoc2013-empathy-b028f1e3930ab201994eccd4ff7d1bc18c50e6f3.zip | |
Merge branch 'empathy-skype' into debian
Diffstat (limited to 'src/empathy-call-handler.c')
| -rw-r--r-- | src/empathy-call-handler.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/empathy-call-handler.c b/src/empathy-call-handler.c index aff96bd6e..56d109838 100644 --- a/src/empathy-call-handler.c +++ b/src/empathy-call-handler.c @@ -189,13 +189,18 @@ static void on_call_state_changed_cb (TpyCallChannel *call, TpyCallState state, TpyCallFlags flags, - const GValueArray *call_state_reason, + const GValueArray *call_state_reason, GHashTable *call_state_details, EmpathyCallHandler *handler) { EmpathyCallHandlerPriv *priv = handler->priv; + gchar *dbus_reason; + guint actor, reason; - g_signal_emit (handler, signals[STATE_CHANGED], 0, state); + tp_value_array_unpack ((GValueArray *) call_state_reason, 3, + &actor, &reason, &dbus_reason); + + g_signal_emit (handler, signals[STATE_CHANGED], 0, state, dbus_reason); if (state == TPY_CALL_STATE_ENDED) { @@ -503,8 +508,8 @@ empathy_call_handler_class_init (EmpathyCallHandlerClass *klass) signals[STATE_CHANGED] = g_signal_new ("state-changed", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST, 0, NULL, NULL, - g_cclosure_marshal_VOID__UINT, - G_TYPE_NONE, 1, G_TYPE_UINT); + _src_marshal_VOID__UINT_STRING, + G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_STRING); } EmpathyCallHandler * |