aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-05-16 23:42:17 +0800
committerEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-05-16 23:42:17 +0800
commitaebcfd442a1976d2f249445f4d56e791723552c4 (patch)
tree869ee7a6194cdbd9deec541664c8149a8e6b2e9c
parenta9910c1393f9a39d8f29b9470554dd22aa3d0c79 (diff)
downloadgsoc2013-empathy-aebcfd442a1976d2f249445f4d56e791723552c4.tar
gsoc2013-empathy-aebcfd442a1976d2f249445f4d56e791723552c4.tar.gz
gsoc2013-empathy-aebcfd442a1976d2f249445f4d56e791723552c4.tar.bz2
gsoc2013-empathy-aebcfd442a1976d2f249445f4d56e791723552c4.tar.lz
gsoc2013-empathy-aebcfd442a1976d2f249445f4d56e791723552c4.tar.xz
gsoc2013-empathy-aebcfd442a1976d2f249445f4d56e791723552c4.tar.zst
gsoc2013-empathy-aebcfd442a1976d2f249445f4d56e791723552c4.zip
CallHandler: move on_call_accepted_cb() around
-rw-r--r--src/empathy-call-handler.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/src/empathy-call-handler.c b/src/empathy-call-handler.c
index 32164415f..be46bd7ff 100644
--- a/src/empathy-call-handler.c
+++ b/src/empathy-call-handler.c
@@ -889,6 +889,21 @@ empathy_call_handler_start_tpfs (EmpathyCallHandler *self)
on_tf_channel_ready, self);
}
+static void
+on_call_accepted_cb (GObject *source_object,
+ GAsyncResult *res,
+ gpointer user_data)
+{
+ TpyCallChannel *call = TPY_CALL_CHANNEL (source_object);
+ GError *error = NULL;
+
+ if (!tpy_call_channel_accept_finish (call, res, &error))
+ {
+ g_warning ("could not accept Call: %s", error->message);
+ g_error_free (error);
+ }
+}
+
#if 0
static void
empathy_call_handler_request_cb (GObject *source,
@@ -924,21 +939,6 @@ empathy_call_handler_request_cb (GObject *source,
}
#endif
-static void
-on_call_accepted_cb (GObject *source_object,
- GAsyncResult *res,
- gpointer user_data)
-{
- TpyCallChannel *call = TPY_CALL_CHANNEL (source_object);
- GError *error = NULL;
-
- if (!tpy_call_channel_accept_finish (call, res, &error))
- {
- g_warning ("could not accept Call: %s", error->message);
- g_error_free (error);
- }
-}
-
void
empathy_call_handler_start_call (EmpathyCallHandler *handler,
gint64 timestamp)