Merge branch 'gnome-3-10'

Conflicts:
	po/pt.po
	src/empathy-audio-sink.c

diff --git a/configure.ac b/configure.ac
index ab6f8ddb4cab27b98dc9e864eb355e5c9d012d40..b0a4b80c8044660c07d283670cbcdbaa9b0fc835 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -57,6 +57,10 @@ AC_DEFINE(TP_VERSION_MAX_ALLOWED, TP_VERSION_0_20, [Prevent post 0.20 APIs])
 AC_DEFINE(TP_SEAL_ENABLE, 1, [Prevent to use sealed variables])
 AC_DEFINE(TP_DISABLE_SINGLE_INCLUDE, 1, [Disable single include header])
 
+COGL_REQUIRED=1.14
+AC_DEFINE(COGL_VERSION_MIN_REQUIRED, COGL_VERSION_1_14, [Ignore post 1.14 deprecations])
+AC_DEFINE(COGL_VERSION_MAX_ALLOWED, COGL_VERSION_1_14, [Ignore post 1.14 deprecations])
+
 GSTREAMER_REQUIRED=0.10.32
 TP_FS_REQUIRED=0.6.0
 LIBSECRET_REQUIRED=0.5
@@ -80,10 +84,6 @@ LIBACCOUNTS_REQUIRED=1.4
 LIBSIGNON_REQUIRED=1.8
 MC_PLUGINS_REQUIRED=5.13.1
 
-COGL_REQUIRED=1.14
-AC_DEFINE(COGL_VERSION_MIN_REQUIRED, COGL_VERSION_1_14, [Ignore post 1.14 deprecations])
-AC_DEFINE(COGL_VERSION_MAX_ALLOWED, COGL_VERSION_1_14, [Ignore post 1.14 deprecations])
-
 # Use --enable-maintainer-mode to disable deprecated symbols,
 # disable single include and enable GSEAL. If this is not a released empathy,
 # maintainer mode is forced
@@ -239,51 +239,18 @@ PKG_CHECK_MODULES(EMPATHY,
 # -----------------------------------------------------------
 # GStreamer
 # -----------------------------------------------------------
-AC_ARG_ENABLE(gst-1.0,
-              AS_HELP_STRING([--enable-gst-1.0=@<:@no/yes/auto@:>@],
-                             [build with GStreamer 1.0]),
-                             enable_gst1=$enableval,
-                             enable_gst1=auto)
-
-# Try to use GStreamer 1.0 if available
-have_gst1="no"
-if test "x$enable_gst1" != "xno"; then
-  PKG_CHECK_MODULES(EMPATHY_CALL,
-  [
-     farstream-0.2
-     telepathy-farstream >= $TP_FS_REQUIRED
-     clutter-1.0 >= $CLUTTER_REQUIRED
-     clutter-gtk-1.0 >= $CLUTTER_GTK_REQUIRED
-     clutter-gst-2.0
-     gstreamer-1.0
-     gstreamer-audio-1.0
-     gstreamer-video-1.0
-     cogl-1.0 >= $COGL_REQUIRED
-  ], have_gst1="yes", have_gst1="no")
-
-  if test "x$have_gst1" = "xyes"; then
-    AC_DEFINE(HAVE_GST1, 1, [Build with GStreamer 1.0])
-  fi
-fi
-
-if test "x$enable_gst1" = "xyes" -a "x$have_gst1" != "xyes"; then
-   AC_MSG_ERROR([Could not find GStreamer 1.0 dependencies:
-
-$EMPATHY_CALL_PKG_ERRORS])
-fi
-
-if test "x$have_gst1" != "xyes"; then
-  PKG_CHECK_MODULES(EMPATHY_CALL,
-  [
-     farstream-0.1
-     telepathy-farstream >= $TP_FS_REQUIRED
-     clutter-1.0 >= $CLUTTER_REQUIRED
-     clutter-gtk-1.0 >= $CLUTTER_GTK_REQUIRED
-     clutter-gst-1.0 >= 1.5.2
-     gstreamer-0.10 >= $GSTREAMER_REQUIRED
-     gstreamer-interfaces-0.10
-  ])
-fi
+PKG_CHECK_MODULES(EMPATHY_CALL,
+[
+   farstream-0.2
+   telepathy-farstream >= $TP_FS_REQUIRED
+   clutter-1.0 >= $CLUTTER_REQUIRED
+   clutter-gtk-1.0 >= $CLUTTER_GTK_REQUIRED
+   clutter-gst-2.0
+   gstreamer-1.0
+   gstreamer-audio-1.0
+   gstreamer-video-1.0
+   cogl-1.0 >= $COGL_REQUIRED
+])
 
 AC_DEFINE(EMPATHY_GOA_PROVIDER, "org.gnome.OnlineAccounts",
    [Name of provider for accounts imported from GOA])
@@ -683,7 +650,6 @@ Configure summary:
        Linker Flags................:  ${LDFLAGS}
        Prefix......................:  ${prefix}
        Coding style checks.........:  ${ENABLE_CODING_STYLE_CHECKS}
-       Use GStreamer 1.0...........:  ${have_gst1}
 
     Features:
        Spell checking (enchant)....:  ${have_enchant}

diff --git a/po/pt.po b/po/pt.po
index 4f499b1d8065066bb3dd827b7a3f711bdbbcd226..151461d653302bf5f26a3bea5b5165ff1a4e1c2d 100644 (file)
--- a/po/pt.po
+++ b/po/pt.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 3.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-13 12:29+0100\n"
+"POT-Creation-Date: 2013-10-13 12:11+0100\n"
 "PO-Revision-Date: 2013-09-22 22:11-0100\n"
 "Last-Translator: António Lima <amrlima@gmail.com>\n"
 "Language-Team: Portuguese <gnome_pt@yahoogroups.com>\n"
@@ -1013,7 +1013,7 @@ msgstr "%s é agora conhecido como %s"
 #. * we get the new handler.
 #: ../libempathy-gtk/empathy-chat.c:3098 ../src/empathy-call-window.c:1525
 #: ../src/empathy-call-window.c:1575 ../src/empathy-call-window.c:2654
-#: ../src/empathy-call-window.c:2961 ../src/empathy-event-manager.c:1172
+#: ../src/empathy-call-window.c:2953 ../src/empathy-event-manager.c:1172
 msgid "Disconnected"
 msgstr "Desligado"
 
@@ -2433,29 +2433,29 @@ msgstr "O endereço IP do grupo multicast"
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: ../src/empathy-call-window.c:2959
+#: ../src/empathy-call-window.c:2951
 msgid "On hold"
 msgstr "Em espera"
 
-#: ../src/empathy-call-window.c:2963
+#: ../src/empathy-call-window.c:2955
 msgid "Mute"
 msgstr "Silenciar"
 
-#: ../src/empathy-call-window.c:2965
+#: ../src/empathy-call-window.c:2957
 msgid "Duration"
 msgstr "Duração"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2968
+#: ../src/empathy-call-window.c:2960
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
-#: ../src/empathy-call-window.c:3064
+#: ../src/empathy-call-window.c:3056
 msgid "Technical Details"
 msgstr "Detalhes Técnicos"
 
-#: ../src/empathy-call-window.c:3103
+#: ../src/empathy-call-window.c:3095
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
@@ -2464,7 +2464,7 @@ msgstr ""
 "As aplicações de %s não suportam nenhum dos formatos áudio suportados pelo "
 "seu computador"
 
-#: ../src/empathy-call-window.c:3108
+#: ../src/empathy-call-window.c:3100
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
@@ -2473,7 +2473,7 @@ msgstr ""
 "As aplicações de %s não suportam nenhum dos formatos vídeo suportados pelo "
 "seu computador"
 
-#: ../src/empathy-call-window.c:3114
+#: ../src/empathy-call-window.c:3106
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
@@ -2482,25 +2482,25 @@ msgstr ""
 "Incapaz de estabelecer uma ligação com %s. Um dos utilizadores deve estar "
 "numa rede que não permite ligações diretas."
 
-#: ../src/empathy-call-window.c:3120
+#: ../src/empathy-call-window.c:3112
 msgid "There was a failure on the network"
 msgstr "Ocorreu um erro na rede"
 
-#: ../src/empathy-call-window.c:3124
+#: ../src/empathy-call-window.c:3116
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr ""
 "Os formatos áudio necessários para esta chamada não estão instalados no seu "
 "computador"
 
-#: ../src/empathy-call-window.c:3127
+#: ../src/empathy-call-window.c:3119
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr ""
 "Os formatos vídeo necessários para esta chamada não estão instalados no seu "
 "computador"
 
-#: ../src/empathy-call-window.c:3139
+#: ../src/empathy-call-window.c:3131
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -2511,32 +2511,32 @@ msgstr ""
 "\">Relate isto como um erro</a> e junte os registos obtidos pela janela "
 "'Depuração' no menu Ajuda."
 
-#: ../src/empathy-call-window.c:3148
+#: ../src/empathy-call-window.c:3140
 msgid "There was a failure in the call engine"
 msgstr "Ocorreu um erro no motor de chamadas"
 
-#: ../src/empathy-call-window.c:3151
+#: ../src/empathy-call-window.c:3143
 msgid "The end of the stream was reached"
 msgstr "Foi alcançado o final do fluxo"
 
-#: ../src/empathy-call-window.c:3191
+#: ../src/empathy-call-window.c:3183
 msgid "Can't establish audio stream"
 msgstr "Incapaz de estabelecer fluxo áudio"
 
-#: ../src/empathy-call-window.c:3201
+#: ../src/empathy-call-window.c:3193
 msgid "Can't establish video stream"
 msgstr "Incapaz de estabelecer fluxo vídeo"
 
-#: ../src/empathy-call-window.c:3238
+#: ../src/empathy-call-window.c:3230
 #, c-format
 msgid "Your current balance is %s."
 msgstr "O seu saldo atual é %s."
 
-#: ../src/empathy-call-window.c:3242
+#: ../src/empathy-call-window.c:3234
 msgid "Sorry, you don’t have enough credit for that call."
 msgstr "Não tem saldo suficiente para essa chamada."
 
-#: ../src/empathy-call-window.c:3244
+#: ../src/empathy-call-window.c:3236
 msgid "Top Up"
 msgstr "Carregar"
 

diff --git a/src/empathy-audio-sink.c b/src/empathy-audio-sink.c
index e0e43e4404252261342de4b0b7d8134ee3973210..f3a78bf3fc1ac16906bc80063574fc5c7fc0aaf6 100644 (file)
--- a/src/empathy-audio-sink.c
+++ b/src/empathy-audio-sink.c
@@ -21,12 +21,7 @@
 #include "config.h"
 #include "empathy-audio-sink.h"
 
-#ifdef HAVE_GST1
 #include <gst/audio/streamvolume.h>
-#else
-#include <gst/audio/audio.h>
-#include <gst/interfaces/streamvolume.h>
-#endif
 
 #include "empathy-audio-utils.h"
 
@@ -49,12 +44,7 @@ static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE(
     "sink%d",
     GST_PAD_SINK,
     GST_PAD_REQUEST,
-#ifdef HAVE_GST1
     GST_STATIC_CAPS ( "audio/x-raw" )
-#else
-    GST_STATIC_CAPS ( GST_AUDIO_INT_PAD_TEMPLATE_CAPS " ; "
-        GST_AUDIO_FLOAT_PAD_TEMPLATE_CAPS)
-#endif
 );
 
 enum {
@@ -82,16 +72,10 @@ empathy_audio_sink_init (EmpathyGstAudioSink *self)
   g_mutex_init (&self->priv->volume_mutex);
 }
 
-#ifdef HAVE_GST1
 static GstPad * empathy_audio_sink_request_new_pad (GstElement *self,
   GstPadTemplate *templ,
   const gchar* name,
   const GstCaps *caps);
-#else
-static GstPad * empathy_audio_sink_request_new_pad (GstElement *self,
-  GstPadTemplate *templ,
-  const gchar* name);
-#endif
 
 static void empathy_audio_sink_release_pad (GstElement *self,
   GstPad *pad);
@@ -302,18 +286,11 @@ empathy_audio_sink_volume_idle_setup (gpointer user_data)
   return FALSE;
 }
 
-#ifdef HAVE_GST1
 static GstPad *
 empathy_audio_sink_request_new_pad (GstElement *element,
   GstPadTemplate *templ,
   const gchar* name,
   const GstCaps *caps)
-#else
-static GstPad *
-empathy_audio_sink_request_new_pad (GstElement *element,
-  GstPadTemplate *templ,
-  const gchar* name)
-#endif
 {
   EmpathyGstAudioSink *self = EMPATHY_GST_AUDIO_SINK (element);
   GstElement *bin, *resample, *audioconvert0, *audioconvert1;

diff --git a/src/empathy-audio-src.c b/src/empathy-audio-src.c
index fcca6621dad74d917eb61bdef0c02559775d4723..86d197d263960e3b663cb6c73a6c8c45761ff641 100644 (file)
--- a/src/empathy-audio-src.c
+++ b/src/empathy-audio-src.c
@@ -23,11 +23,7 @@
 
 #include <tp-account-widgets/tpaw-utils.h>
 
-#ifdef HAVE_GST1
 #include <gst/audio/streamvolume.h>
-#else
-#include <gst/interfaces/streamvolume.h>
-#endif
 
 #include "empathy-audio-utils.h"
 #include "empathy-mic-monitor.h"
@@ -314,7 +310,6 @@ empathy_audio_src_init (EmpathyGstAudioSrc *obj)
   priv->volume_element = gst_element_factory_make ("volume", NULL);
   gst_bin_add (GST_BIN (obj), priv->volume_element);
 
-#ifndef HAVE_GST1
   {
     GstElement *capsfilter;
     GstCaps *caps;
@@ -336,9 +331,6 @@ empathy_audio_src_init (EmpathyGstAudioSrc *obj)
     gst_element_link (priv->src, capsfilter);
     gst_element_link (capsfilter, priv->volume_element);
   }
-#else
-  gst_element_link (priv->src, priv->volume_element);
-#endif
 
   src = gst_element_get_static_pad (priv->volume_element, "src");
 

diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c
index c54c4dfd84f8c191031c36f3f8694f934394d8d6..077cbe312169291c82e20338bd119d21f97923d2 100644 (file)
--- a/src/empathy-call-window.c
+++ b/src/empathy-call-window.c
@@ -2818,11 +2818,7 @@ empathy_call_window_get_video_sink_pad (EmpathyCallWindow *self)
   if (priv->funnel == NULL)
     {
       output = priv->video_output_sink;
-#ifdef HAVE_GST1
       priv->funnel = gst_element_factory_make ("funnel", NULL);
-#else
-      priv->funnel = gst_element_factory_make ("fsfunnel", NULL);
-#endif
 
       if (!priv->funnel)
         {
@@ -2862,11 +2858,7 @@ empathy_call_window_get_video_sink_pad (EmpathyCallWindow *self)
           goto error_output_added;
         }
     }
-#ifdef HAVE_GST1
   pad = gst_element_get_request_pad (priv->funnel, "sink_%u");
-#else
-  pad = gst_element_get_request_pad (priv->funnel, "sink%d");
-#endif
 
   if (!pad)
     g_warning ("Could not get request pad from funnel");
@@ -3347,7 +3339,6 @@ empathy_call_window_check_video_cb (gpointer data)
 }
 
 /* Called from the streaming thread */
-#ifdef HAVE_GST1
 static GstPadProbeReturn
 empathy_call_window_video_probe_cb (GstPad *pad,
     GstPadProbeInfo *info,
@@ -3367,29 +3358,6 @@ empathy_call_window_video_probe_cb (GstPad *pad,
 
   return GST_PAD_PROBE_OK;
 }
-#else
-static gboolean
-empathy_call_window_video_probe_cb (GstPad *pad,
-    GstMiniObject *mini_obj,
-    EmpathyCallWindow *self)
-{
-  /* Ignore events */
-  if (GST_IS_EVENT (mini_obj))
-    return TRUE;
-
-  if (G_UNLIKELY (!self->priv->got_video))
-    {
-      /* show the remote video */
-      g_idle_add_full (G_PRIORITY_DEFAULT_IDLE,
-          empathy_call_window_show_video_output_cb,
-          g_object_ref (self), g_object_unref);
-
-      self->priv->got_video = TRUE;
-    }
-
-  return TRUE;
-}
-#endif
 
 /* Called from the streaming thread */
 static gboolean
@@ -3416,14 +3384,10 @@ empathy_call_window_src_added_cb (EmpathyCallHandler *handler,
         g_idle_add (empathy_call_window_show_video_output_cb, self);
         pad = empathy_call_window_get_video_sink_pad (self);
 
-#ifdef HAVE_GST1
         gst_pad_add_probe (src,
             GST_PAD_PROBE_TYPE_BUFFER | GST_PAD_PROBE_TYPE_BUFFER_LIST,
             empathy_call_window_video_probe_cb, self, NULL);
-#else
-        gst_pad_add_data_probe (src,
-            G_CALLBACK (empathy_call_window_video_probe_cb), self);
-#endif
+
         if (priv->got_video_src > 0)
           g_source_remove (priv->got_video_src);
         priv->got_video_src = g_timeout_add_seconds (1,
@@ -3602,11 +3566,7 @@ empathy_call_window_content_added_cb (EmpathyCallHandler *handler,
       case FS_MEDIA_TYPE_VIDEO:
         if (priv->video_tee != NULL)
           {
-#ifdef HAVE_GST1
             pad = gst_element_get_request_pad (priv->video_tee, "src_%u");
-#else
-            pad = gst_element_get_request_pad (priv->video_tee, "src%d");
-#endif
             if (GST_PAD_LINK_FAILED (gst_pad_link (pad, sink)))
               {
                 g_warning ("Could not link video source input pipeline");

diff --git a/src/empathy-video-src.c b/src/empathy-video-src.c
index 9856efed91a7d4aa69c5537ce73287570c602ee6..41dea2377c3636a6f3f3952c5f621d0b726f2eef 100644 (file)
--- a/src/empathy-video-src.c
+++ b/src/empathy-video-src.c
@@ -21,11 +21,7 @@
 #include "config.h"
 #include "empathy-video-src.h"
 
-#ifdef HAVE_GST1
 #include <gst/video/colorbalance.h>
-#else
-#include <gst/interfaces/colorbalance.h>
-#endif
 
 #define DEBUG_FLAG EMPATHY_DEBUG_VOIP
 #include "empathy-debug.h"
@@ -112,7 +108,6 @@ error:
   return NULL;
 }
 
-#ifdef HAVE_GST1
 static GstPadProbeReturn
 empathy_video_src_drop_eos (GstPad *pad,
   GstPadProbeInfo *info,
@@ -123,13 +118,6 @@ empathy_video_src_drop_eos (GstPad *pad,
 
   return GST_PAD_PROBE_OK;
 }
-#else
-static gboolean
-empathy_video_src_drop_eos (GstPad *pad, GstEvent *event, gpointer user_data)
-{
-  return GST_EVENT_TYPE (event) != GST_EVENT_EOS;
-}
-#endif
 
 static void
 empathy_video_src_init (EmpathyGstVideoSrc *obj)
@@ -141,11 +129,7 @@ empathy_video_src_init (EmpathyGstVideoSrc *obj)
   gchar *str;
 
   /* allocate caps here, so we can update it by optional elements */
-#ifdef HAVE_GST1
   caps = gst_caps_new_simple ("video/x-raw",
-#else
-  caps = gst_caps_new_simple ("video/x-raw-yuv",
-#endif
     "width", G_TYPE_INT, 320,
     "height", G_TYPE_INT, 240,
     NULL);
@@ -162,12 +146,8 @@ empathy_video_src_init (EmpathyGstVideoSrc *obj)
    * source (triggering an EOS) */
   src = gst_element_get_static_pad (element, "src");
 
-#ifdef HAVE_GST1
   gst_pad_add_probe (src, GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM,
     empathy_video_src_drop_eos, NULL, NULL);
-#else
-  gst_pad_add_event_probe (src, G_CALLBACK (empathy_video_src_drop_eos), NULL);
-#endif
 
   gst_object_unref (src);
 
@@ -202,15 +182,9 @@ empathy_video_src_init (EmpathyGstVideoSrc *obj)
   DEBUG ("Current video src caps are : %s", str);
   g_free (str);
 
-#ifdef HAVE_GST1
   if ((element = empathy_gst_add_to_bin (GST_BIN (obj),
       element, "videoconvert")) == NULL)
     g_error ("Failed to add \"videoconvert\" (gst-plugins-base missing?)");
-#else
-  if ((element = empathy_gst_add_to_bin (GST_BIN (obj),
-      element, "ffmpegcolorspace")) == NULL)
-    g_error ("Failed to add \"ffmpegcolorspace\" (gst-plugins-base missing?)");
-#endif
 
   if ((element = empathy_gst_add_to_bin (GST_BIN (obj),
       element, "videoscale")) == NULL)

diff --git a/telepathy-account-widgets b/telepathy-account-widgets
index 505360b4be41a1bce0d06a3cbb4ca2eedc24c188..2bfb94cf22605e74e20acfed110ded111735710d 160000 (submodule)
--- a/telepathy-account-widgets
+++ b/telepathy-account-widgets
@@ -1 +1 @@
-Subproject commit 505360b4be41a1bce0d06a3cbb4ca2eedc24c188
+Subproject commit 2bfb94cf22605e74e20acfed110ded111735710d