Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone into video_preview

Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone into video_preview

Resolved Conflicts:
	gnome/configure.ac
	gnome/src/Makefile.am
	gnome/src/config/Makefile.am
	gnome/src/config/accountconfigdialog.c
	gnome/src/config/preferencesdialog.c
	gnome/src/contacts/Makefile.am
	gnome/src/contacts/searchbar.c
	gnome/src/dbus/Makefile.am
	gnome/src/icons/Makefile.am
	gnome/src/icons/icon_factory.c
	gnome/src/imwindow.c
	gnome/src/main.c
	gnome/src/widget/Makefile.am
	gnome/tests/Makefile.am

Its presence causes a lot of warnings about gtk_style.

Don't call g_free on object created with gtk_uimanager_new()
Regression introduced by commit cf0a4a89

Merge branch 'gtk3_migration' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone into gtk3_migration

Resolved Conflicts:
	gnome/src/config/accountconfigdialog.c

Specifically, compiles with the flags:
-DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED
-DGTK_DISABLE_SINGLE_INCLUDES

See:
http://developer.gnome.org/gtk3/3.3/gtk-migrating-2-to-3.html#id1539429

Changes backported from video_preview

Merge branch 'video_preview' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone into video_preview

Resolved Conflicts:
	daemon/README
	daemon/configure.ac
	daemon/src/account.cpp
	daemon/src/audio/codecs/audiocodec.cpp
	daemon/src/call.cpp
	daemon/src/config/yamlemitter.cpp
	daemon/src/config/yamlemitter.h
	daemon/src/config/yamlparser.cpp
	daemon/src/config/yamlparser.h
	daemon/src/dbus/configurationmanager.h
	daemon/src/managerimpl.h
	daemon/src/noncopyable.h
	daemon/src/preferences.cpp
	daemon/src/sip/sdp.cpp
	daemon/src/sip/sdp.h

* #7491: merged control files, added dh_shlibdeps macro to plugins/rules, added 12.04 (precise) to distributions

Merge branch 'gtk3_migration' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone into gtk3_migration

Specifically, compiles with the flags:
-DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED
-DGTK_DISABLE_SINGLE_INCLUDES

See:
http://developer.gnome.org/gtk3/3.3/gtk-migrating-2-to-3.html#id1539429

Changes backported from video_preview

The assignment operator should return *this, see item 15 of "Effective C++"

Thanks to Marcos Garcia Marti <marcos.garcia@savoirfairelinux.com>

Specifically, compiles with the flags:
-DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED
-DGTK_DISABLE_SINGLE_INCLUDES

See:
http://developer.gnome.org/gtk3/3.3/gtk-migrating-2-to-3.html#id1539429

Changes backported from video_preview