conf: revert most of 0db497786f492e352a935e4986b2686daad954a9
commit9cb3035d595138b9c14cc507fe779e4809ec5779
authorJakub Adam <jakub.adam@ktknet.cz>
Thu, 14 Apr 2011 20:09:07 +0000 (14 22:09 +0200)
committerJakub Adam <jakub.adam@ktknet.cz>
Thu, 14 Apr 2011 20:09:07 +0000 (14 22:09 +0200)
tree0bc1e9d72a4322b9b907cc6bb55fe2adee6b475f
parentd93fab72cf55559990b7542fb9e9098509618d24
conf: revert most of 0db497786f492e352a935e4986b2686daad954a9

Implementation did not work well when multiple endpoints are connected
simultaneously to OCS. Whenever invite to conference is received, SIPE
accepts it immediatelly, not allowing user to choose to join the call
from other location. When SIPE is not compiled with voice support,
this completely blocks user from using voice conferencing while our
client is running.

We must ask user whether to join call, before conference invite is
accepted.
src/api/sipe-backend.h
src/api/sipe-core.h
src/core/sipe-conf.c
src/core/sipe-media.c
src/purple/purple-chat.c
src/purple/purple-media.c