aboutsummaryrefslogtreecommitdiffstats
path: root/src/empathy-streamed-media-window.c
diff options
context:
space:
mode:
authorEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-02-03 22:03:26 +0800
committerEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-02-10 18:02:16 +0800
commit5e6f399b45abc712ff5379ae7dbb53675ad12165 (patch)
tree54b038d38c76f78568f975073850859d4e7d299d /src/empathy-streamed-media-window.c
parentbcbd239c96127d53f3617cef3f3b423c692c4558 (diff)
downloadgsoc2013-empathy-5e6f399b45abc712ff5379ae7dbb53675ad12165.tar
gsoc2013-empathy-5e6f399b45abc712ff5379ae7dbb53675ad12165.tar.gz
gsoc2013-empathy-5e6f399b45abc712ff5379ae7dbb53675ad12165.tar.bz2
gsoc2013-empathy-5e6f399b45abc712ff5379ae7dbb53675ad12165.tar.lz
gsoc2013-empathy-5e6f399b45abc712ff5379ae7dbb53675ad12165.tar.xz
gsoc2013-empathy-5e6f399b45abc712ff5379ae7dbb53675ad12165.tar.zst
gsoc2013-empathy-5e6f399b45abc712ff5379ae7dbb53675ad12165.zip
EmpathyCallWindowFullscreen -> EmpathyStreamedMediaFullscreen
Diffstat (limited to 'src/empathy-streamed-media-window.c')
-rw-r--r--src/empathy-streamed-media-window.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/empathy-streamed-media-window.c b/src/empathy-streamed-media-window.c
index 56c315ff2..0b8ff7d3a 100644
--- a/src/empathy-streamed-media-window.c
+++ b/src/empathy-streamed-media-window.c
@@ -52,7 +52,7 @@
#include <libempathy/empathy-debug.h>
#include "empathy-streamed-media-window.h"
-#include "empathy-call-window-fullscreen.h"
+#include "empathy-streamed-media-window-fullscreen.h"
#include "empathy-sidebar.h"
#define BUTTON_ID "empathy-call-dtmf-button-id"
@@ -208,7 +208,7 @@ struct _EmpathyStreamedMediaWindowPriv
gboolean sending_video;
CameraState camera_state;
- EmpathyCallWindowFullscreen *fullscreen;
+ EmpathyStreamedMediaWindowFullscreen *fullscreen;
gboolean is_fullscreen;
/* Those fields represent the state of the window before it actually was in
@@ -254,10 +254,10 @@ static void empathy_streamed_media_window_sidebar_shown_cb (EmpathySidebar *side
static void empathy_streamed_media_window_hangup_cb (gpointer object,
EmpathyStreamedMediaWindow *window);
-static void empathy_call_window_fullscreen_cb (gpointer object,
+static void empathy_streamed_media_window_fullscreen_cb (gpointer object,
EmpathyStreamedMediaWindow *window);
-static void empathy_call_window_fullscreen_toggle (EmpathyStreamedMediaWindow *window);
+static void empathy_streamed_media_window_fullscreen_toggle (EmpathyStreamedMediaWindow *window);
static gboolean empathy_streamed_media_window_video_button_press_cb (
GtkWidget *video_output, GdkEventButton *event, EmpathyStreamedMediaWindow *window);
@@ -1087,7 +1087,7 @@ empathy_streamed_media_window_init (EmpathyStreamedMediaWindow *self)
"menuredial", "activate", empathy_streamed_media_window_redial_cb,
"redial", "clicked", empathy_streamed_media_window_redial_cb,
"microphone", "toggled", empathy_streamed_media_window_mic_toggled_cb,
- "menufullscreen", "activate", empathy_call_window_fullscreen_cb,
+ "menufullscreen", "activate", empathy_streamed_media_window_fullscreen_cb,
"camera_off", "toggled", tool_button_camera_off_toggled_cb,
"camera_preview", "toggled", tool_button_camera_preview_toggled_cb,
"camera_on", "toggled", tool_button_camera_on_toggled_cb,
@@ -1211,11 +1211,11 @@ empathy_streamed_media_window_init (EmpathyStreamedMediaWindow *self)
gtk_widget_hide (priv->sidebar);
- priv->fullscreen = empathy_call_window_fullscreen_new (self);
- empathy_call_window_fullscreen_set_video_widget (priv->fullscreen,
+ priv->fullscreen = empathy_streamed_media_window_fullscreen_new (self);
+ empathy_streamed_media_window_fullscreen_set_video_widget (priv->fullscreen,
priv->video_output);
g_signal_connect (G_OBJECT (priv->fullscreen->leave_fullscreen_button),
- "clicked", G_CALLBACK (empathy_call_window_fullscreen_cb), self);
+ "clicked", G_CALLBACK (empathy_streamed_media_window_fullscreen_cb), self);
g_signal_connect (G_OBJECT (self), "realize",
G_CALLBACK (empathy_streamed_media_window_realized_cb), self);
@@ -2994,7 +2994,7 @@ empathy_streamed_media_window_state_event_cb (GtkWidget *widget,
disconnect_video_output_motion_handler (window);
}
- empathy_call_window_fullscreen_set_fullscreen (priv->fullscreen,
+ empathy_streamed_media_window_fullscreen_set_fullscreen (priv->fullscreen,
set_fullscreen);
show_controls (window, set_fullscreen);
show_borders (window, set_fullscreen);
@@ -3182,14 +3182,14 @@ empathy_streamed_media_window_redial_cb (gpointer object,
}
static void
-empathy_call_window_fullscreen_cb (gpointer object,
+empathy_streamed_media_window_fullscreen_cb (gpointer object,
EmpathyStreamedMediaWindow *window)
{
- empathy_call_window_fullscreen_toggle (window);
+ empathy_streamed_media_window_fullscreen_toggle (window);
}
static void
-empathy_call_window_fullscreen_toggle (EmpathyStreamedMediaWindow *window)
+empathy_streamed_media_window_fullscreen_toggle (EmpathyStreamedMediaWindow *window)
{
EmpathyStreamedMediaWindowPriv *priv = GET_PRIV (window);
@@ -3222,7 +3222,7 @@ empathy_streamed_media_window_key_press_cb (GtkWidget *video_output,
{
/* Since we are in fullscreen mode, toggling will bring us back to
normal mode. */
- empathy_call_window_fullscreen_toggle (window);
+ empathy_streamed_media_window_fullscreen_toggle (window);
return TRUE;
}
@@ -3237,7 +3237,7 @@ empathy_streamed_media_window_video_output_motion_notify (GtkWidget *widget,
if (priv->is_fullscreen)
{
- empathy_call_window_fullscreen_show_popup (priv->fullscreen);
+ empathy_streamed_media_window_fullscreen_show_popup (priv->fullscreen);
return TRUE;
}
return FALSE;