Commit Graph

32 Commits

Author SHA1 Message Date
20e75417bf [#2558] Added hangup menu item in systray 2010-02-11 17:22:05 -05:00
454df2e6bf [#2588] Use loadAccountOrder in placeCallFirstAccount to load account list 2010-02-08 14:41:11 -05:00
c5a61b1ded [#2588] Add DBUS method to make call with first registered account 2010-02-08 12:22:03 -05:00
d0f9101e38 [#2722] Make sure TLS transport is not used on normal IP2IP calls 2010-02-03 16:53:05 -05:00
d7fbde9211 Merge branch 'master' into networkmanager
Conflicts:
	sflphone-common/src/dbus/configurationmanager.cpp
	sflphone-common/src/managerimpl.cpp
	sflphone-common/src/sip/sipvoiplink.cpp
	sflphone-common/test/audiolayerTest.cpp
	sflphone-common/test/mainbufferTest.cpp
2009-11-20 10:33:50 -05:00
cf42cfd148 [#2402] Remove daemon warnings, make indent 2009-11-19 15:19:43 -05:00
f3c80c4bdf [#1671] Removed \n 2009-11-13 09:34:34 -05:00
c592ae1d41 [#2402] Code indentation 2009-11-10 11:56:26 -05:00
1ca78965a8 Merge branch 'master' into conference
Conflicts:
	sflphone-client-gnome/pixmaps/usersActive.svg
	sflphone-common/src/audio/audiortp/AudioZrtpSession.cpp
	sflphone-common/src/dbus/callmanager.cpp
	sflphone-common/src/managerimpl.cpp
	sflphone-common/src/sip/sipvoiplink.cpp
2009-09-21 10:20:28 -04:00
4e10f58e06 [#2174] Rsolve STUN with pjsip - DO NOT WORK 2009-09-15 18:51:48 -04:00
a5bde305cf Merge branch 'master' into conference
Conflicts:
	sflphone-client-gnome/pixmaps/Makefile.am
	sflphone-client-gnome/src/Makefile.am
	sflphone-client-gnome/src/actions.h
	sflphone-client-gnome/src/contacts/calltree.c
	sflphone-client-gnome/src/dbus/callmanager-introspec.xml
	sflphone-client-gnome/src/dbus/dbus.c
	sflphone-common/src/Makefile.am
	sflphone-common/src/audio/Makefile.am
	sflphone-common/src/audio/alsalayer.cpp
	sflphone-common/src/audio/audiolayer.h
	sflphone-common/src/audio/audiortp.cpp
	sflphone-common/src/audio/audiortp.h
	sflphone-common/src/audio/codecDescriptor.h
	sflphone-common/src/audio/pulselayer.cpp
	sflphone-common/src/audio/pulselayer.h
	sflphone-common/src/dbus/callmanager.h
	sflphone-common/src/iaxvoiplink.cpp
	sflphone-common/src/iaxvoiplink.h
	sflphone-common/src/managerimpl.cpp
	sflphone-common/src/managerimpl.h
	sflphone-common/src/sdp.cpp
	sflphone-common/src/sipcall.cpp
	sflphone-common/src/sipcall.h
	sflphone-common/src/sipvoiplink.cpp
	sflphone-common/src/sipvoiplink.h
	sflphone-common/test/Makefile.am
2009-09-14 15:49:03 -04:00
be2f093db3 [#2006] Add joinConference capabilities 2009-09-04 15:31:57 -04:00
97434978ed [#2006] Add dbus joinConference signal 2009-09-04 14:49:00 -04:00
e41f2bf59b [#2006] Add minimal multiple conference handling 2009-09-04 11:20:48 -04:00
28ea972c24 [#2006] Remove/add main participant from conferences 2009-08-31 19:15:03 -04:00
073f5a288b [#2006] Hangup a conference 2009-08-31 14:43:27 -04:00
8dbd587395 [#2006] Add hold/unhold conference dbus messages 2009-08-31 10:49:29 -04:00
e03972a3af [#2006] Add addParticipant method in managerimpl and related dbus messages 2009-08-28 12:45:01 -04:00
60a7e80b52 [#2006] Add multilayered capabilities to calltree (GtkTreeStore) 2009-08-27 09:17:59 -04:00
e3dde95dc2 [#2006] Add getConfList method over dbus
Conference list is filled after receiving conferenceChanged signals
2009-08-25 16:04:41 -04:00
fadcb9ba39 [#2006] Remove addParticipant method for conference, use joinParticipant only 2009-08-24 14:49:18 -04:00
9c6778fe93 [#2006] Add Detach participant method 2009-08-24 13:58:26 -04:00
c9232ce7de [#2006] Add joinParticipant (conference) method in ManagerImpl 2009-08-24 10:32:17 -04:00
9b20e8813e [#2006] Add joinConference DBUS message 2009-08-24 10:05:16 -04:00
f0d2b54b8a [#1883] Add usefull and permanent debug info for conference cretion/deletion 2009-08-20 10:53:26 -04:00
7689cbde7a [#1883] Add minimal functionalities to create a conference
Call someone, add incoming calls to the conference using the new conference button

Signed-off-by: Alexandre Savard <alexandre.savard@savoirfairelinux.net>
2009-08-07 11:09:08 -04:00
8635de5162 [#811] Got out of a precarious position were nothing would compile.
Inclusions were flawed and were creating cycles. Many header files were
fixed following :
"A header file should be included only when a forward declaration
would not do the job." principle.

ZRTP configuration re-added to getAccountDetails/setAccountDetails
2009-08-06 17:52:28 -04:00
b79320b2c3 [#1883] Add sflphone-client "addParticipant" button for conference
Which send a signal through DBUS
2009-08-06 11:23:49 -04:00
035a6b329e [#1777] Code indentation/formatting 2009-07-03 14:17:18 -04:00
7a775e3f56 [#1108] Add messges in main window concerning transfer success failure 2009-06-01 14:40:39 -04:00
2fb856e0aa [#1312] Implement getCallList D-BUS method 2009-05-29 16:30:07 -04:00
d61c109609 [#1212] Create sflphone-common at the root of the repository 2009-04-21 17:56:33 -04:00