aboutsummaryrefslogtreecommitdiffstats
path: root/src/empathy-event-manager.c
diff options
context:
space:
mode:
authorEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-02-03 20:15:12 +0800
committerEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-02-10 17:28:44 +0800
commit2766ed3e19cc8032eedef5cf5cb6ab302a57f63a (patch)
tree9f41c53a4e657a8882b4695d6e17591aa1c9838d /src/empathy-event-manager.c
parent155c260f5a7ef39c5f1403e024363844cc67a0f2 (diff)
downloadgsoc2013-empathy-2766ed3e19cc8032eedef5cf5cb6ab302a57f63a.tar
gsoc2013-empathy-2766ed3e19cc8032eedef5cf5cb6ab302a57f63a.tar.gz
gsoc2013-empathy-2766ed3e19cc8032eedef5cf5cb6ab302a57f63a.tar.bz2
gsoc2013-empathy-2766ed3e19cc8032eedef5cf5cb6ab302a57f63a.tar.lz
gsoc2013-empathy-2766ed3e19cc8032eedef5cf5cb6ab302a57f63a.tar.xz
gsoc2013-empathy-2766ed3e19cc8032eedef5cf5cb6ab302a57f63a.tar.zst
gsoc2013-empathy-2766ed3e19cc8032eedef5cf5cb6ab302a57f63a.zip
EmpathyTpCall -> EmpathyTpStreamedMedia
Diffstat (limited to 'src/empathy-event-manager.c')
-rw-r--r--src/empathy-event-manager.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c
index b7883ad57..bbb9dc603 100644
--- a/src/empathy-event-manager.c
+++ b/src/empathy-event-manager.c
@@ -33,7 +33,7 @@
#include <libempathy/empathy-tp-contact-factory.h>
#include <libempathy/empathy-contact-manager.h>
#include <libempathy/empathy-tp-chat.h>
-#include <libempathy/empathy-tp-call.h>
+#include <libempathy/empathy-tp-streamed-media.h>
#include <libempathy/empathy-tp-file.h>
#include <libempathy/empathy-utils.h>
#include <libempathy/empathy-call-factory.h>
@@ -400,9 +400,9 @@ reject_channel_claim_cb (GObject *source,
goto out;
}
- if (EMPATHY_IS_TP_CALL (user_data))
+ if (EMPATHY_IS_TP_STREAMED_MEDIA (user_data))
{
- empathy_tp_call_close (user_data);
+ empathy_tp_streamed_media_close (user_data);
}
else if (EMPATHY_IS_TP_CHAT (user_data))
{
@@ -485,7 +485,7 @@ event_channel_process_voip_func (EventPriv *event)
GtkWidget *dialog;
GtkWidget *button;
GtkWidget *image;
- EmpathyTpCall *call;
+ EmpathyTpStreamedMedia *call;
gboolean video;
gchar *title;
@@ -495,9 +495,9 @@ event_channel_process_voip_func (EventPriv *event)
return;
}
- call = EMPATHY_TP_CALL (event->approval->handler_instance);
+ call = EMPATHY_TP_STREAMED_MEDIA (event->approval->handler_instance);
- video = empathy_tp_call_has_initial_video (call);
+ video = empathy_tp_streamed_media_has_initial_video (call);
dialog = gtk_message_dialog_new (NULL, 0,
GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE,
@@ -643,12 +643,12 @@ event_manager_media_channel_got_contact (EventManagerApproval *approval)
EmpathyEventManagerPriv *priv = GET_PRIV (approval->manager);
GtkWidget *window = empathy_main_window_dup ();
gchar *header;
- EmpathyTpCall *call;
+ EmpathyTpStreamedMedia *call;
gboolean video;
- call = EMPATHY_TP_CALL (approval->handler_instance);
+ call = EMPATHY_TP_STREAMED_MEDIA (approval->handler_instance);
- video = empathy_tp_call_has_initial_video (call);
+ video = empathy_tp_streamed_media_has_initial_video (call);
header = g_strdup_printf (
video ? _("Incoming video call from %s") :_("Incoming call from %s"),
@@ -671,7 +671,7 @@ event_manager_media_channel_got_contact (EventManagerApproval *approval)
}
static void
-event_manager_media_channel_contact_changed_cb (EmpathyTpCall *call,
+event_manager_media_channel_contact_changed_cb (EmpathyTpStreamedMedia *call,
GParamSpec *param, EventManagerApproval *approval)
{
EmpathyContact *contact;
@@ -964,7 +964,7 @@ approve_channels (TpSimpleApprover *approver,
else if (channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_STREAMED_MEDIA)
{
EmpathyContact *contact;
- EmpathyTpCall *call = empathy_tp_call_new (account, channel);
+ EmpathyTpStreamedMedia *call = empathy_tp_streamed_media_new (account, channel);
approval->handler_instance = G_OBJECT (call);