From 8b0718b8a650ff1f5d9e4a77011646366e592126 Mon Sep 17 00:00:00 2001
From: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Date: Wed, 23 Feb 2011 16:44:55 +0000
Subject: event-manager Remove HAVE_CALL ifdefs, even if we didn't build the
 handler we can still approve

---
 src/empathy-event-manager.c | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

(limited to 'src')

diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c
index 323e28d10..d3949989e 100644
--- a/src/empathy-event-manager.c
+++ b/src/empathy-event-manager.c
@@ -29,9 +29,7 @@
 #include <telepathy-glib/interfaces.h>
 #include <telepathy-glib/simple-approver.h>
 
-#if HAVE_CALL
- #include <telepathy-yell/telepathy-yell.h>
-#endif
+#include <telepathy-yell/telepathy-yell.h>
 
 #include <libempathy/empathy-idle.h>
 
@@ -409,7 +407,6 @@ reject_channel_claim_cb (GObject *source,
     {
       empathy_tp_streamed_media_close (user_data);
     }
-#if HAVE_CALL
   else if (TPY_IS_CALL_CHANNEL (user_data))
     {
       tpy_call_channel_hangup_async (user_data,
@@ -417,7 +414,6 @@ reject_channel_claim_cb (GObject *source,
           "", "", NULL, NULL);
       tp_channel_close_async (user_data, NULL, NULL);
     }
-#endif
   else if (EMPATHY_IS_TP_CHAT (user_data))
     {
       empathy_tp_chat_leave (user_data);
@@ -514,14 +510,12 @@ event_channel_process_voip_func (EventPriv *event)
       call = EMPATHY_TP_STREAMED_MEDIA (event->approval->handler_instance);
       video = empathy_tp_streamed_media_has_initial_video (call);
     }
-#if HAVE_CALL
   else if (event->public.type == EMPATHY_EVENT_TYPE_CALL)
     {
       TpyCallChannel *call;
       call = TPY_CALL_CHANNEL (event->approval->handler_instance);
       g_object_get (G_OBJECT (call), "initial-video", &video, NULL);
     }
-#endif
   else
     {
       g_warning ("Unknown event type: %d", event->public.type);
@@ -666,7 +660,6 @@ cdo_invalidated_cb (TpProxy *cdo,
   event_manager_approval_done (approval);
 }
 
-#if HAVE_CALL
 static void
 event_manager_call_channel_got_contact (EventManagerApproval *approval)
 {
@@ -699,7 +692,6 @@ event_manager_call_channel_got_contact (EventManagerApproval *approval)
 
   g_object_unref (window);
 }
-#endif
 
 static void
 event_manager_media_channel_got_contact (EventManagerApproval *approval)
@@ -935,9 +927,7 @@ find_main_channel (GList *channels)
       channel_type = tp_channel_get_channel_type_id (channel);
 
       if (channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_STREAMED_MEDIA ||
-#if HAVE_CALL
           channel_type == TPY_IFACE_QUARK_CHANNEL_TYPE_CALL ||
-#endif
           channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_FILE_TRANSFER ||
           channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_SERVER_AUTHENTICATION)
         return channel;
@@ -1050,7 +1040,6 @@ approve_channels (TpSimpleApprover *approver,
         }
 
     }
-#if HAVE_CALL
   else if (channel_type == TPY_IFACE_QUARK_CHANNEL_TYPE_CALL)
     {
       TpyCallChannel *call = TPY_CALL_CHANNEL (channel);
@@ -1058,7 +1047,6 @@ approve_channels (TpSimpleApprover *approver,
       approval->handler_instance = G_OBJECT (call);
       event_manager_call_channel_got_contact (approval);
     }
-#endif
   else if (channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_FILE_TRANSFER)
     {
       TpHandle handle;
@@ -1372,14 +1360,12 @@ empathy_event_manager_init (EmpathyEventManager *manager)
           TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA,
         TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_HANDLE_TYPE_CONTACT,
         NULL));
-#if HAVE_CALL
   tp_base_client_take_approver_filter (priv->approver,
       tp_asv_new (
         TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
           TPY_IFACE_CHANNEL_TYPE_CALL,
         TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_HANDLE_TYPE_CONTACT,
         NULL));
-#endif
 
   /* I don't feel good about doing this, and I'm sorry, but the
    * capabilities connection feature is added earlier because it's
-- 
cgit v1.2.3