[ekiga: 158/158] Merge remote-tracking branch 'origin/ds-gsettings3'

[Damien Sandras <dsandras src gnome org>]

commit 7ab236ee2363578065e3b6fb6ebe62d6161c4dfe
Merge: c56fcae 91cde6c
Author: Damien Sandras <dsandras beip be>
Date:   Sat Dec 14 18:30:45 2013 +0100

    Merge remote-tracking branch 'origin/ds-gsettings3'

 .gitignore                                         |    8 +-
 INSTALL                                            |   15 +-
 Makefile.am                                        |   34 +-
 TODO-GSettings.txt                                 |    5 +
 TODO_GSettings.txt                                 |    3 +
 configure.ac                                       |   29 +-
 ekiga.convert.in                                   |   91 +
 ekiga.schemas.in.in                                | 1006 ----------
 lib/Makefile.am                                    |   61 +-
 lib/engine/audioinput/audioinput-core.cpp          |  113 +-
 lib/engine/audioinput/audioinput-core.h            |   31 +-
 lib/engine/audioinput/audioinput-gmconf-bridge.cpp |   63 -
 lib/engine/audioinput/audioinput-gmconf-bridge.h   |   64 -
 lib/engine/audioinput/audioinput-info.h            |   12 +-
 lib/engine/audiooutput/audiooutput-core.cpp        |  207 ++-
 lib/engine/audiooutput/audiooutput-core.h          |   99 +-
 .../audiooutput/audiooutput-gmconf-bridge.cpp      |  223 ---
 lib/engine/audiooutput/audiooutput-gmconf-bridge.h |   64 -
 lib/engine/audiooutput/audiooutput-info.h          |   11 +-
 .../components/call-history/history-book.cpp       |   15 +-
 lib/engine/components/call-history/history-book.h  |    3 +
 .../videooutput-manager-common.cpp                 |   75 +-
 .../videooutput-manager-common.h                   |    1 +
 .../gmconf-personal-details.cpp                    |  143 +--
 .../gmconf-personal-details.h                      |   13 +-
 lib/engine/components/local-roster/local-heap.cpp  |   18 +-
 lib/engine/components/local-roster/local-heap.h    |    3 +
 lib/engine/components/opal/h323-endpoint.cpp       |  114 +-
 lib/engine/components/opal/h323-endpoint.h         |    7 +-
 lib/engine/components/opal/opal-account.cpp        |  651 +++++--
 lib/engine/components/opal/opal-account.h          |   66 +-
 lib/engine/components/opal/opal-bank.cpp           |  177 ++-
 lib/engine/components/opal/opal-bank.h             |   23 +-
 lib/engine/components/opal/opal-call-manager.cpp   |  210 ++-
 lib/engine/components/opal/opal-call-manager.h     |   14 +
 lib/engine/components/opal/opal-call.cpp           |   16 +-
 lib/engine/components/opal/opal-gmconf-bridge.cpp  |  403 ----
 lib/engine/components/opal/opal-gmconf-bridge.h    |   69 -
 lib/engine/components/opal/opal-main.cpp           |    9 +-
 lib/engine/components/opal/opal-presentity.cpp     |  433 +++++
 lib/engine/components/opal/opal-presentity.h       |  138 ++
 lib/engine/components/opal/sip-endpoint.cpp        |   54 +-
 lib/engine/components/opal/sip-endpoint.h          |    9 +-
 lib/engine/engine.cpp                              |    8 +-
 lib/engine/framework/device-def.h                  |   25 +-
 lib/engine/framework/gmconf-bridge.cpp             |   74 -
 lib/engine/framework/gmconf-bridge.h               |  104 --
 lib/engine/framework/reflister.h                   |    9 +
 lib/engine/framework/services.h                    |    4 +-
 lib/engine/gui/gtk-core/codecsbox.cpp              |  150 +-
 lib/engine/gui/gtk-frontend/accounts-window.cpp    |    5 +-
 lib/engine/gui/gtk-frontend/accounts-window.h      |    3 +-
 lib/engine/gui/gtk-frontend/addressbook-window.cpp |    5 +-
 lib/engine/gui/gtk-frontend/addressbook-window.h   |    4 +-
 lib/engine/gui/gtk-frontend/assistant-window.cpp   |   83 +-
 lib/engine/gui/gtk-frontend/call-window.cpp        |  308 ++--
 lib/engine/gui/gtk-frontend/chat-window.cpp        |    4 +-
 lib/engine/gui/gtk-frontend/chat-window.h          |    3 +-
 lib/engine/gui/gtk-frontend/device-lists.cpp       |  112 --
 lib/engine/gui/gtk-frontend/device-lists.h         |   58 -
 lib/engine/gui/gtk-frontend/ext-window.cpp         |   59 +-
 lib/engine/gui/gtk-frontend/gtk-frontend.cpp       |   58 +-
 lib/engine/gui/gtk-frontend/main_window.cpp        |  321 ++--
 lib/engine/gui/gtk-frontend/preferences-window.cpp | 1915 +++++++++++++-------
 lib/engine/gui/gtk-frontend/preferences-window.h   |   48 +-
 lib/engine/gui/gtk-frontend/roster-view-gtk.cpp    |   75 +-
 lib/engine/gui/gtk-frontend/statusmenu.cpp         |   97 +-
 lib/engine/protocol/codec-description.cpp          |   22 +-
 lib/engine/protocol/codec-description.h            |    4 +-
 lib/engine/videoinput/videoinput-core.cpp          |  232 ++-
 lib/engine/videoinput/videoinput-core.h            |   27 +-
 lib/engine/videoinput/videoinput-gmconf-bridge.cpp |  147 --
 lib/engine/videoinput/videoinput-gmconf-bridge.h   |   62 -
 lib/engine/videoinput/videoinput-info.h            |   10 +-
 lib/engine/videooutput/videooutput-core.cpp        |   73 +-
 lib/engine/videooutput/videooutput-core.h          |    9 +-
 .../videooutput/videooutput-gmconf-bridge.cpp      |  122 --
 lib/engine/videooutput/videooutput-gmconf-bridge.h |   62 -
 lib/gmconf/gmconf-ekiga-keys.h                     |   66 -
 lib/gmconf/gmconf-gconf.c                          |  398 ----
 lib/gmconf/gmconf-glib.c                           | 1421 ---------------
 lib/gmconf/gmconf-upgrade.c                        |  230 ---
 lib/gmconf/gmconf-upgrade.h                        |   60 -
 lib/gmconf/gmconf.h                                |  126 --
 lib/gui/gmcallbacks.c                              |   32 +-
 lib/gui/gmconfwidgets.c                            |  405 -----
 lib/gui/gmconfwidgets.h                            |  183 --
 lib/gui/gmmenuaddon.c                              |  178 +--
 lib/gui/gmmenuaddon.h                              |   54 +-
 lib/gui/gmpreferences.c                            | 1115 ------------
 lib/gui/gmpreferences.h                            |  279 ---
 lib/gui/gmwindow.c                                 |  217 +--
 lib/gui/gmwindow.h                                 |   27 -
 lib/settings/ekiga-settings.h                      |  217 +++
 lib/settings/settings-mappings.c                   |  107 ++
 lib/settings/settings-mappings.h                   |   91 +
 org.gnome.ekiga.gschema.xml.in.in                  |  561 ++++++
 pixmaps/ekiga-logo.png                             |  Bin 67038 -> 76275 bytes
 plugins/avahi/avahi-heap.cpp                       |    4 +-
 plugins/gstreamer/Makefile.am                      |    1 +
 plugins/ldap/Makefile.am                           |    5 +-
 plugins/ldap/ldap-source.cpp                       |   21 +-
 plugins/ldap/ldap-source.h                         |    4 +
 plugins/loudmouth/Makefile.am                      |    2 +-
 plugins/loudmouth/loudmouth-bank.cpp               |   15 +-
 plugins/loudmouth/loudmouth-bank.h                 |    3 +
 plugins/resource-list/Makefile.am                  |    2 +-
 plugins/resource-list/rl-cluster.cpp               |   15 +-
 plugins/resource-list/rl-cluster.h                 |    3 +-
 src/Makefile.am                                    |    1 +
 src/dbus-helper/dbus-stub.xml                      |    6 -
 src/dbus-helper/dbus.cpp                           |   44 +-
 src/gui/main.cpp                                   |   22 +-
 113 files changed, 5462 insertions(+), 9558 deletions(-)
---