aboutsummaryrefslogtreecommitdiffstats
path: root/src/empathy-camera-menu.c
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-11-21 18:43:51 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-11-23 17:59:52 +0800
commitd15f750dcfb31415cb6d8d39122593863e7fcd37 (patch)
tree93f0239c67432c62c1867432e04abc359b85b4ea /src/empathy-camera-menu.c
parent24882e924af2c0d8576970440d92ac5b4eb25bc8 (diff)
downloadgsoc2013-empathy-d15f750dcfb31415cb6d8d39122593863e7fcd37.tar
gsoc2013-empathy-d15f750dcfb31415cb6d8d39122593863e7fcd37.tar.gz
gsoc2013-empathy-d15f750dcfb31415cb6d8d39122593863e7fcd37.tar.bz2
gsoc2013-empathy-d15f750dcfb31415cb6d8d39122593863e7fcd37.tar.lz
gsoc2013-empathy-d15f750dcfb31415cb6d8d39122593863e7fcd37.tar.xz
gsoc2013-empathy-d15f750dcfb31415cb6d8d39122593863e7fcd37.tar.zst
gsoc2013-empathy-d15f750dcfb31415cb6d8d39122593863e7fcd37.zip
factor out empathy_call_window_change_webcam()
https://bugzilla.gnome.org/show_bug.cgi?id=664459
Diffstat (limited to 'src/empathy-camera-menu.c')
-rw-r--r--src/empathy-camera-menu.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/empathy-camera-menu.c b/src/empathy-camera-menu.c
index cee11d759..9633d84fa 100644
--- a/src/empathy-camera-menu.c
+++ b/src/empathy-camera-menu.c
@@ -146,9 +146,7 @@ empathy_camera_menu_activate_cb (GtkAction *action,
if (!tp_strdiff (device, current_device))
goto out;
- empathy_call_window_play_camera (self->priv->window, FALSE);
- empathy_video_src_change_device (video, device);
- empathy_call_window_play_camera (self->priv->window, TRUE);
+ empathy_call_window_change_webcam (self->priv->window, device);
out:
g_free (current_device);