Merge branch 'gnome-3-8'

diff --combined src/empathy-call-window.c
index 979d7e3bbded49b3c0f67d71f46f1ecc4321b602,77722f1a663affb9940cc5b84fa49d64ca8bbb48..042bc83d6b02de46018a7cd047e07db0aaea221a
--- 1/src/empathy-call-window.c
--- 2/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@@ -19,35 -19,38 +19,35 @@@
   */
  
  #include "config.h"
 +#include "empathy-call-window.h"
  
  #include <glib/gi18n.h>
 -
  #include <telepathy-farstream/telepathy-farstream.h>
 -
  #include <farstream/fs-element-added-notifier.h>
  #include <farstream/fs-utils.h>
  
 -#include <libempathy/empathy-camera-monitor.h>
 -#include <libempathy/empathy-gsettings.h>
 -#include <libempathy/empathy-request-util.h>
 -#include <libempathy/empathy-utils.h>
 -
 -#include <libempathy-gtk/empathy-dialpad-widget.h>
 -#include <libempathy-gtk/empathy-ui-utils.h>
 -#include <libempathy-gtk/empathy-sound-manager.h>
 -#include <libempathy-gtk/empathy-geometry.h>
 -#include <libempathy-gtk/empathy-images.h>
 -#include <libempathy-gtk/empathy-call-utils.h>
 -
 -#define DEBUG_FLAG EMPATHY_DEBUG_VOIP
 -#include <libempathy/empathy-debug.h>
 -
 -#include "empathy-call-window-fullscreen.h"
  #include "empathy-about-dialog.h"
  #include "empathy-audio-sink.h"
 +#include "empathy-call-utils.h"
 +#include "empathy-call-window-fullscreen.h"
 +#include "empathy-camera-menu.h"
 +#include "empathy-camera-monitor.h"
 +#include "empathy-dialpad-widget.h"
 +#include "empathy-geometry.h"
 +#include "empathy-gsettings.h"
 +#include "empathy-images.h"
  #include "empathy-mic-menu.h"
  #include "empathy-preferences.h"
 +#include "empathy-request-util.h"
  #include "empathy-rounded-actor.h"
  #include "empathy-rounded-rectangle.h"
  #include "empathy-rounded-texture.h"
 -#include "empathy-camera-menu.h"
 +#include "empathy-sound-manager.h"
 +#include "empathy-ui-utils.h"
 +#include "empathy-utils.h"
 +
 +#define DEBUG_FLAG EMPATHY_DEBUG_VOIP
 +#include "empathy-debug.h"
  
  #define CONTENT_HBOX_SPACING 3
  #define CONTENT_HBOX_CHILDREN_PACKING_PADDING 0
@@@ -2903,6 -2906,7 +2903,7 @@@ empathy_call_window_get_audio_sink_pad 
            g_warning ("Could not start audio sink");
            goto error;
          }
+       priv->audio_output_added = TRUE;
      }
  
    template = gst_element_class_get_pad_template (