Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

jami-daemon
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Releases
- Model registry
- Incidents

Snippets Groups Projects

4a1abced

Commit 4a1abced authored 16 years ago by Emmanuel Milou

Downloads
- Plain Diff

Merge branch 'plug-in' of ssh://manu@192.168.1.105/~/dev/sflphone into plugins

Conflicts:

	configure.ac
	src/plug-in/pluginmanager.cpp
	src/plug-in/pluginmanager.h
	test/pluginmanagerTest.cpp

parents 88c73791 f6d2fbf1

Branches

Tags

Loading

Changes 43

Expand all Hide whitespace changes

Inline Side-by-side

Showing

configure.ac 2 additions, 1 deletion

configure.ac
sflphone-gtk/src/configurationmanager-glue.h 151 additions, 2 deletions

sflphone-gtk/src/configurationmanager-glue.h
sflphone-gtk/src/configwindow.c 12 additions, 49 deletions

sflphone-gtk/src/configwindow.c
sflphone-gtk/src/dbus.c 55 additions, 0 deletions

sflphone-gtk/src/dbus.c
sflphone-gtk/src/dbus.h 6 additions, 0 deletions

sflphone-gtk/src/dbus.h
src/Makefile.am 2 additions, 5 deletions

src/Makefile.am
src/account.cpp 9 additions, 2 deletions

src/account.cpp
src/account.h 64 additions, 3 deletions

src/account.h
src/dbus/Makefile.am 0 additions, 3 deletions

src/dbus/Makefile.am
src/dbus/configurationmanager-glue.h 68 additions, 0 deletions

src/dbus/configurationmanager-glue.h
src/dbus/configurationmanager-introspec.xml 15 additions, 0 deletions

src/dbus/configurationmanager-introspec.xml
src/dbus/configurationmanager.cpp 19 additions, 0 deletions

src/dbus/configurationmanager.cpp
src/dbus/configurationmanager.h 5 additions, 1 deletion

src/dbus/configurationmanager.h
src/eventthread.cpp 10 additions, 32 deletions

src/eventthread.cpp
src/eventthread.h 18 additions, 17 deletions

src/eventthread.h
src/global.h 4 additions, 0 deletions

src/global.h
src/iaxaccount.cpp 4 additions, 5 deletions

src/iaxaccount.cpp
src/iaxvoiplink.cpp 50 additions, 42 deletions

src/iaxvoiplink.cpp
src/iaxvoiplink.h 4 additions, 2 deletions

src/iaxvoiplink.h
src/managerimpl.cpp 173 additions, 335 deletions

src/managerimpl.cpp

with 671 additions and 499 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment