[ekiga: 43/43] Merge remote-tracking branch 'origin/ds-clutter'

[Damien Sandras <dsandras src gnome org>]

commit eff1f32296f3976cf805ca0650f314fe5d9cff47
Merge: 88e6324 b36ff05
Author: Damien Sandras <dsandras beip be>
Date:   Thu Jan 9 19:54:12 2014 +0100

    Merge remote-tracking branch 'origin/ds-clutter'
    
    Fixed conflicts:
        src/Makefile.am

 configure.ac                                       |   62 +-
 lib/Makefile.am                                    |   64 +-
 .../videooutput-main-clutter-gst.cpp}              |   37 +-
 .../videooutput-main-clutter-gst.h}                |   22 +-
 .../videooutput-manager-clutter-gst.cpp            |  317 ++++++
 .../videooutput-manager-clutter-gst.h              |  106 ++
 .../videooutput-manager-common.cpp                 |  473 --------
 .../videooutput-manager-common.h                   |  296 -----
 .../dx-videooutput/videooutput-main-dx.cpp         |   59 -
 .../dx-videooutput/videooutput-main-dx.h           |   47 -
 .../dx-videooutput/videooutput-manager-dx.cpp      |  352 ------
 .../dx-videooutput/videooutput-manager-dx.h        |  107 --
 lib/engine/components/opal/opal-videooutput.cpp    |   18 +-
 .../x-videooutput/videooutput-manager-x.cpp        |  629 -----------
 .../x-videooutput/videooutput-manager-x.h          |  138 ---
 lib/engine/engine.cpp                              |   24 +-
 lib/engine/gui/gtk-frontend/call-window.cpp        |  955 ++++++----------
 lib/engine/gui/gtk-frontend/ext-window.cpp         |   84 +-
 lib/engine/gui/gtk-frontend/ext-window.h           |    4 +
 lib/engine/gui/gtk-frontend/preferences-window.cpp |    4 +
 lib/engine/videoinput/videoinput-core.cpp          |    3 +-
 lib/engine/videoinput/videoinput-info.h            |    2 +-
 lib/engine/videooutput/videooutput-core.cpp        |  153 +---
 lib/engine/videooutput/videooutput-core.h          |   51 +-
 lib/engine/videooutput/videooutput-info.h          |  180 ---
 lib/engine/videooutput/videooutput-manager.h       |   41 +-
 lib/gui/dxwindow.cpp                               | 1178 --------------------
 lib/gui/dxwindow.h                                 |  294 -----
 lib/gui/gmvideowidget.c                            |  771 +++++++++++++
 lib/gui/gmvideowidget.h                            |  249 +++++
 lib/gui/gmwindow.c                                 |  190 +++-
 lib/gui/gmwindow.h                                 |   32 +-
 org.gnome.ekiga.gschema.xml.in.in                  |   64 +-
 pixmaps/256x256/ekiga-full-icon.png                |  Bin 0 -> 28340 bytes
 pixmaps/Makefile.am                                |    3 +-
 src/Makefile.am                                    |   15 +-
 36 files changed, 2153 insertions(+), 4871 deletions(-)
---