aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2014-01-27 20:06:02 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2014-01-27 20:06:02 +0800
commit367cb0a23315c4025be0b5f0a9fdf87b0830b0e3 (patch)
treed80ef1f90bfbe00649d077826ab1ea34f142f8b4
parentb9f326caa4fb29fbd7d3e8d31897da1e35815273 (diff)
downloadgsoc2013-empathy-367cb0a23315c4025be0b5f0a9fdf87b0830b0e3.tar
gsoc2013-empathy-367cb0a23315c4025be0b5f0a9fdf87b0830b0e3.tar.gz
gsoc2013-empathy-367cb0a23315c4025be0b5f0a9fdf87b0830b0e3.tar.bz2
gsoc2013-empathy-367cb0a23315c4025be0b5f0a9fdf87b0830b0e3.tar.lz
gsoc2013-empathy-367cb0a23315c4025be0b5f0a9fdf87b0830b0e3.tar.xz
gsoc2013-empathy-367cb0a23315c4025be0b5f0a9fdf87b0830b0e3.tar.zst
gsoc2013-empathy-367cb0a23315c4025be0b5f0a9fdf87b0830b0e3.zip
event-manager: remove HandleWith() fallback
Mission-control 5.5.0 has been released 3.5 years ago...
-rw-r--r--src/empathy-event-manager.c31
1 files changed, 1 insertions, 30 deletions
diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c
index dbb6a35bf..f7b4b4fdb 100644
--- a/src/empathy-event-manager.c
+++ b/src/empathy-event-manager.c
@@ -260,21 +260,6 @@ event_manager_add (EmpathyEventManager *manager,
}
static void
-handle_with_cb (GObject *source,
- GAsyncResult *result,
- gpointer user_data)
-{
- TpChannelDispatchOperation *cdo = TP_CHANNEL_DISPATCH_OPERATION (source);
- GError *error = NULL;
-
- if (!tp_channel_dispatch_operation_handle_with_finish (cdo, result, &error))
- {
- DEBUG ("HandleWith failed: %s\n", error->message);
- g_error_free (error);
- }
-}
-
-static void
handle_with_time_cb (GObject *source,
GAsyncResult *result,
gpointer user_data)
@@ -285,21 +270,7 @@ handle_with_time_cb (GObject *source,
if (!tp_channel_dispatch_operation_handle_with_time_finish (cdo, result,
&error))
{
- if (g_error_matches (error, TP_ERROR, TP_ERROR_NOT_IMPLEMENTED))
- {
- EventManagerApproval *approval = user_data;
-
- DEBUG ("HandleWithTime() is not implemented, falling back to "
- "HandleWith(). Please upgrade to telepathy-mission-control "
- "5.5.0 or later");
-
- tp_channel_dispatch_operation_handle_with_async (approval->operation,
- NULL, handle_with_cb, approval);
- }
- else
- {
- DEBUG ("HandleWithTime failed: %s\n", error->message);
- }
+ DEBUG ("HandleWithTime failed: %s\n", error->message);
g_error_free (error);
}
}