[cheese/camerabin: 10/10] Merge branch 'master' into camerabin

[Luciana Fujii Pontello <lufujii src gnome org>]

commit aa005616f263e3b8aa90e1644e95077511c800a7
Merge: 4422a41 5561d78
Author: Luciana Fujii Pontello <luciana fujii eti br>
Date:   Thu Jan 27 19:11:18 2011 -0200

    Merge branch 'master' into camerabin

 configure.ac                             |    4 -
 data/Makefile.am                         |    9 -
 data/org.gnome.Cheese.service.in         |    3 -
 libcheese/cheese-camera-device-monitor.c |    1 -
 libcheese/cheese-camera.c                |    1 +
 libcheese/cheese-widget.c                |    2 +-
 po/LINGUAS                               |    1 +
 po/bg.po                                 |  316 +++++--------
 po/eo.po                                 |  643 ++++++++++++++++++++++++
 po/gl.po                                 |   15 +-
 po/ru.po                                 |  801 ++++++++++--------------------
 po/th.po                                 |   39 +-
 po/zh_HK.po                              |  263 ++++------
 po/zh_TW.po                              |  273 +++++------
 14 files changed, 1273 insertions(+), 1098 deletions(-)
---
diff --cc libcheese/cheese-camera.c
index 04cdc66,6aed32e..bc781fa
--- a/libcheese/cheese-camera.c
+++ b/libcheese/cheese-camera.c
@@@ -689,9 -869,12 +689,10 @@@ cheese_camera_connect_effect_texture (C
    display_element = clutter_gst_video_sink_new (texture);
    g_object_set (G_OBJECT (display_element), "async", FALSE, NULL);
  
 -  gst_bin_add_many (GST_BIN (priv->pipeline), control_valve, effect_filter, display_queue, display_element, NULL);
 -
 -
 +  gst_bin_add_many (GST_BIN (priv->video_filter_bin), control_valve, effect_filter, display_queue, display_element, NULL);
  
    ok = gst_element_link_many (priv->effects_tee, control_valve, effect_filter, display_queue, display_element, NULL);
+   g_return_if_fail (ok);
  
    /* HACK: I don't understand GStreamer enough to know why this works. */
    gst_element_set_state (control_valve, GST_STATE_PLAYING);