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

0c57c0f6

Commit 0c57c0f6 authored 13 years ago by Emmanuel Lepage

Downloads
- Plain Diff

Merge branch 'sflphone-client-0.9.14_refactoring'

parents 416fee0b e98d90ad

No related branches found

No related tags found

No related merge requests found

Changes 56

Expand all Hide whitespace changes

Inline Side-by-side

Showing

daemon/src/managerimpl.cpp 1 addition, 0 deletions

daemon/src/managerimpl.cpp
kde/data/sflphone-client-kdeui.rc 1 addition, 0 deletions

kde/data/sflphone-client-kdeui.rc
kde/plasma/dataengine/sflphonEngine.cpp 35 additions, 70 deletions

kde/plasma/dataengine/sflphonEngine.cpp
kde/plasma/dataengine/sflphonEngine.h 19 additions, 17 deletions

kde/plasma/dataengine/sflphonEngine.h
kde/plasma/plasmoid/MainWidget.cpp 46 additions, 41 deletions

kde/plasma/plasmoid/MainWidget.cpp
kde/plasma/plasmoid/MainWidget.h 1 addition, 0 deletions

kde/plasma/plasmoid/MainWidget.h
kde/plasma/plasmoid/SFLPhonePlasmoid.cpp 1 addition, 1 deletion

kde/plasma/plasmoid/SFLPhonePlasmoid.cpp
kde/src/AccountListModel.cpp 1 addition, 0 deletions

kde/src/AccountListModel.cpp
kde/src/AccountListModel.h 2 additions, 6 deletions

kde/src/AccountListModel.h
kde/src/AccountView.cpp 12 additions, 2 deletions

kde/src/AccountView.cpp
kde/src/AccountView.h 6 additions, 3 deletions

kde/src/AccountView.h
kde/src/AccountWizard.cpp 180 additions, 167 deletions

kde/src/AccountWizard.cpp
kde/src/AccountWizard.h 5 additions, 4 deletions

kde/src/AccountWizard.h
kde/src/AkonadiBackend.cpp 18 additions, 5 deletions

kde/src/AkonadiBackend.cpp
kde/src/AkonadiBackend.h 14 additions, 6 deletions

kde/src/AkonadiBackend.h
kde/src/CallView.cpp 113 additions, 118 deletions

kde/src/CallView.cpp
kde/src/CallView.h 37 additions, 42 deletions

kde/src/CallView.h
kde/src/Codec.cpp 18 additions, 5 deletions

kde/src/Codec.cpp
kde/src/Codec.h 18 additions, 23 deletions

kde/src/Codec.h
kde/src/SFLPhone.cpp 104 additions, 86 deletions

kde/src/SFLPhone.cpp

with 632 additions and 596 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