diff --git a/sflphone_kde/Account.cpp b/sflphone-client-kde/Account.cpp
similarity index 100%
rename from sflphone_kde/Account.cpp
rename to sflphone-client-kde/Account.cpp
diff --git a/sflphone_kde/Account.h b/sflphone-client-kde/Account.h
similarity index 100%
rename from sflphone_kde/Account.h
rename to sflphone-client-kde/Account.h
diff --git a/sflphone_kde/AccountItemWidget.cpp b/sflphone-client-kde/AccountItemWidget.cpp
similarity index 100%
rename from sflphone_kde/AccountItemWidget.cpp
rename to sflphone-client-kde/AccountItemWidget.cpp
diff --git a/sflphone_kde/AccountItemWidget.h b/sflphone-client-kde/AccountItemWidget.h
similarity index 100%
rename from sflphone_kde/AccountItemWidget.h
rename to sflphone-client-kde/AccountItemWidget.h
diff --git a/sflphone_kde/AccountList.cpp b/sflphone-client-kde/AccountList.cpp
similarity index 89%
rename from sflphone_kde/AccountList.cpp
rename to sflphone-client-kde/AccountList.cpp
index e4f7bc822691802aa1542f207a8a47526c95285a..b520ef119fc2a22745cfd97de4c4d68d597f316e 100644
--- a/sflphone_kde/AccountList.cpp
+++ b/sflphone-client-kde/AccountList.cpp
@@ -3,16 +3,7 @@
 #include "configurationmanager_interface_singleton.h"
 
 //Constructors
-/*
-AccountList::AccountList(VectorString & _accountIds)
-{
-	accounts = new QVector<Account *>(1);
-	(*accounts) += new Account(*(new QListWidgetItem()), "alias");
-	for (int i = 0; i < _accountIds.size(); ++i){
-		(*accounts) += new Account(_accountIds[i]);
-	}
-}
-*/
+
 AccountList::AccountList(QStringList & _accountIds)
 {
 	firstAccount = NULL;
@@ -56,7 +47,7 @@ QVector<Account *> AccountList::registeredAccounts() const
 	Account * current;
 	for (int i = 0; i < accounts->count(); ++i){
 		current = (*accounts)[i];
-		if(current->getAccountDetail(ACCOUNT_STATUS) == QString(ACCOUNT_STATE_REGISTERED))
+		if(current->getAccountDetail(ACCOUNT_STATUS) == ACCOUNT_STATE_REGISTERED)
 		{
 			registeredAccounts.append(current);
 		}
@@ -73,7 +64,7 @@ Account * AccountList::firstRegisteredAccount() const
 	Account * current;
 	for (int i = 0; i < accounts->count(); ++i){
 		current = (*accounts)[i];
-		if(current->getAccountDetail(ACCOUNT_STATUS) == QString(ACCOUNT_STATE_REGISTERED))
+		if(current->getAccountDetail(ACCOUNT_STATUS) == ACCOUNT_STATE_REGISTERED)
 		{
 			return current;
 		}
diff --git a/sflphone_kde/AccountList.h b/sflphone-client-kde/AccountList.h
similarity index 100%
rename from sflphone_kde/AccountList.h
rename to sflphone-client-kde/AccountList.h
diff --git a/sflphone_kde/AccountWizard.cpp b/sflphone-client-kde/AccountWizard.cpp
similarity index 100%
rename from sflphone_kde/AccountWizard.cpp
rename to sflphone-client-kde/AccountWizard.cpp
diff --git a/sflphone_kde/AccountWizard.h b/sflphone-client-kde/AccountWizard.h
similarity index 100%
rename from sflphone_kde/AccountWizard.h
rename to sflphone-client-kde/AccountWizard.h
diff --git a/sflphone_kde/ActionSetAccountFirst.cpp b/sflphone-client-kde/ActionSetAccountFirst.cpp
similarity index 100%
rename from sflphone_kde/ActionSetAccountFirst.cpp
rename to sflphone-client-kde/ActionSetAccountFirst.cpp
diff --git a/sflphone_kde/ActionSetAccountFirst.h b/sflphone-client-kde/ActionSetAccountFirst.h
similarity index 100%
rename from sflphone_kde/ActionSetAccountFirst.h
rename to sflphone-client-kde/ActionSetAccountFirst.h
diff --git a/sflphone_kde/CMakeLists.txt b/sflphone-client-kde/CMakeLists.txt
similarity index 66%
rename from sflphone_kde/CMakeLists.txt
rename to sflphone-client-kde/CMakeLists.txt
index c4a593292d51e7c74e7cd66f5d81d97eff7ab223..cd12ecb5025837cc21b6d4fc6a7f416aab62398e 100644
--- a/sflphone_kde/CMakeLists.txt
+++ b/sflphone-client-kde/CMakeLists.txt
@@ -1,6 +1,6 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 
-PROJECT(sflphone_kde)
+PROJECT(sflphone-client-kde)
 
 SET(LOCAL_CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake_modules/")
 SET(CMAKE_MODULE_PATH "${LOCAL_CMAKE_MODULE_PATH}")
@@ -8,8 +8,8 @@ SET(CMAKE_MODULE_PATH "${LOCAL_CMAKE_MODULE_PATH}")
 # --- custom targets: ---
 INCLUDE( ${LOCAL_CMAKE_MODULE_PATH}/TargetDistclean.cmake  REQUIRED)
 
-FIND_PACKAGE ( PkgConfig REQUIRED )
 FIND_PACKAGE ( Kabc REQUIRED )
+FIND_PACKAGE ( PkgConfig REQUIRED )
 FIND_PACKAGE ( KDE4 REQUIRED )
 FIND_PACKAGE ( Qt4 REQUIRED )
 
@@ -19,27 +19,21 @@ INCLUDE ( KDE4Defaults )
 
 INCLUDE_DIRECTORIES ( ${KDE4_INCLUDES} ${QT_INCLUDES} )
 
-#INCLUDE (  ${CMAKE_ROOT}/Modules/FindQt4.cmake  )
-#INCLUDE (  ${CMAKE_ROOT}/Modules/FindKDE4.cmake  )
-#INCLUDE (  ${CMAKE_ROOT}/Modules/FindPkgConfig.cmake  )
-
 INCLUDE (  ${CMAKE_ROOT}/Modules/CheckIncludeFiles.cmake  )
 INCLUDE(   ${QT_USE_FILE}   )
 
 ADD_DEFINITIONS(${KDE4_DEFINITIONS} ${QT_DEFINITIONS} -fexceptions -DDATA_INSTALL_DIR="\\\"${DATA_INSTALL_DIR}\\\"")
 
-#AC_CHECK_HEADERS(log4c.h)
+
 
 #pkg_check_modules(LIBSEXY libsexy>=0.1)
 #pkg_check_modules(KDEPIM kdepimlibs5-dev REQUIRED)
 
 
-CHECK_INCLUDE_FILES (malloc.h HAVE_MALLOC_H)
-
 
 
 SET(
-	sflphone_kde_SRCS
+	sflphone_client_kde_SRCS
 	sflphone_kdeview.cpp
 	SFLPhone.cpp
 	ConfigDialog.cpp
@@ -49,35 +43,33 @@ SET(
 	AccountList.cpp
 	Call.cpp
 	CallList.cpp
-	#configurationmanager_interface.cpp
 	configurationmanager_interface_singleton.cpp
-	#callmanager_interface.cpp
 	callmanager_interface_singleton.cpp
-	#instance_interface.cpp
 	instance_interface_singleton.cpp
 	AccountWizard.cpp
 	AccountItemWidget.cpp
 	ActionSetAccountFirst.cpp
 	Contact.cpp
 	ContactItemWidget.cpp
-	#metatypes.h
 )
  
-SET(QtApp_RCCS resources.qrc)
-
 
 # generate rules for building source files from the resources
+ 
+SET(QtApp_RCCS resources.qrc)
+
 QT4_ADD_RESOURCES(QtApp_RCC_SRCS ${QtApp_RCCS})
 
 
-#kde4_automoc(${sflphone_kde_SRCS})
+# kde4_automoc(${sflphone_client_kde_SRCS})
 
-KDE4_ADD_UI_FILES(sflphone_kde_SRCS sflphone_kdeview_base.ui ConfigDialog.ui)
+KDE4_ADD_UI_FILES(sflphone_client_kde_SRCS sflphone_kdeview_base.ui ConfigDialog.ui)
 
-SET ( configurationmanager_xml  ${CMAKE_CURRENT_SOURCE_DIR}/../sflphone-common/src/dbus/configurationmanager-introspec.xml )
-SET ( callmanager_xml  ${CMAKE_CURRENT_SOURCE_DIR}/../sflphone-common/src/dbus/callmanager-introspec.xml )
-SET ( instance_xml  ${CMAKE_CURRENT_SOURCE_DIR}/../sflphone-common/src/dbus/instance-introspec.xml )
+# Build dbus interfaces
 
+# configuration manager interface
+
+SET ( configurationmanager_xml  ${CMAKE_CURRENT_SOURCE_DIR}/../sflphone-common/src/dbus/configurationmanager-introspec.xml )
 
 SET_SOURCE_FILES_PROPERTIES(
    ${configurationmanager_xml}
@@ -85,11 +77,14 @@ SET_SOURCE_FILES_PROPERTIES(
    CLASSNAME ConfigurationManagerInterface
    INCLUDE "../metatypes.h") 
 
-qt4_add_dbus_interface(
-   sflphone_kde_SRCS 
+QT4_ADD_DBUS_INTERFACE(
+   sflphone_client_kde_SRCS 
    ${configurationmanager_xml}
    configurationmanager_interface)
 
+# call manager interface
+
+SET ( callmanager_xml  ${CMAKE_CURRENT_SOURCE_DIR}/../sflphone-common/src/dbus/callmanager-introspec.xml )
 
 SET_SOURCE_FILES_PROPERTIES(
    ${callmanager_xml}
@@ -97,11 +92,14 @@ SET_SOURCE_FILES_PROPERTIES(
    CLASSNAME CallManagerInterface
    INCLUDE "../metatypes.h") 
 
-qt4_add_dbus_interface(
-   sflphone_kde_SRCS 
+QT4_ADD_DBUS_INTERFACE(
+   sflphone_client_kde_SRCS 
    ${callmanager_xml}
    callmanager_interface)
 
+# instance interface
+
+SET ( instance_xml  ${CMAKE_CURRENT_SOURCE_DIR}/../sflphone-common/src/dbus/instance-introspec.xml )
 
 SET_SOURCE_FILES_PROPERTIES(
    ${instance_xml}
@@ -109,25 +107,26 @@ SET_SOURCE_FILES_PROPERTIES(
    CLASSNAME InstanceInterface
    INCLUDE "../metatypes.h") 
    
-qt4_add_dbus_interface(
-   sflphone_kde_SRCS 
+QT4_ADD_DBUS_INTERFACE(
+   sflphone_client_kde_SRCS 
    ${instance_xml}
    instance_interface)
 
 
-#kde4_add_kcfg_files(sflphone_kde_SRCS settings.kcfgc )
+# kde4_add_kcfg_files(sflphone_client_kde_SRCS settings.kcfgc )
 
-kde4_add_executable(sflphone-client-kde ${sflphone_kde_SRCS} ${QtApp_RCC_SRCS})
+KDE4_ADD_EXECUTABLE(sflphone-client-kde ${sflphone_client_kde_SRCS} ${QtApp_RCC_SRCS})
 
-target_link_libraries(sflphone-client-kde ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} -lkabc)
+SET ( KDE4_KABC_LIBS  -lkabc )
+TARGET_LINK_LIBRARIES(sflphone-client-kde ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${KDE4_KABC_LIBS})
 
-install(TARGETS sflphone-client-kde DESTINATION ${BIN_INSTALL_DIR})
+INSTALL(TARGETS sflphone-client-kde DESTINATION ${BIN_INSTALL_DIR})
 
 
 ########### install files ###############
 
-install( FILES sflphone_kde.desktop  DESTINATION  ${XDG_APPS_INSTALL_DIR} )
-#install( FILES sflphone_kde.kcfg  DESTINATION  ${KCFG_INSTALL_DIR} )
-install( FILES sflphone_kdeui.rc  DESTINATION  ${DATA_INSTALL_DIR}/sflphone_kde )
+INSTALL( FILES sflphone-client-kde.desktop  DESTINATION  ${XDG_APPS_INSTALL_DIR} )
+# INSTALL( FILES sflphone_kde.kcfg  DESTINATION  ${KCFG_INSTALL_DIR} )
+INSTALL( FILES sflphone-client-kdeui.rc  DESTINATION  ${DATA_INSTALL_DIR}/sflphone-client-kde )
 
 
diff --git a/sflphone_kde/COPYING b/sflphone-client-kde/COPYING
similarity index 100%
rename from sflphone_kde/COPYING
rename to sflphone-client-kde/COPYING
diff --git a/sflphone_kde/Call.cpp b/sflphone-client-kde/Call.cpp
similarity index 100%
rename from sflphone_kde/Call.cpp
rename to sflphone-client-kde/Call.cpp
index 0ac892a5db937ea5a8c2248ec361c38b324a7809..45cd652ca3bb353a3f4fad3f04418817f1843adc 100644
--- a/sflphone_kde/Call.cpp
+++ b/sflphone-client-kde/Call.cpp
@@ -477,8 +477,8 @@ void Call::call()
 	else
 	{
 		qDebug() << "Trying to call " << number << " with no account registered . callId : " << callId;
-		throw "No account registered!";
 		this->historyState = NONE;
+		throw "No account registered!";
 	}
 }
 
diff --git a/sflphone_kde/Call.h b/sflphone-client-kde/Call.h
similarity index 100%
rename from sflphone_kde/Call.h
rename to sflphone-client-kde/Call.h
diff --git a/sflphone_kde/CallList.cpp b/sflphone-client-kde/CallList.cpp
similarity index 100%
rename from sflphone_kde/CallList.cpp
rename to sflphone-client-kde/CallList.cpp
diff --git a/sflphone_kde/CallList.h b/sflphone-client-kde/CallList.h
similarity index 100%
rename from sflphone_kde/CallList.h
rename to sflphone-client-kde/CallList.h
diff --git a/sflphone_kde/ConfigDialog.cpp b/sflphone-client-kde/ConfigDialog.cpp
similarity index 100%
rename from sflphone_kde/ConfigDialog.cpp
rename to sflphone-client-kde/ConfigDialog.cpp
diff --git a/sflphone_kde/ConfigDialog.h b/sflphone-client-kde/ConfigDialog.h
similarity index 100%
rename from sflphone_kde/ConfigDialog.h
rename to sflphone-client-kde/ConfigDialog.h
diff --git a/sflphone_kde/ConfigDialog.ui b/sflphone-client-kde/ConfigDialog.ui
similarity index 100%
rename from sflphone_kde/ConfigDialog.ui
rename to sflphone-client-kde/ConfigDialog.ui
diff --git a/sflphone_kde/Contact.cpp b/sflphone-client-kde/Contact.cpp
similarity index 100%
rename from sflphone_kde/Contact.cpp
rename to sflphone-client-kde/Contact.cpp
diff --git a/sflphone_kde/Contact.h b/sflphone-client-kde/Contact.h
similarity index 100%
rename from sflphone_kde/Contact.h
rename to sflphone-client-kde/Contact.h
diff --git a/sflphone_kde/ContactItemWidget.cpp b/sflphone-client-kde/ContactItemWidget.cpp
similarity index 100%
rename from sflphone_kde/ContactItemWidget.cpp
rename to sflphone-client-kde/ContactItemWidget.cpp
diff --git a/sflphone_kde/ContactItemWidget.h b/sflphone-client-kde/ContactItemWidget.h
similarity index 100%
rename from sflphone_kde/ContactItemWidget.h
rename to sflphone-client-kde/ContactItemWidget.h
diff --git a/sflphone_kde/Doxyfile b/sflphone-client-kde/Doxyfile
similarity index 100%
rename from sflphone_kde/Doxyfile
rename to sflphone-client-kde/Doxyfile
diff --git a/sflphone_kde/README b/sflphone-client-kde/README
similarity index 100%
rename from sflphone_kde/README
rename to sflphone-client-kde/README
diff --git a/sflphone_kde/SFLPhone.cpp b/sflphone-client-kde/SFLPhone.cpp
similarity index 97%
rename from sflphone_kde/SFLPhone.cpp
rename to sflphone-client-kde/SFLPhone.cpp
index a919d38eabd541dd4cff77bbb2a11e5ac4f014fa..dfa6a928b458547942ac6a99f7459167aa24ade0 100644
--- a/sflphone_kde/SFLPhone.cpp
+++ b/sflphone-client-kde/SFLPhone.cpp
@@ -33,7 +33,7 @@ SFLPhone::SFLPhone(QWidget *parent)
 		
 		setupActions();
 		
-		QString str = QString(DATA_INSTALL_DIR) + "/sflphone_kde/sflphone_kdeui.rc";
+		QString str = QString(DATA_INSTALL_DIR) + "/sflphone-client-kde/sflphone-client-kdeui.rc";
 		qDebug() << "str = " << str ;
 		createGUI(str);
 		
diff --git a/sflphone_kde/SFLPhone.h b/sflphone-client-kde/SFLPhone.h
similarity index 100%
rename from sflphone_kde/SFLPhone.h
rename to sflphone-client-kde/SFLPhone.h
diff --git a/sflphone_kde/callmanager_interface_singleton.cpp b/sflphone-client-kde/callmanager_interface_singleton.cpp
similarity index 100%
rename from sflphone_kde/callmanager_interface_singleton.cpp
rename to sflphone-client-kde/callmanager_interface_singleton.cpp
diff --git a/sflphone_kde/callmanager_interface_singleton.h b/sflphone-client-kde/callmanager_interface_singleton.h
similarity index 100%
rename from sflphone_kde/callmanager_interface_singleton.h
rename to sflphone-client-kde/callmanager_interface_singleton.h
diff --git a/sflphone_kde/cmake_modules/FindKabc.cmake b/sflphone-client-kde/cmake_modules/FindKabc.cmake
similarity index 100%
rename from sflphone_kde/cmake_modules/FindKabc.cmake
rename to sflphone-client-kde/cmake_modules/FindKabc.cmake
diff --git a/sflphone_kde/cmake_modules/FindQt4.cmake b/sflphone-client-kde/cmake_modules/FindQt4.cmake
similarity index 100%
rename from sflphone_kde/cmake_modules/FindQt4.cmake
rename to sflphone-client-kde/cmake_modules/FindQt4.cmake
diff --git a/sflphone_kde/cmake_modules/TargetDistclean.cmake b/sflphone-client-kde/cmake_modules/TargetDistclean.cmake
similarity index 100%
rename from sflphone_kde/cmake_modules/TargetDistclean.cmake
rename to sflphone-client-kde/cmake_modules/TargetDistclean.cmake
diff --git a/sflphone_kde/configurationmanager_interface_singleton.cpp b/sflphone-client-kde/configurationmanager_interface_singleton.cpp
similarity index 100%
rename from sflphone_kde/configurationmanager_interface_singleton.cpp
rename to sflphone-client-kde/configurationmanager_interface_singleton.cpp
diff --git a/sflphone_kde/configurationmanager_interface_singleton.h b/sflphone-client-kde/configurationmanager_interface_singleton.h
similarity index 100%
rename from sflphone_kde/configurationmanager_interface_singleton.h
rename to sflphone-client-kde/configurationmanager_interface_singleton.h
diff --git a/sflphone-client-kde/debian/changelog b/sflphone-client-kde/debian/changelog
new file mode 100644
index 0000000000000000000000000000000000000000..f823fa8914e4e82bddb8c64ce217915289648562
--- /dev/null
+++ b/sflphone-client-kde/debian/changelog
@@ -0,0 +1,687 @@
+sflphone-client-gnome (0.9.5-0ubuntu1~1.gbpf07060) SYSTEM; urgency=low
+
+  ** SNAPSHOT build @f07060721d61850d67b89f24f0415d7237281886 **
+
+  [ Emmanuel Milou ]
+  * [#1220] Add Conflicts: sflphone in debian control files
+  * [#1179] Add liblog4c3 runtime dependency
+  * [#1212] FIx typo error in dependency list for itnrepid
+  * [#1212] FIx .desktop file to point on the right exec
+  * [#1212] Modify changelog replacing tag
+
+  [ Sflphone Project ]
+  * "[#1262] Updated changelogs for version 0.9.5-0ubuntu1~beta"
+
+  [ Emmanuel Milou ]
+  * [#1212] restore changelogs
+
+  [ Sflphone Project ]
+  * [#1262] Updated changelogs for version 0.9.5-0ubuntu1 Snapshot 2009-
+    04-27
+
+  [ Emmanuel Milou ]
+  * [#1212] restore changelogs
+
+  [ Sflphone Project ]
+  * [#1262] Updated changelogs for version 0.9.5-0ubuntu1~beta
+
+  [ Emmanuel Milou ]
+  * [#1212] restore changelogs
+
+  [ Sflphone Project ]
+  * [#1262] Updated changelogs for version 0.9.5-0ubuntu1~beta
+  * [#1262] Updated changelogs for version 0.9.5-0ubuntu1 Snapshot 2009-
+    04-28
+
+  [ Emmanuel Milou ]
+  * [#1212] Restore changelogs
+
+  [ Sflphone Project ]
+
+ -- Sflphone Project <sflphone@mtl.savoirfairelinux.net>  Tue, 28 Apr 2009 12:23:35 -0400
+
+sflphone-client-gnome (0.9.5-0ubuntu1~beta) SYSTEM; urgency=low
+
+  [ Julien Bonjean ]
+  * Updated Eclipse stuff
+  * Improved addressbook config window
+  * Added sflphone Eclipse stuff
+  * Implemented addressbook list server side
+  * Moved dbus stuff in dbus directory
+  * Updated addressbook configuration
+
+  [ Emmanuel Milou ]
+  * Remove unuseful installation scripts. Use apt-get build-dep sflphone
+    instead
+  * fix bug #1090
+
+  [ Alexandre Savard ]
+  * defining speex 16khz
+
+  [ Emmanuel Milou ]
+  * Remove unuseful file from build system
+  * Start dns srv resolver
+
+  [ Alexandre Savard ]
+  * Basic ogg/vorbis initialization
+
+  [ Emmanuel Milou ]
+  * Handle incoming IP-to-IP invite correctly
+
+  [ Alexandre Savard ]
+  * speex wideband 16000
+
+  [ Emmanuel Milou ]
+  * Better handling of incoming IP to IP call
+  * DNS SRV resolution functional
+  * Implement IAX2 incoming URL
+  * Allow user to make IP call without any accounts configured
+  * Add a contextual menu to edit a number from the contacts tab
+  * Add comments, tooltip and new button to the contextual menu
+  * add delete event, migrate to GTK 2.16 for sexy icons
+  * Resolve ticket #1118
+  * Update suse spec file
+  * Add phone number cleanup functions, unit tests and panel
+    configuration
+  * Add pertinent test that fails
+  * fix dependencies for suse package
+  * Add contextual edit menu in history - #1120
+
+  [ Alexandre Savard ]
+  * Temporary comit: make speex wideband (16 khz)
+  * Temporary: shared object for speex narrow band
+  * Temporary: speex narrowband and wideband coexist
+
+  [ Julien Bonjean ]
+  * Fixed bug when no book selected
+  * Fixed addressbook related compilation warnings
+  * Fixed GTK client remaining compilation warnings
+  * Fixed segfault when book removed since last sflphone run
+  * Fixed bug when book is unreachable (ldap error)
+
+  [ Alexandre Savard ]
+  * Fix codec list in audio config window
+  * Active/inactive speex codec by payload
+
+  [ Julien Bonjean ]
+  * Updated gitignore
+  * Added some comments
+
+  [ Emmanuel Milou ]
+  * Add callto: handler script for browsers and al.
+  * Integrate test compilation in the daemon build-system
+
+  [ Julien Bonjean ]
+  * Fixed g_object_unref warning for pixbuf
+  * Cleaned too verbose output
+  * Fixed toolbar update warning
+  * Added support for asynchornous books open (first shot)
+
+  [ Emmanuel Milou ]
+  * Add a DBus call to fetch the call details from a call ID - Ticket
+    #928
+
+  [ Julien Bonjean ]
+  * Improved async open books
+  * Fixed bug #1139
+
+  [ Emmanuel Milou ]
+  * Add a way to save account order
+  * commit missing files
+
+  [ Julien Bonjean ]
+  * Introduced log4c (ticket #1162)
+
+  [ Emmanuel Milou ]
+  * Load/save account order functionnal - ticket #813
+
+  [ Alexandre Savard ]
+  * Add CELT codec (#1143)
+  * Make celt frame size 256  (*1143)
+
+  [ Julien Bonjean ]
+  * Switched everything to log4c (ticket #1162)
+  * Updated eclipse settings
+
+  [ Emmanuel Milou ]
+  * Restore adding account - ticket #1172
+  * Add liblog4c dependecy - ticket #1179
+
+  [ Alexandre Savard ]
+  * Double maxAvailByte for frame size in rtp (#1143)
+
+  [ Emmanuel Milou ]
+  * Add User-Agent SIP header - Ticket #1173
+
+  [ Julien Bonjean ]
+  * Fixed autoresize issue (#708)
+
+  [ Emmanuel Milou ]
+  * Remove libcppuint dependency for the debian packages
+  * Look for libsexy only if gtk version < 2.16 - Ticket #1116
+  * Remove libsexy dependency for jaunty. ticket #1116
+
+  [ Julien Bonjean ]
+  * Introduced unit tests (#1146)
+  * Updated gitignore
+  * Fixed Makefile (#1146)
+
+  [ Emmanuel Milou ]
+  * [TICKET #1112] Add a test on the voice buffer to send through iax
+    packets
+  * Remove doublon in dependencies
+  * Remove warnings from the client test framework
+  * Update version number to 0.9.5~beta
+  * Update build-package script
+  * Add check dependency in build-deps control file field
+  * Create debian files for the new sflphone-client-gnome
+  * [TICKET #1212] Add Replaces field in control files
+  * [TICKET #1212] Fix manpages installation path
+  * [TICKET #1212] Add maintainer scripts to create alternatives
+  * [#1212] Update the manpages generation - edit preinst maintainer
+    script
+  * [#1212] Fix reference error in manpage
+  * [#1212] Add missing files on the client side
+  * [#1212] Fix debian docs files - no TODO file
+  * [1212] Fix manpage creation problem
+  * [#1220] Generate client-side glue files and marshaller at
+    compilation time
+  * [#1220] Generate server-side glue files at compilation time
+  * [#1212] Change binary name to sflphone-client-gnome
+  * [#1212] Update .gitignore to fit the new working tree
+  * [#1220] Explicitly generate glue files before building the library
+  * [#1220] Compile dbus directory before audio
+  * [#1212] Create sflphone-common at the root of the repository
+  * [#1212] Re-add pjproject
+  * [#1212] Remove Makefile from repo
+  * [#1220] Fix Makefile.am
+  * [#1212] New working directory functional
+  * [#1212] Update .gitignore
+  * [#1212] Hack to make pjsip compile..
+  * [#1220] Use non-installed binary for dbusxx-xml2cpp
+  * [#1212] Add descriptive files, remove unuseful scripts from tools/
+
+  [ Alexandre Savard ]
+  * Restore speex codecs
+  * add frame size for celt (#1143)
+  * add framesize to codec, independant from audiolayer (#1143)
+  * use codec frame size in rtp (#1143)
+  * compute fixed_codec_framesize (#1143)
+  * do not resample if not required (#1143)
+  * add condition on resampling for decoder (#1143)
+  * add a condition on bytesAvail == 0 from mic data
+  * no maximum in rtp decode (#1143)
+  * compute maximum for decoding (#1143)
+
+  [ Emmanuel Milou ]
+  * [#1146] Implement unitary tests on the client-side
+
+  [ Alexandre Savard ]
+  * use float instead of int to compute max nb of sample (#1143)
+  * add nbSampleMax for unresampled data (#1143)
+  * make thread sleep during 5 ms insead of 20 (#1143)
+  * use unix usleep (#1143)
+  * 50 usecond thread!!!!! (#1143)
+  * try with the smallest compression (#1143)
+  * use timer set at framesize (#1143)
+
+  [ Emmanuel Milou ]
+  * [#1161] Restore changelog version
+
+  [ Alexandre Savard ]
+  * Remove celt stuff
+
+  [ Emmanuel Milou ]
+  * [#1161] Update changelog
+  * [#1220] Add Conflicts: sflphone in debian control files
+  * [#1179] Add liblog4c3 runtime dependency
+  * [#1212] FIx typo error in dependency list for itnrepid
+  * [#1212] FIx .desktop file to point on the right exec
+  * [#1212] Modify changelog replacing tag
+
+  [ Sflphone Project ]
+  * "[#1262] Updated changelogs for version 0.9.5-0ubuntu1~beta"
+
+  [ Emmanuel Milou ]
+  * [#1212] restore changelogs
+
+  [ Sflphone Project ]
+  * [#1262] Updated changelogs for version 0.9.5-0ubuntu1 Snapshot 2009-
+    04-27
+
+  [ Emmanuel Milou ]
+  * [#1212] restore changelogs
+
+  [ Sflphone Project ]
+  * [#1262] Updated changelogs for version 0.9.5-0ubuntu1~beta
+
+  [ Emmanuel Milou ]
+  * [#1212] restore changelogs
+
+  [ Sflphone Project ]
+
+ -- Sflphone Project <sflphone@mtl.savoirfairelinux.net>  Mon, 27 Apr 2009 17:00:03 -0400
+
+sflphone-client-gnome (0.9.4-0ubuntu2) SYSTEM; urgency=low
+
+  [ Alexandre Savard ]
+  * Restore speex and GSM detection
+
+  [ Emmanuel Milou ]
+  * Fix bug #1090
+ 
+ -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>  Wed, 8 Apr 2009 11:29:15 -0500
+
+sflphone (0.9.4-0ubuntu1) SYSTEM; urgency=low
+
+  [ Emmanuel Milou ]
+  * Integrate DBus-c++ and libiax2 in the main build system
+  * Clean up in the working repository
+  * Reorder hooks configuration panel
+  * Protect case when no codecs are active
+  * Fix some return values
+  * Add unitary tests for the hook manager (premisces)
+  
+  [Yun Liu]
+  * Update chinese translation
+
+  [Sven Werlen]
+  * Update german translation
+
+  [Hussein Abdallah]
+  * Update russian translation
+
+  [Maxime Chambreuil]
+  * Update spanish translation
+
+ -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>  Fri, 3 Apr 2009 18:29:15 -0500
+
+
+sflphone (0.9.4-rc1) SYSTEM; urgency=low
+
+  [ Emmanuel Milou ]
+  * Fix bug while trying to hold/unhold several simultaneous call
+  * Improve address book build system
+  * Implement SIP url popup on incoming call
+  * Improve GTK+ panel configuration
+  [ Julien Bonjean ]
+  * GTK+ client refactoring
+  * GTK+ clean up
+  * Address book improvment
+
+ -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>  Fri, 27 Mar 2009 18:29:15 -0500
+
+sflphone (0.9.4-0beta1) SYSTEM; urgency=low
+
+  [ Alexandre Savard ]
+  * Display codec used during conversation on the GUI
+  * Enable/disable STUN parameters at runtime
+  * Refactor search bar use
+  [ Emmanuel Milou ]
+  * Build system fixes
+  * Implement SIP re-invite
+  * Implement IP to IP call
+  [ Julien Bonjean ]
+  * Integrate GNOME address book based on evolution data server
+
+ -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>  Fri, 20 Mar 2009 18:29:15 -0500
+
+
+sflphone (0.9.3-0ubuntu3) SYSTEM; urgency=low
+
+  [ Alexandre Savard ]
+  * Both playback and record streams in PA_STREAM_CORKED (pulseaudio)
+  * Use PLUGHW device for ALSA capture
+  * Functional IAX and SIP recording for voicemail
+  * Use the less CPU-consuming interpolator algorithm for resampling
+  * Display in GTK GUI the codec used in conversation
+  * GTK GUI use ASCII instread of utf-8
+  * Add record menus in GTK GUI
+  * Put on hold when dialing a new number
+  * AccountID's are saved in the history
+
+  [ Emmanuel Milou ]
+  * Integrate DBUS C++, libiax2 in the git repository
+  * Update website
+  * Use libspeexdsp only if available on the system
+  * Updated .gitignore file
+
+  [Cyrille Béraud]
+  * Account assistant manager improvment
+  * Add an email request when creating a new account to receive voicemails
+
+ -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>  Sat, 14 Feb 2009 13:29:15 -0500
+
+sflphone (0.9.3-0ubuntu2) SYSTEM; urgency=low
+
+  [ Emmanuel Milou ]
+  * Add compilation note in README
+  * Use default ALSA plugin for capture
+  * Fix the ALSA capture problem one more time
+  * Clean up debug messages in dbus.c
+  * Add libspeexdsp dependency
+  * Remove implicit declaration compilation warnings
+  * Fix links in the website, add release note
+  * Change capture for the website front page
+  * Add alsa devel dependency in build-depends control file field
+  * Clean up, indentation, try to handle latency problems in iax/pulseaudio
+  * Remove pjsip generated files from the repo
+  * Use the previous declared curAlias function in accountwindow
+  * Fix bug in history call duration when the call fails
+  * Remove runtime warning in the GTK+ client
+  * Add librsvg2-common dependency to load SVG under KDE
+  * Refresh .gitignore
+  * Update locales files + french translation
+  * Add configuration panel for future noise reduction
+  * Add configuration panel for audio record module
+  * Daemon less verbose; accounts don't try to access STUn options anymore
+  * Fix typo in configwindow
+  * Add content in the official website
+  * use a GTK_STOCK icon for the record button
+  * Complete description text in the assistant manager
+  * Add libtool flags in client configure.ac
+  * Remove unuseful dependency (snd)
+  * Fix SIP transfer problems
+  * Remove previous version of PJSIP from the repo
+  * Upgrade PJSIP to version 1.0.1
+  * Add the new website source in the repository
+  * Use libspeexdsp for silence detection only if available
+
+  [ Loïc Faure-Lacroix ]
+  * Ajout du logo gpl3
+  * Ajout des images
+  * Ajout de la section screenshot pour le site
+  * Ajout du favicon dans le header
+  * Modification des cartes
+
+  [ Alexandre Savard ]
+  * Clean up <speex/libspeexdsp>
+  * Small cleanup
+  * Save Wave fixed
+  * Fix new call button when recording
+  * libspeexdsp added
+  * Recording: default home folder at startup
+  * Minor changes to config window
+  * IAX recording fixed
+  * Set / get recording path, still need some GTK for client
+  * AudioRecord file name format
+  * Now recording in HOME folder
+
+  [ Cyrille Béraud ]
+  * Fix bug in reqaccount.c
+
+  [ Maxime Chambreuil ]
+  * Update spanish translation
+
+  [Yun Liu ]
+  * Update chinese translation 
+
+  [ Hussein Abdallah ]
+  * Update russian translation
+
+ -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>  Sat, 14 Feb 2009 13:29:15 -0500
+
+sflphone (0.9.3-0ubuntu1) SYSTEM; urgency=low
+
+  * Remove debug
+  * Join thread before leaving
+  * Fix implicit declaration in reqaccount
+  * Add REST code to build the request to server
+  * Fix GValue initialization warnings
+  * Update version number, fix implicit declaration, fix GTK markup
+    warnings
+  * Apply patch to create custom SIP account from our own server
+
+ -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>  Fri, 06 Feb 2009 19:17:32 -0500
+
+sflphone (0.9.2-2ubuntu9) SYSTEM; urgency=low
+
+  [ Alexandre Savard ]
+  * Speex audio codec preprocessing initialization
+  * peer hung up segmentation fault solved
+  * Stop recording when transfering
+  * Terminate only one call
+  * Add isRecording() function
+  * Fix call_icon GTK client
+  * Fix SIPCallClose() function, recorded file now close properly
+  * Function terminateSIPCall added in sipvoiplink and managerimpl
+  * Fix thread destructor
+  * setRecordingOption function implement in audiorecord
+  * Record now implemented in Call class
+  * Record interface complete (on hold erase previous recording)
+  * Added recButton in client
+  * Added: record button related icons
+  * Record button added
+  * Overload AudioRecord::recData to get mic and speaker data mixed
+  * Recording now in audiortp::run() method
+  * Audio recording working in AudioRTP: receiveSessionForSpeaker
+  * Open/close a wave file when pulse audio stream start/stop
+
+  [ Emmanuel Milou ]
+  * Fix path for GTK+ icons; clean up
+
+ -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>  Thu, 05 Feb 2009 18:27:53 -0500
+
+sflphone (0.9.2-2ubuntu8) SYSTEM; urgency=low
+
+  [ Emmanuel Milou ]
+  * Update changelogs
+  * Fix bug in merge and in Makefile.am
+  * Terminate only one call
+  * Disable PJsip shutdown when changing STUN parameters
+  * Function terminateSIPCall added in sipvoiplink and managerimpl
+  * Add a timer to the alsa thread to not jam the CPU load
+  * Fix bug in sipvoiplink.cpp
+  * Clean shutdown of pulseaudio on quiting
+  * Fix DTMF at first start with Pulseaudio
+  * Remove zeroconf from the build system
+  * Add a library manager + exception handling
+  * Clean up in the working directory
+  * Better handling of capture XRUNs
+  * Restore mic adjust volume on ALSA layer
+  * Protect device ALSA operation if not opened
+  * Fix the switching layer bug
+  * Use dynamic_cast<> to use audiolayer-specific methods
+  * Open the audio devices only once at startup
+  * Refactoring of the ALSA part
+  * Functional plug-in manager
+  * Use a C++ thread to handle tones and DTMF in ALSA
+  * Restore IAXVoIPLink, restore Mutex
+  * Make the plugins registering against the plugin manager
+  * Migrate to 1->N relationship between voiplink and accounts
+  * API plugin for registration
+  * Use C++ thread in SIP, move everything in sipvoiplink
+  * Complete singleton pattern for the plugin manager
+  * Add -Wno-return-type compilation flag to remove warnings; Update
+    version number in configure.ac
+  * Add the dynamic loading for the plugin framework; integate unittest
+
+  [ Yun Liu ]
+  * Update rpm spec file
+  * modify build package script and spec file for suse
+
+  [ Alexandre Savard ]
+  * Add audiorecorder plugin and testaudiorecorder
+  * Add audio Recording class, edit global.h
+
+ -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>  Wed, 04 Feb 2009 14:00:30 -0500
+
+sflphone (0.9.2-2ubuntu7) SYSTEM; urgency=low
+
+  [ Emmanuel Milou ]
+  * Update changelog to 0.9.2-6
+  * Fix some dbus-glib implementation details on the client side
+  * Init history after dbus initialization
+  * Add error checking in useragent; Clean sipvoiplink
+  * Prevent crash when trying to call an empty number
+  * Set the volume of the playback stream to PA_VOLUME_NORM at startup
+  * Fix GTK+ generic value double initialization
+  * Fix jaunty control file dependency problems
+  * Fix jaunty control file dependency problems
+
+  [ Yun Liu ]
+  * Fix bug ticket # 137
+  * Tolerant to gsm library of OpenSuse 11
+
+  [ Sven Werlen ]
+  * Update german translation
+
+ -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>  Fri, 23 Jan 2009 17:48:13 -0500
+
+sflphone (0.9.2-2ubuntu6) SYSTEM; urgency=low
+
+  [ Emmanuel Milou ]
+  * Migrate STUN configuration to the main config window
+  * Update french translation
+  * Other tiny memory leaks
+  * Fix memory leak in sampleconverter.cpp
+  * Generate packages from the release branch
+  * update the build package script
+  * modify the control files with architecture=any
+  * Remove valgring uninitialized value
+  * IAX and SIP use the same global variables to set account
+    configuration ; fix broken code
+
+  [ Maxime Chambreuil ]
+  * Update spanish translation
+
+  [ Hussein Abdallah ]
+  * Update russian translation
+
+  [ Yun Liu ]
+  * Update translation files
+  * Fix the bug when user uncheck the account which fails in the
+    previous registration
+  * Add stun error status
+  * Fix bug ticket #143
+  * Script for auto-install dependencies
+  * Fix bug ticket #140
+  * Fix bug ticket 141
+  * Fix the reregister process when user change the details of an
+    account
+
+ -- Emmanuel Milou <manu@sulfur.inside.savoirfairelinux.net>  Fri, 16 Jan 2009 18:19:05 -0500
+
+sflphone (0.9.2-2ubuntu5) SYSTEM; urgency=low
+
+  * Fix memory leak in the pulseaudio callback
+  * Update debian package generation script
+  * Warnings removal in GTK+ client
+  * Clean adjust volume method in alsalayer
+  * Plug the sflphone playback volume control to the pulseaudio volume
+    manager
+  * Display the date in history according to the current locale
+  * Generate the changelog according to the git commit messages
+  * Complete header in chinese translation file
+  * Use the right gpg key to sign the packages
+  * add debian jaunty jackalope support
+
+ -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>  Wed, 14 Jan 2009 21:17:20 -0500
+
+sflphone (0.9.2-2ubuntu4) SYSTEM; urgency=low
+
+  [ Emmanuel Milou ]
+  * add german translation
+  
+  [ Yun Liu ]
+  * Fix GUI crash in Ubuntu8.10 64bit system
+  
+ -- Yun Liu <yun.liu@savoirfairelinux.com>  Thu, 08 Jan 2009 13:08:51 -0500
+
+sflphone (0.9.2-2ubuntu3) SYSTEM; urgency=low
+
+  [ Emmanuel Milou ]
+  * The main thread synchronizes the ringtone thread
+  * disable custom ringtone for the ALSA layer
+  * Fix the Makefile.am in man directory, add a SEE ALSO section
+  
+  [ Yun Liu ]
+  * Fix daemon crash caused by the previous patch ( for bug ticket #129)
+  
+ -- Yun Liu <yun.liu@savoirfairelinux.com>  Tue, 06 Jan 2009 16:18:38 -0500
+
+sflphone (0.9.2-2ubuntu2) SYSTEM; urgency=low
+  
+  * Fix bug ticket #129
+  
+ -- Yun Liu <yun.liu@savoirfairelinux.com>  Wed, 5 Jan 2009 15:54:53 -0500
+
+sflphone (0.9.2-2ubuntu1) SYSTEM; urgency=low
+
+  * Migrate from eXosip library to pjsip
+  * Add multiple SIP accounts support
+  * Fix ringtones problems
+  * Add a pulseaudio support
+  * Improve audio quality with ALSA
+  * Add chinese translation
+  * Improve spanish translation
+  * Migrate to a maintained C++ DBus bindings
+  * Clean and improve the build system
+  * Add build-dependency on Perl because we need pod2man to generate manpages
+
+ -- Yun Liu <yun.liu@savoirfairelinux.com>  Wed, 26 Nov 2008 09:47:53 -0500
+
+sflphone (0.9.1) unstable; urgency=low
+  * Add a search tool in the history
+  * Migrate some gtk_entry_new to sexy_icon_entry_new
+  * Bug fix (Ticket #78): The voicemail password isn't displayed anymore in
+    the history tab
+  * Add the SIP registration expire value in the user file.
+
+ -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>  Thu, 22 May 2008 11:14:25 -0500
+
+sflphone (0.9.0) unstable; urgency=low
+  * Add history features
+    * Call date
+    * Call duration
+    * Mouse events in the history tab
+  * Smooth switch from the history tab to the calls tab
+  * Remove most of GTK-Critical warnings
+
+ -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>  Wed, 13 May 2008 16:58:25 -0500
+
+sflphone (0.9-2008-06-06) unstable; urgency=low
+  * Audio bug correction: capture stopped after a few minutes of conversation
+  with USB Plantronics sound card
+
+ -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>  Tue, 06 May 2008 16:58:25 -0500
+
+sflphone (0.9-2008-05-06) unstable; urgency=low
+  * Bug correction: account creation with the assistant
+  * GTK+ warnings removal
+  * libnotify warnings removal
+  * Remove aliasing on the SFLphone logo
+  
+ -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>  Mon, 05 May 2008 16:58:25 -0500
+
+sflphone (0.9) unstable; urgency=low
+  * Clean dependencies ( removal of libboost )
+  * Several GTK improvement and updates
+    -account window
+    -configuration window
+  * Migrate from GtkCheckMenuItem to GtkImageMenuItem  
+  * ALSA standard I/O transfers: MMAP instead of R/W
+  * Fix speex audio quality
+  * IAX2 protocol
+    -Fix hold/unhold situation
+    -Add on hold music
+  * SIP protocol
+    -Ringtone on incoming call
+    -Fix transfer situation
+  * Add desktop notification ( libnotify )
+  * Improve the system tray icon behaviour
+  * Improve registration error handling
+  * Register/unregister from the account window takes effect without starting back SFLphone
+  * Compilation warnings removal
+  * Call history
+  * Add an account configuration wizard
+
+ -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>  Wed, 30 Apr 2008 16:58:25 -0500
+
+sflphone (0.8.2) unstable; urgency=low
+  * Internationalization of the GTK GUI
+  * English / French
+  * STUN support
+  * Slight modifications of the graphical interface ( tooltips, dialpad, ...)
+
+ -- Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>  Fri, 21 Mar 2008 11:37:53 -0500
diff --git a/sflphone-client-kde/debian/compat b/sflphone-client-kde/debian/compat
new file mode 100644
index 0000000000000000000000000000000000000000..7ed6ff82de6bcc2a78243fc9c54d3ef5ac14da69
--- /dev/null
+++ b/sflphone-client-kde/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/sflphone-client-kde/debian/control.intrepid b/sflphone-client-kde/debian/control.intrepid
new file mode 100644
index 0000000000000000000000000000000000000000..6ec3eedfde8b2e1836a95ce1fb40d29f2346a4b0
--- /dev/null
+++ b/sflphone-client-kde/debian/control.intrepid
@@ -0,0 +1,21 @@
+Source: sflphone-client-kde
+Maintainer: SavoirFaireLinux Inc <jeremy.quentin@savoirfairelinux.com>
+Section: kde
+Priority: optional
+Build-Depends: cmake (>=2.6), kdepimlibs5-dev (>=4.1.4), libcommoncpp2-dev (>=1.6.2)
+Standards-Version: 3.7.3
+
+Package: sflphone-client-kde
+Priority: optional
+Architecture: any
+Depends: sflphone-common (>=0.9.5), libcommoncpp2-1.6-0, kdepimlibs5 (>=4.1.4), libqt4-dbus (>=4.4.3), libqt4-svg (>=4.4.3), libqtgui4 (>=4.4.3)
+
+Replaces: sflphone
+Conflicts: sflphone
+Homepage: http://www.sflphone.org
+Description: KDE client for SFLphone
+ Provide a KDE client for SFLphone.
+ SFLphone is meant to be a robust enterprise-class desktop phone.
+ SFLphone is released under the GNU General Public License.
+ SFLphone is being developed by the global community, and maintained by
+ Savoir-faire Linux, a Montreal, Quebec, Canada-based Linux consulting company.
diff --git a/sflphone-client-kde/debian/control.jaunty b/sflphone-client-kde/debian/control.jaunty
new file mode 100644
index 0000000000000000000000000000000000000000..6ec3eedfde8b2e1836a95ce1fb40d29f2346a4b0
--- /dev/null
+++ b/sflphone-client-kde/debian/control.jaunty
@@ -0,0 +1,21 @@
+Source: sflphone-client-kde
+Maintainer: SavoirFaireLinux Inc <jeremy.quentin@savoirfairelinux.com>
+Section: kde
+Priority: optional
+Build-Depends: cmake (>=2.6), kdepimlibs5-dev (>=4.1.4), libcommoncpp2-dev (>=1.6.2)
+Standards-Version: 3.7.3
+
+Package: sflphone-client-kde
+Priority: optional
+Architecture: any
+Depends: sflphone-common (>=0.9.5), libcommoncpp2-1.6-0, kdepimlibs5 (>=4.1.4), libqt4-dbus (>=4.4.3), libqt4-svg (>=4.4.3), libqtgui4 (>=4.4.3)
+
+Replaces: sflphone
+Conflicts: sflphone
+Homepage: http://www.sflphone.org
+Description: KDE client for SFLphone
+ Provide a KDE client for SFLphone.
+ SFLphone is meant to be a robust enterprise-class desktop phone.
+ SFLphone is released under the GNU General Public License.
+ SFLphone is being developed by the global community, and maintained by
+ Savoir-faire Linux, a Montreal, Quebec, Canada-based Linux consulting company.
diff --git a/sflphone-client-kde/debian/copyright b/sflphone-client-kde/debian/copyright
new file mode 100644
index 0000000000000000000000000000000000000000..fbde2314bef1fb7ee643083e6d27c397213c5ead
--- /dev/null
+++ b/sflphone-client-kde/debian/copyright
@@ -0,0 +1,28 @@
+This package was debianized by Emmanuel Milou <emmanuel.milou@savoirfairelinux.com> on
+Fri, 3 Apr 2009 09:47:53 -0500.
+
+It was downloaded from the git repository of SFLphone: git://sflphone.org/git/sflphone.git
+
+Upstream Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
+
+Copyright:
+
+Savoir-Faire Linux Inc.
+
+License:
+
+This software is copyright (c) 2004-2009 Savoir-Faire Linux inc.
+
+You are free to distribute this software under the terms of
+the GNU General Public License version 3.
+On Debian systems, the complete text of the GNU General Public
+License can be found in the file `/usr/share/common-licenses/GPL'.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklyn St, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/sflphone-client-kde/debian/cron.d b/sflphone-client-kde/debian/cron.d
new file mode 100644
index 0000000000000000000000000000000000000000..d11e61177739b56bce3aac6de6483b48e797a258
--- /dev/null
+++ b/sflphone-client-kde/debian/cron.d
@@ -0,0 +1,4 @@
+#
+# Regular cron jobs for the sflphone package
+#
+0 4	* * *	root	sflphone_maintenance
diff --git a/sflphone-client-kde/debian/dirs b/sflphone-client-kde/debian/dirs
new file mode 100644
index 0000000000000000000000000000000000000000..e2dc98dcb24907fb5a7ceb0f0651276b702d6030
--- /dev/null
+++ b/sflphone-client-kde/debian/dirs
@@ -0,0 +1,7 @@
+usr/bin
+usr/share/applications
+usr/share/pixmaps
+usr/share/sflphone
+usr/share/locale
+usr/share/doc
+usr/share/man
diff --git a/sflphone-client-kde/debian/docs b/sflphone-client-kde/debian/docs
new file mode 100644
index 0000000000000000000000000000000000000000..9830da213fdb4baf4d68538e8c8e490248e209e1
--- /dev/null
+++ b/sflphone-client-kde/debian/docs
@@ -0,0 +1,5 @@
+NEWS
+README
+ChangeLog
+AUTHORS
+
diff --git a/sflphone-client-kde/debian/manpages b/sflphone-client-kde/debian/manpages
new file mode 100644
index 0000000000000000000000000000000000000000..f070887d4e37fdd036f31f26e6e8f46d646d8b4e
--- /dev/null
+++ b/sflphone-client-kde/debian/manpages
@@ -0,0 +1,2 @@
+debian/sflphone-client-gnome/usr/share/man/man1/sflphone.1
+debian/sflphone-client-gnome/usr/share/man/man1/sflphone-client-gnome.1
diff --git a/sflphone-client-kde/debian/postinst b/sflphone-client-kde/debian/postinst
new file mode 100644
index 0000000000000000000000000000000000000000..ebee7fa2bb049bf0e6f826e28569d05cb51d451a
--- /dev/null
+++ b/sflphone-client-kde/debian/postinst
@@ -0,0 +1,7 @@
+#!/bin/sh -e
+
+update-alternatives --install /usr/bin/sflphone sflphone /usr/bin/sflphone-client-gnome 100 \
+                    --slave /usr/share/man/man1/sflphone.1.gz sflphone.1.gz \
+                            /usr/share/man/man1/sflphone-client-gnome.1.gz
+
+exit 0
diff --git a/sflphone-client-kde/debian/postrm b/sflphone-client-kde/debian/postrm
new file mode 100644
index 0000000000000000000000000000000000000000..70be710bd108ddadbfa790f9ac8795984cc139f8
--- /dev/null
+++ b/sflphone-client-kde/debian/postrm
@@ -0,0 +1,36 @@
+#!/bin/sh
+# postrm script for sflphone
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <overwriter>
+#          <overwriter-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+if [ "$1" = "purge" ]
+then
+
+  # remove the user config file
+  rm -f $HOME/.sflphone/sflphonedrc
+
+fi
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
diff --git a/sflphone-client-kde/debian/preinst b/sflphone-client-kde/debian/preinst
new file mode 100644
index 0000000000000000000000000000000000000000..ab8a90ca579f3b7038e8262b6fe5bede8a85fed0
--- /dev/null
+++ b/sflphone-client-kde/debian/preinst
@@ -0,0 +1,19 @@
+#!/bin/sh
+# postrm script for sflphone
+#
+# see: dh_installdeb(1)
+
+set -e
+
+package=sflphone-client-gnome
+
+case "$1" in
+    install|upgrade)
+        ## Clean up the previous manpage
+        if [ -f /usr/share/man/man1/sflphone-gtk.1 ]; then
+            rm /usr/share/man/man1/sflphone-gtk.1
+        fi
+    ;;
+esac
+
+exit 0
diff --git a/sflphone-client-kde/debian/prerm b/sflphone-client-kde/debian/prerm
new file mode 100644
index 0000000000000000000000000000000000000000..5e9021706875bb08a56c8c54f35cef96a7ca6055
--- /dev/null
+++ b/sflphone-client-kde/debian/prerm
@@ -0,0 +1,7 @@
+#!/bin/sh -e
+
+
+if [ "$1" = "remove" ]; then
+    # Remove alternatives symlink set in postinst
+    update-alternatives --remove sflphone /usr/bin/sflphone
+fi
diff --git a/sflphone-client-kde/debian/rules b/sflphone-client-kde/debian/rules
new file mode 100755
index 0000000000000000000000000000000000000000..d9d0eec8174d309214debaaad95eadc83953a72f
--- /dev/null
+++ b/sflphone-client-kde/debian/rules
@@ -0,0 +1,117 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+export DH_OPTIONS
+
+package=sflphone-client-gnome
+
+CXX = g++-4.0
+CFLAGS = -Wall -g
+DEB_INSTALL_MANPAGES_sflphone_client_gnome = sflphone.1 sflphone-client-gnome.1
+
+configure: configure-stamp
+configure-stamp:
+	dh_testdir
+	# Add here commands to configure the package.
+	./autogen.sh --prefix=/usr
+	touch configure-stamp
+
+
+#Architecture 
+build: build-arch build-indep
+
+build-arch: build-arch-stamp
+build-arch-stamp: configure-stamp 
+
+    # Add here commands to compile the arch part of the package.
+	$(MAKE) 
+	touch $@
+
+build-indep: build-indep-stamp
+build-indep-stamp: configure-stamp 
+
+       # Add here commands to compile the indep part of the package.
+       #$(MAKE) doc
+	touch $@
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-arch-stamp build-indep-stamp configure-stamp
+	# Add here commands to clean up after the build process.
+	[ ! -f Makefile ] || $(MAKE) distclean 
+
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+	cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+	cp -f /usr/share/misc/config.guess config.guess
+endif
+	dh_clean 
+
+install: install-indep install-arch
+install-indep:
+	dh_testdir
+	dh_testroot
+	dh_clean -k -i 
+	dh_installdirs -i
+	# Add here commands to install the package into debian/sflphone.
+
+install-arch:
+	dh_testdir
+	dh_testroot
+	dh_clean -k -s 
+	dh_installdirs -s
+	# Add here commands to install the arch part of the package into 
+	# debian/tmp.
+	$(MAKE) prefix=$(CURDIR)/debian/$(package)/usr install
+	rm -rf $(CURDIR)/debian/$(package)/usr/include
+	dh_install -s
+# Must not depend on anything. This is to be called by
+# binary-arch/binary-indep
+# in another 'make' thread.
+
+binary-common:
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs ChangeLog
+	dh_installdocs
+	dh_installexamples
+#	dh_installmenu
+#	dh_installdebconf	
+#	dh_installlogrotate	
+#	dh_installemacsen
+#	dh_installpam
+#	dh_installmime
+#	dh_python
+#	dh_installinit
+#	dh_installcron
+#	dh_installinfo
+	dh_installman
+	dh_link
+	dh_strip
+	dh_compress 
+	dh_fixperms
+#	dh_perl
+	dh_makeshlibs
+	dh_installdeb
+#	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+# Build architecture independant packages using the common target.
+binary-indep: build-indep install-indep
+	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+
+# Build architecture dependant packages using the common target.
+binary-arch: build-arch install-arch
+	$(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
+
+binary: binary-arch binary-indep
+.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure
diff --git a/sflphone_kde/icons/accept.svg b/sflphone-client-kde/icons/accept.svg
similarity index 100%
rename from sflphone_kde/icons/accept.svg
rename to sflphone-client-kde/icons/accept.svg
diff --git a/sflphone_kde/icons/add.png b/sflphone-client-kde/icons/add.png
similarity index 100%
rename from sflphone_kde/icons/add.png
rename to sflphone-client-kde/icons/add.png
diff --git a/sflphone_kde/icons/application-exit.png b/sflphone-client-kde/icons/application-exit.png
similarity index 100%
rename from sflphone_kde/icons/application-exit.png
rename to sflphone-client-kde/icons/application-exit.png
diff --git a/sflphone_kde/icons/busy.svg b/sflphone-client-kde/icons/busy.svg
similarity index 100%
rename from sflphone_kde/icons/busy.svg
rename to sflphone-client-kde/icons/busy.svg
diff --git a/sflphone_kde/icons/call.svg b/sflphone-client-kde/icons/call.svg
similarity index 100%
rename from sflphone_kde/icons/call.svg
rename to sflphone-client-kde/icons/call.svg
diff --git a/sflphone_kde/icons/current.svg b/sflphone-client-kde/icons/current.svg
similarity index 100%
rename from sflphone_kde/icons/current.svg
rename to sflphone-client-kde/icons/current.svg
diff --git a/sflphone_kde/icons/del_off.png b/sflphone-client-kde/icons/del_off.png
similarity index 100%
rename from sflphone_kde/icons/del_off.png
rename to sflphone-client-kde/icons/del_off.png
diff --git a/sflphone_kde/icons/del_on.png b/sflphone-client-kde/icons/del_on.png
similarity index 100%
rename from sflphone_kde/icons/del_on.png
rename to sflphone-client-kde/icons/del_on.png
diff --git a/sflphone_kde/icons/dial.svg b/sflphone-client-kde/icons/dial.svg
similarity index 100%
rename from sflphone_kde/icons/dial.svg
rename to sflphone-client-kde/icons/dial.svg
diff --git a/sflphone_kde/icons/fail.svg b/sflphone-client-kde/icons/fail.svg
similarity index 100%
rename from sflphone_kde/icons/fail.svg
rename to sflphone-client-kde/icons/fail.svg
diff --git a/sflphone_kde/icons/hang_up.svg b/sflphone-client-kde/icons/hang_up.svg
similarity index 100%
rename from sflphone_kde/icons/hang_up.svg
rename to sflphone-client-kde/icons/hang_up.svg
diff --git a/sflphone_kde/icons/history.svg b/sflphone-client-kde/icons/history.svg
similarity index 100%
rename from sflphone_kde/icons/history.svg
rename to sflphone-client-kde/icons/history.svg
diff --git a/sflphone_kde/icons/history2.svg b/sflphone-client-kde/icons/history2.svg
similarity index 100%
rename from sflphone_kde/icons/history2.svg
rename to sflphone-client-kde/icons/history2.svg
diff --git a/sflphone_kde/icons/hold.svg b/sflphone-client-kde/icons/hold.svg
similarity index 100%
rename from sflphone_kde/icons/hold.svg
rename to sflphone-client-kde/icons/hold.svg
diff --git a/sflphone_kde/icons/icon_accept.svg b/sflphone-client-kde/icons/icon_accept.svg
similarity index 100%
rename from sflphone_kde/icons/icon_accept.svg
rename to sflphone-client-kde/icons/icon_accept.svg
diff --git a/sflphone_kde/icons/icon_call.svg b/sflphone-client-kde/icons/icon_call.svg
similarity index 100%
rename from sflphone_kde/icons/icon_call.svg
rename to sflphone-client-kde/icons/icon_call.svg
diff --git a/sflphone_kde/icons/icon_dialpad.svg b/sflphone-client-kde/icons/icon_dialpad.svg
similarity index 100%
rename from sflphone_kde/icons/icon_dialpad.svg
rename to sflphone-client-kde/icons/icon_dialpad.svg
diff --git a/sflphone_kde/icons/icon_dialpad_off.svg b/sflphone-client-kde/icons/icon_dialpad_off.svg
similarity index 100%
rename from sflphone_kde/icons/icon_dialpad_off.svg
rename to sflphone-client-kde/icons/icon_dialpad_off.svg
diff --git a/sflphone_kde/icons/icon_hangup.svg b/sflphone-client-kde/icons/icon_hangup.svg
similarity index 100%
rename from sflphone_kde/icons/icon_hangup.svg
rename to sflphone-client-kde/icons/icon_hangup.svg
diff --git a/sflphone_kde/icons/icon_hold.svg b/sflphone-client-kde/icons/icon_hold.svg
similarity index 100%
rename from sflphone_kde/icons/icon_hold.svg
rename to sflphone-client-kde/icons/icon_hold.svg
diff --git a/sflphone_kde/icons/icon_rec.svg b/sflphone-client-kde/icons/icon_rec.svg
similarity index 100%
rename from sflphone_kde/icons/icon_rec.svg
rename to sflphone-client-kde/icons/icon_rec.svg
diff --git a/sflphone_kde/icons/icon_unhold.svg b/sflphone-client-kde/icons/icon_unhold.svg
similarity index 100%
rename from sflphone_kde/icons/icon_unhold.svg
rename to sflphone-client-kde/icons/icon_unhold.svg
diff --git a/sflphone_kde/icons/icon_volume.svg b/sflphone-client-kde/icons/icon_volume.svg
similarity index 100%
rename from sflphone_kde/icons/icon_volume.svg
rename to sflphone-client-kde/icons/icon_volume.svg
diff --git a/sflphone_kde/icons/icon_volume_off.svg b/sflphone-client-kde/icons/icon_volume_off.svg
similarity index 100%
rename from sflphone_kde/icons/icon_volume_off.svg
rename to sflphone-client-kde/icons/icon_volume_off.svg
diff --git a/sflphone_kde/icons/incoming.svg b/sflphone-client-kde/icons/incoming.svg
similarity index 100%
rename from sflphone_kde/icons/incoming.svg
rename to sflphone-client-kde/icons/incoming.svg
diff --git a/sflphone_kde/icons/mailbox.svg b/sflphone-client-kde/icons/mailbox.svg
similarity index 100%
rename from sflphone_kde/icons/mailbox.svg
rename to sflphone-client-kde/icons/mailbox.svg
diff --git a/sflphone_kde/icons/mic.svg b/sflphone-client-kde/icons/mic.svg
similarity index 100%
rename from sflphone_kde/icons/mic.svg
rename to sflphone-client-kde/icons/mic.svg
diff --git a/sflphone_kde/icons/mic_25.svg b/sflphone-client-kde/icons/mic_25.svg
similarity index 100%
rename from sflphone_kde/icons/mic_25.svg
rename to sflphone-client-kde/icons/mic_25.svg
diff --git a/sflphone_kde/icons/mic_50.svg b/sflphone-client-kde/icons/mic_50.svg
similarity index 100%
rename from sflphone_kde/icons/mic_50.svg
rename to sflphone-client-kde/icons/mic_50.svg
diff --git a/sflphone_kde/icons/mic_75.svg b/sflphone-client-kde/icons/mic_75.svg
similarity index 100%
rename from sflphone_kde/icons/mic_75.svg
rename to sflphone-client-kde/icons/mic_75.svg
diff --git a/sflphone_kde/icons/missed.svg b/sflphone-client-kde/icons/missed.svg
similarity index 100%
rename from sflphone_kde/icons/missed.svg
rename to sflphone-client-kde/icons/missed.svg
diff --git a/sflphone_kde/icons/office-address-book.png b/sflphone-client-kde/icons/office-address-book.png
similarity index 100%
rename from sflphone_kde/icons/office-address-book.png
rename to sflphone-client-kde/icons/office-address-book.png
diff --git a/sflphone_kde/icons/outgoing.svg b/sflphone-client-kde/icons/outgoing.svg
similarity index 100%
rename from sflphone_kde/icons/outgoing.svg
rename to sflphone-client-kde/icons/outgoing.svg
diff --git a/sflphone_kde/icons/rec_call.svg b/sflphone-client-kde/icons/rec_call.svg
similarity index 100%
rename from sflphone_kde/icons/rec_call.svg
rename to sflphone-client-kde/icons/rec_call.svg
diff --git a/sflphone_kde/icons/record.svg b/sflphone-client-kde/icons/record.svg
similarity index 100%
rename from sflphone_kde/icons/record.svg
rename to sflphone-client-kde/icons/record.svg
diff --git a/sflphone_kde/icons/refuse.svg b/sflphone-client-kde/icons/refuse.svg
similarity index 100%
rename from sflphone_kde/icons/refuse.svg
rename to sflphone-client-kde/icons/refuse.svg
diff --git a/sflphone_kde/icons/remove.png b/sflphone-client-kde/icons/remove.png
similarity index 100%
rename from sflphone_kde/icons/remove.png
rename to sflphone-client-kde/icons/remove.png
diff --git a/sflphone_kde/icons/ring.svg b/sflphone-client-kde/icons/ring.svg
similarity index 100%
rename from sflphone_kde/icons/ring.svg
rename to sflphone-client-kde/icons/ring.svg
diff --git a/sflphone_kde/icons/sflphone.png b/sflphone-client-kde/icons/sflphone.png
similarity index 100%
rename from sflphone_kde/icons/sflphone.png
rename to sflphone-client-kde/icons/sflphone.png
diff --git a/sflphone_kde/icons/speaker.svg b/sflphone-client-kde/icons/speaker.svg
similarity index 100%
rename from sflphone_kde/icons/speaker.svg
rename to sflphone-client-kde/icons/speaker.svg
diff --git a/sflphone_kde/icons/speaker_25.svg b/sflphone-client-kde/icons/speaker_25.svg
similarity index 100%
rename from sflphone_kde/icons/speaker_25.svg
rename to sflphone-client-kde/icons/speaker_25.svg
diff --git a/sflphone_kde/icons/speaker_50.svg b/sflphone-client-kde/icons/speaker_50.svg
similarity index 100%
rename from sflphone_kde/icons/speaker_50.svg
rename to sflphone-client-kde/icons/speaker_50.svg
diff --git a/sflphone_kde/icons/speaker_75.svg b/sflphone-client-kde/icons/speaker_75.svg
similarity index 100%
rename from sflphone_kde/icons/speaker_75.svg
rename to sflphone-client-kde/icons/speaker_75.svg
diff --git a/sflphone_kde/icons/stock_person.svg b/sflphone-client-kde/icons/stock_person.svg
similarity index 100%
rename from sflphone_kde/icons/stock_person.svg
rename to sflphone-client-kde/icons/stock_person.svg
diff --git a/sflphone_kde/icons/transfert.svg b/sflphone-client-kde/icons/transfert.svg
similarity index 100%
rename from sflphone_kde/icons/transfert.svg
rename to sflphone-client-kde/icons/transfert.svg
diff --git a/sflphone_kde/icons/unhold.svg b/sflphone-client-kde/icons/unhold.svg
similarity index 100%
rename from sflphone_kde/icons/unhold.svg
rename to sflphone-client-kde/icons/unhold.svg
diff --git a/sflphone_kde/icons/x-office-address-book.png b/sflphone-client-kde/icons/x-office-address-book.png
similarity index 100%
rename from sflphone_kde/icons/x-office-address-book.png
rename to sflphone-client-kde/icons/x-office-address-book.png
diff --git a/sflphone_kde/install.sh b/sflphone-client-kde/install.sh
similarity index 100%
rename from sflphone_kde/install.sh
rename to sflphone-client-kde/install.sh
diff --git a/sflphone_kde/instance_interface_singleton.cpp b/sflphone-client-kde/instance_interface_singleton.cpp
similarity index 100%
rename from sflphone_kde/instance_interface_singleton.cpp
rename to sflphone-client-kde/instance_interface_singleton.cpp
diff --git a/sflphone_kde/instance_interface_singleton.h b/sflphone-client-kde/instance_interface_singleton.h
similarity index 100%
rename from sflphone_kde/instance_interface_singleton.h
rename to sflphone-client-kde/instance_interface_singleton.h
diff --git a/sflphone_kde/main.cpp b/sflphone-client-kde/main.cpp
similarity index 79%
rename from sflphone_kde/main.cpp
rename to sflphone-client-kde/main.cpp
index a2812d0637bd9f814701c4cdbf76afac8377492a..9603e57581fa414a986b9f1ea85763b4f6a93734 100644
--- a/sflphone_kde/main.cpp
+++ b/sflphone-client-kde/main.cpp
@@ -16,7 +16,7 @@
 
 static const char description[] = I18N_NOOP("A KDE 4 Client for SflPhone");
 
-static const char version[] = "0.1";
+static const char version[] = "0.9.5";
 
 int main(int argc, char **argv)
 {
@@ -42,9 +42,9 @@ int main(int argc, char **argv)
 		instance.Register(getpid(), APP_NAME);
 		
 		KAboutData about(
-		   "sflphone_kde", 
+		   "sflphone-client-kde", 
 		   0, 
-		   ki18n("sflphone_kde"), 
+		   ki18n("sflphone-client-kde"), 
 		   version, 
 		   ki18n(description),
 		   KAboutData::License_GPL, 
@@ -67,19 +67,7 @@ int main(int argc, char **argv)
 		QTranslator translator;
 		translator.load(QString("config_") + locale);
 		app.installTranslator(&translator);
-	
-	/*
-		QApplication app(argc,argv);
-		//
-		QMainWindow * fenetre = new QMainWindow();
-		QMenu * menu = new QMenu("menubb",0);
-		fenetre->menuBar()->addMenu(menu);
-		//QMenu * menu = fenetre->menuBar()->addMenu("menu");
-		QAction * action = new QAction("actioncc", 0);
-		action->setText("actionbb");
-		menu->addAction(action);
-		//fenetre->menuBar()->addMenu("menu");
-*/
+
 		fenetre->move(QCursor::pos().x() - fenetre->geometry().width()/2, QCursor::pos().y() - fenetre->geometry().height()/2);
 		fenetre->show();
 	
diff --git a/sflphone_kde/metatypes.h b/sflphone-client-kde/metatypes.h
similarity index 100%
rename from sflphone_kde/metatypes.h
rename to sflphone-client-kde/metatypes.h
diff --git a/sflphone_kde/resources.qrc b/sflphone-client-kde/resources.qrc
similarity index 100%
rename from sflphone_kde/resources.qrc
rename to sflphone-client-kde/resources.qrc
diff --git a/sflphone_kde/sflphone_kde.desktop b/sflphone-client-kde/sflphone-client-kde.desktop
similarity index 96%
rename from sflphone_kde/sflphone_kde.desktop
rename to sflphone-client-kde/sflphone-client-kde.desktop
index 3f3f7f90cde843015abbb478b65dc2dfbdca2e79..7ab681f99dfb0c75e1f933798b6cc4d2e72f6d3e 100644
--- a/sflphone_kde/sflphone_kde.desktop
+++ b/sflphone-client-kde/sflphone-client-kde.desktop
@@ -6,7 +6,7 @@
 # Exec=kapp4 %i -caption "%c"
 # Icon=kapp4
 Type=Application
-X-DocPath=kapp4/kapp4.html
+X-DocPath=sflphone-client-kde/index.html
 # GenericName=A KDE4 Application
 # GenericName[ca]=Una aplicació del KDE4
 # GenericName[da]=Et KDE4-program
diff --git a/sflphone_kde/sflphone_kde.kdevelop b/sflphone-client-kde/sflphone-client-kde.kdevelop
similarity index 93%
rename from sflphone_kde/sflphone_kde.kdevelop
rename to sflphone-client-kde/sflphone-client-kde.kdevelop
index 9a26c0b469c05ca7f18acc6c4118bfc96ab3c24b..dd9f14844816ba05707a62a31a33fc265ac1373b 100644
--- a/sflphone_kde/sflphone_kde.kdevelop
+++ b/sflphone-client-kde/sflphone-client-kde.kdevelop
@@ -12,7 +12,7 @@
       <keyword>Qt</keyword>
       <keyword>KDE</keyword>
     </keywords>
-    <projectname>sflphone_kde</projectname>
+    <projectname>sflphone-client-kde</projectname>
     <projectdirectory>.</projectdirectory>
     <absoluteprojectpath>false</absoluteprojectpath>
     <description/>
@@ -121,7 +121,7 @@
   </cppsupportpart>
   <kdevcustomproject>
     <run>
-      <mainprogram>/home/jquentin/sflphone/sflphone_kde/build</mainprogram>
+      <mainprogram>/home/jquentin/sflphone/sflphone-client-kde/build</mainprogram>
       <programargs/>
       <terminal>false</terminal>
       <autocompile>false</autocompile>
@@ -140,12 +140,12 @@
       <autokdesu>false</autokdesu>
       <globaldebugarguments/>
       <useglobalprogram>false</useglobalprogram>
-      <globalcwd>/home/jquentin/sflphone/sflphone_kde</globalcwd>
+      <globalcwd>/home/jquentin/sflphone/sflphone-client-kde</globalcwd>
       <directoryradio>executable</directoryradio>
     </run>
     <build>
       <buildtool>make</buildtool>
-      <builddir>/home/jquentin/sflphone/sflphone_kde/build</builddir>
+      <builddir>/home/jquentin/sflphone/sflphone-client-kde/build</builddir>
     </build>
     <make>
       <abortonerror>false</abortonerror>
@@ -192,9 +192,7 @@
         <default/>
       </environments>
     </other>
-    <blacklist>
-      <path>build</path>
-    </blacklist>
+    <blacklist/>
   </kdevcustomproject>
   <kdevcppsupport>
     <qt>
@@ -254,20 +252,20 @@
   <kdevdocumentation>
     <projectdoc>
       <docsystem>Doxygen Documentation Collection</docsystem>
-      <docurl>sflphone_kde.tag</docurl>
+      <docurl>sflphone-client-kde.tag</docurl>
     </projectdoc>
   </kdevdocumentation>
   <substmap>
-    <APPNAME>sflphone_kde</APPNAME>
-    <APPNAMELC>sflphone_kde</APPNAMELC>
-    <APPNAMESC>Sflphone_kde</APPNAMESC>
-    <APPNAMEUC>SFLPHONE_KDE</APPNAMEUC>
+    <APPNAME>sflphone-client-kde</APPNAME>
+    <APPNAMELC>sflphone-client-kde</APPNAMELC>
+    <APPNAMESC>Sflphone-client-kde</APPNAMESC>
+    <APPNAMEUC>SFLPHONE-CLIENT-KDE</APPNAMEUC>
     <AUTHOR>Jérémy Quentin</AUTHOR>
     <EMAIL>jeremy.quentin@gmail.com</EMAIL>
     <LICENSE>GPL</LICENSE>
     <LICENSEFILE>COPYING</LICENSEFILE>
     <VERSION>0.1</VERSION>
     <YEAR>2009</YEAR>
-    <dest>/home/jquentin/sflphone/sflphone_kde</dest>
+    <dest>/home/jquentin/sflphone/sflphone-client-kde</dest>
   </substmap>
 </kdevelop>
diff --git a/sflphone_kde/sflphone_kdeui.rc b/sflphone-client-kde/sflphone-client-kdeui.rc
similarity index 100%
rename from sflphone_kde/sflphone_kdeui.rc
rename to sflphone-client-kde/sflphone-client-kdeui.rc
diff --git a/sflphone_kde/sflphone_const.h b/sflphone-client-kde/sflphone_const.h
similarity index 100%
rename from sflphone_kde/sflphone_const.h
rename to sflphone-client-kde/sflphone_const.h
diff --git a/sflphone_kde/sflphone_kdeview.cpp b/sflphone-client-kde/sflphone_kdeview.cpp
similarity index 98%
rename from sflphone_kde/sflphone_kdeview.cpp
rename to sflphone-client-kde/sflphone_kdeview.cpp
index 4f488b5544c6e57cfc85160f6e7ca418af7117b8..c080eebce9c07c9e7d333f02ceb6772df9417df4 100644
--- a/sflphone_kde/sflphone_kdeview.cpp
+++ b/sflphone-client-kde/sflphone_kdeview.cpp
@@ -48,6 +48,7 @@ using namespace KABC;
 ConfigurationDialog * sflphone_kdeView::configDialog;
 
 sflphone_kdeView::sflphone_kdeView(QWidget *parent)
+	: QWidget(parent)
 {
 	setupUi(this);
 	
@@ -86,8 +87,6 @@ sflphone_kdeView::~sflphone_kdeView()
 	delete wizard;
 	delete callList;
 	delete errorWindow;
-// 	InstanceInterface & instance = InstanceInterfaceSingleton::getInstance();
-// 	instance.Unregister(getpid());
 }
 
 
@@ -112,7 +111,12 @@ void sflphone_kdeView::loadWindow()
 
 QString sflphone_kdeView::firstAccountId()
 {
-	return getAccountList()->firstRegisteredAccount()->getAccountId();
+	Account * firstAccount = getAccountList()->firstRegisteredAccount();
+	if(firstAccount == NULL)
+	{
+		return QString();
+	}
+	return firstAccount->getAccountId();
 }
 
 QVector<Account *> sflphone_kdeView::registeredAccounts()
@@ -383,13 +387,12 @@ void sflphone_kdeView::action(QListWidgetItem * item, call_action action)
 
 void sflphone_kdeView::updateCallItem(Call * call)
 {
-	QListWidgetItem * item = call->getItem();
 	call_state state = call->getState();
 	if(state == CALL_STATE_OVER)
 	{
+		QListWidgetItem * item = call->getItem();
 		qDebug() << "Updating call with CALL_STATE_OVER. Deleting item " << (*callList)[item]->getCallId();
 		listWidget_callList->takeItem(listWidget_callList->row(item));
-		addCallToCallHistory(call);
 	}
 }
 
@@ -1248,19 +1251,12 @@ void sflphone_kdeView::on_action_mailBox_triggered()
 {
 	ConfigurationManagerInterface & configurationManager = ConfigurationManagerInterfaceSingleton::getInstance();
 	QString account = firstAccountId();
-	if(account.isEmpty())
-	{
-		errorWindow->showMessage("No account registered!");
-	}
-	else
-	{
 		QString mailBoxNumber = configurationManager.getAccountDetails(account).value()[ACCOUNT_MAILBOX];
 		Call * call = callList->addDialingCall();
 		call->appendItemText(mailBoxNumber);
 		addCallToCallList(call);
 		listWidget_callList->setCurrentRow(listWidget_callList->count() - 1);
 		actionb(call, CALL_ACTION_ACCEPT);
-	}
 }
 
 void sflphone_kdeView::on1_callStateChanged(const QString &callID, const QString &state)
@@ -1293,10 +1289,10 @@ void sflphone_kdeView::on1_error(MapStringString details)
 	qDebug() << "Signal : Daemon error : " << details;
 }
 
-void sflphone_kdeView::on1_incomingCall(const QString &accountID, const QString & callID/*, const QString &from*/)
+void sflphone_kdeView::on1_incomingCall(const QString &accountID, const QString & callID)
 {
 	qDebug() << "Signal : Incoming Call !";
-	Call * call = callList->addIncomingCall(callID/*, from, accountID*/);
+	Call * call = callList->addIncomingCall(callID);
 	addCallToCallList(call);
 	listWidget_callList->setCurrentRow(listWidget_callList->count() - 1);
 }
diff --git a/sflphone_kde/sflphone_kdeview.h b/sflphone-client-kde/sflphone_kdeview.h
similarity index 98%
rename from sflphone_kde/sflphone_kdeview.h
rename to sflphone-client-kde/sflphone_kdeview.h
index 0ea615965fa5b2668b9375b08b5c19138550d158..736cdd947e7bc744b1ed41e25c46ead443332a23 100644
--- a/sflphone_kde/sflphone_kdeview.h
+++ b/sflphone-client-kde/sflphone_kdeview.h
@@ -42,7 +42,7 @@
 class QPainter;
 class ConfigurationDialog;
 /**
- * This is the main view class for sflphone_kde.  Most of the non-menu,
+ * This is the main view class for sflphone-client-kde.  Most of the non-menu,
  * non-toolbar, and non-statusbar (e.g., non frame) GUI code should go
  * here.
  *
diff --git a/sflphone_kde/sflphone_kdeview_base.ui b/sflphone-client-kde/sflphone_kdeview_base.ui
similarity index 100%
rename from sflphone_kde/sflphone_kdeview_base.ui
rename to sflphone-client-kde/sflphone_kdeview_base.ui
diff --git a/sflphone_kde/templates/cpp b/sflphone-client-kde/templates/cpp
similarity index 100%
rename from sflphone_kde/templates/cpp
rename to sflphone-client-kde/templates/cpp
diff --git a/sflphone_kde/templates/h b/sflphone-client-kde/templates/h
similarity index 100%
rename from sflphone_kde/templates/h
rename to sflphone-client-kde/templates/h
diff --git a/sflphone_kde/callmanager-introspec.xml b/sflphone_kde/callmanager-introspec.xml
deleted file mode 100644
index e4b2f72c9b7965b75e867dc2206a54826068302b..0000000000000000000000000000000000000000
--- a/sflphone_kde/callmanager-introspec.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" ?>
-<node name="/org/sflphone/SFLphone">
-  <interface name="org.sflphone.SFLphone.CallManager">
-  
-	 <!--        /////////////////////////////       -->
-	 <!--                 Methods                    -->
-	 <!--        /////////////////////////////       -->
-	  
-    <method name="placeCall">
-      <arg type="s" name="accountID" direction="in"/>
-      <arg type="s" name="callID" direction="in"/>
-      <arg type="s" name="to" direction="in"/>
-    </method>
-    
-    <method name="refuse">
-      <arg type="s" name="callID" direction="in"/>
-    </method>
-    
-    <method name="accept">
-      <arg type="s" name="callID" direction="in"/>
-    </method>
-    
-    <method name="hangUp">
-      <arg type="s" name="callID" direction="in"/>
-    </method>
-    
-    <method name="hold">
-      <arg type="s" name="callID" direction="in"/>
-    </method>
-    
-    <method name="unhold">
-      <arg type="s" name="callID" direction="in"/>
-    </method>
-    
-    <method name="transfert">
-      <arg type="s" name="callID" direction="in"/>
-      <arg type="s" name="to" direction="in"/>
-    </method>
-    
-    <method name="playDTMF">
-      <arg type="s" name="key" direction="in"/>
-    </method>
-    
-    <method name="startTone">
-      <arg type="i" name="start" direction="in"/>
-      <arg type="i" name="type" direction="in"/>
-    </method>
-
-    <method name="setVolume">
-      <arg type="s" name="device" direction="in"/>
-      <arg type="d" name="value" direction="in"/>
-    </method>
-    
-    <method name="getVolume">
-      <arg type="s" name="device" direction="in"/>
-      <arg type="d" name="value" direction="out"/>
-    </method>
-    
-    <method name="getIsRecording">
-      <arg type="s" name="callID" direction="in"/>
-      <arg type="b" name="isRecording" direction="out"/>
-    </method>
-	 
-	 <method name="setRecording">
-		 <arg type="s" name="callID" direction="in"/>
-    </method>
-	 
-    <method name="getCallDetails">
-      <arg type="s" name="callID" direction="in"/>
-      <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringString"/>
-      <arg type="a{ss}" name="infos" direction="out"/>
-    </method>
-    
-    <method name="getCurrentCallID">
-      <arg type="s" name="callID" direction="out"/>
-    </method>
-    
-	 <!--        /////////////////////////////       -->
-	 <!--                 Signals                    -->
-	 <!--        /////////////////////////////       -->
-	 
-    <signal name="incomingCall">
-      <arg type="s" name="accountID" />
-      <arg type="s" name="callID" />
-      <arg type="s" name="from" />
-    </signal>
-    
-    <signal name="incomingMessage">
-      <arg type="s" name="accountID"  direction="out" />
-      <arg type="s" name="message"  direction="out"/>
-    </signal>
-    
-    <signal name="callStateChanged">
-      <arg type="s" name="callID"  direction="out"/>
-      <arg type="s" name="state"  direction="out"/>
-    </signal>
-    
-    <signal name="voiceMailNotify">
-      <arg type="s" name="accountID"  direction="out"/>
-      <arg type="i" name="count"  direction="out"/>
-    </signal>
-    
-    
-    <signal name="volumeChanged">
-      <arg type="s" name="device"  direction="out"/>
-      <arg type="d" name="value"  direction="out"/>
-    </signal>
-    
-    <signal name="error">
-      <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="MapStringString"/>
-      <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringString"/>
-      <arg type="a{ss}" name="details"  direction="out"/>
-    </signal>
-  </interface>
-</node>
diff --git a/sflphone_kde/config_en.ts b/sflphone_kde/config_en.ts
deleted file mode 100644
index 1819343595da581d5dc8ec7676a5c24e7422a7dd..0000000000000000000000000000000000000000
--- a/sflphone_kde/config_en.ts
+++ /dev/null
@@ -1,181 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>ConfigurationDialog</name>
-    <message>
-        <source>Dialog</source>
-        <translation>Dialog</translation>
-    </message>
-    <message encoding="UTF-8">
-        <source>Général</source>
-        <translation>General</translation>
-    </message>
-    <message>
-        <source>Affichage</source>
-        <translation>Display</translation>
-    </message>
-    <message>
-        <source>Comptes</source>
-        <translation>Accounts</translation>
-    </message>
-    <message>
-        <source>Audio</source>
-        <translation>Audio</translation>
-    </message>
-    <message encoding="UTF-8">
-        <source>Configuration des paramètres généraux</source>
-        <translation>General settings</translation>
-    </message>
-    <message>
-        <source>Historique des appels</source>
-        <translation>Call history</translation>
-    </message>
-    <message encoding="UTF-8">
-        <source>&amp;Capacité</source>
-        <translation>&amp;Capacity</translation>
-    </message>
-    <message>
-        <source>&amp;Effacer l&apos;Historique</source>
-        <translation>&amp;Clean history</translation>
-    </message>
-    <message>
-        <source>Connexion</source>
-        <translation>Connection</translation>
-    </message>
-    <message>
-        <source>Port SIP</source>
-        <translation>SIP port</translation>
-    </message>
-    <message>
-        <source>Configuration de l&apos;affichage</source>
-        <translation>Display settings</translation>
-    </message>
-    <message>
-        <source>Activer les notifications du bureau</source>
-        <translation>Enable desktop notifications</translation>
-    </message>
-    <message>
-        <source>&amp;Appels entrants</source>
-        <translation>Calls</translation>
-    </message>
-    <message>
-        <source>&amp;Messages vocaux</source>
-        <translation>Vocal messages</translation>
-    </message>
-    <message encoding="UTF-8">
-        <source>Faire apparaître la fenêtre principale</source>
-        <translation>Show the main window</translation>
-    </message>
-    <message encoding="UTF-8">
-        <source>Au &amp;démarrage</source>
-        <translation>At &amp;start</translation>
-    </message>
-    <message>
-        <source>Lors d&apos;un appel &amp;entrant</source>
-        <translation>When &amp;receiving a call</translation>
-    </message>
-    <message>
-        <source>Configuration des comptes utilisateur</source>
-        <translation>Acounts settings</translation>
-    </message>
-    <message>
-        <source>+</source>
-        <translation>+</translation>
-    </message>
-    <message>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <source>&amp;Alias</source>
-        <translation>&amp;Alias</translation>
-    </message>
-    <message>
-        <source>&amp;Protocole</source>
-        <translation>&amp;Protocole</translation>
-    </message>
-    <message>
-        <source>&amp;Serveur</source>
-        <translation>&amp;Server</translation>
-    </message>
-    <message>
-        <source>&amp;Usager</source>
-        <translation>&amp;User</translation>
-    </message>
-    <message>
-        <source>&amp;Mot de Passe</source>
-        <translation>Pass&amp;Word</translation>
-    </message>
-    <message encoding="UTF-8">
-        <source>&amp;Boîte Vocale</source>
-        <translation>&amp;Voicemail</translation>
-    </message>
-    <message>
-        <source>SIP</source>
-        <translation>SIP</translation>
-    </message>
-    <message>
-        <source>IAX</source>
-        <translation>IAX</translation>
-    </message>
-    <message encoding="UTF-8">
-        <source>Les paramètres STUN seront appliqués à tous les comptes</source>
-        <translation>STUN settings will be applied on all accounts</translation>
-    </message>
-    <message>
-        <source>Activer Stun</source>
-        <translation>Enable STUN</translation>
-    </message>
-    <message encoding="UTF-8">
-        <source>Configuration des paramètres audio</source>
-        <translation>Audio settings</translation>
-    </message>
-    <message>
-        <source>&amp;Interface audio</source>
-        <translation>Audio &amp;interface</translation>
-    </message>
-    <message>
-        <source>ALSA</source>
-        <translation>ALSA</translation>
-    </message>
-    <message>
-        <source>PulseAudio</source>
-        <translation>PulseAudio</translation>
-    </message>
-    <message>
-        <source>&amp;Activer les sonneries</source>
-        <translation>Enable &amp;ringtones</translation>
-    </message>
-    <message>
-        <source>&amp;Codecs</source>
-        <translation>&amp;Codecs</translation>
-    </message>
-    <message encoding="UTF-8">
-        <source>Paramètres ALSA</source>
-        <translation>ALSA settings</translation>
-    </message>
-    <message encoding="UTF-8">
-        <source>&amp;Entrée</source>
-        <translation>&amp;Entry</translation>
-    </message>
-    <message>
-        <source>&amp;Sortie</source>
-        <translation>&amp;Out</translation>
-    </message>
-    <message>
-        <source>&amp;Greffon ALSA</source>
-        <translation>ALSA &amp;plugin</translation>
-    </message>
-    <message encoding="UTF-8">
-        <source>Paramètres PulseAudio</source>
-        <translation>Pulseaudio settings</translation>
-    </message>
-    <message encoding="UTF-8">
-        <source>Autoriser à &amp;modifier le volume des autres applications</source>
-        <translation>Allow to &amp;modify other applications' volume</translation>
-    </message>
-    <message>
-        <source>PushButton</source>
-        <translation>PushButton</translation>
-    </message>
-</context>
-</TS>
diff --git a/sflphone_kde/configurationmanager-introspec.xml b/sflphone_kde/configurationmanager-introspec.xml
deleted file mode 100644
index 778ac9a4fd13177731f7b38b79085377f875ed57..0000000000000000000000000000000000000000
--- a/sflphone_kde/configurationmanager-introspec.xml
+++ /dev/null
@@ -1,288 +0,0 @@
-<?xml version="1.0" ?>
-<node name="/org/sflphone/SFLphone">
-  <interface name="org.sflphone.SFLphone.ConfigurationManager">
-    
-  <!-- Accounts-related methods -->  
-  <method name="getAccountDetails">
-      <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringString"/>
-      <arg type="s" name="accountID" direction="in"/>
-      <arg type="a{ss}" name="details" direction="out"/>
-    </method>
-    
-    <method name="setAccountDetails">
-      <annotation name="com.trolltech.QtDBus.QtTypeName.In1" value="MapStringString"/>
-      <arg type="s" name="accountID" direction="in"/>
-      <arg type="a{ss}" name="details" direction="in"/>
-    </method>
-    
-    <method name="addAccount">
-      <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="MapStringString"/>
-      <arg type="a{ss}" name="details" direction="in"/>
-      <arg type="s" name="createdAccountId" direction="out"/>
-    </method>
-    
-    <method name="removeAccount">
-      <arg type="s" name="accoundID" direction="in"/>
-    </method>
-    
-    <method name="getAccountList">
-      <arg type="as" name="list" direction="out"/>
-    </method>
-   
-    <method name="sendRegister">
-      <arg type="s" name="accountID" direction="in"/>
-      <arg type="i" name="expire" direction="in"/>
-    </method>
-
-   <!--      ///////////////////////               -->
-
-  <!-- Various audio-related methods   -->
- 
-    <method name="getToneLocaleList">
-      <arg type="as" name="list" direction="out"/>
-    </method>
-  
-    <method name="getVersion">
-      <arg type="s" name="version" direction="out"/>
-    </method>
-    
-    <method name="getRingtoneList">
-      <arg type="as" name="list" direction="out"/>
-    </method>
-   
-    <method name="getPlaybackDeviceList">
-      <arg type="as" name="list" direction="out"/>
-    </method>
-    
-    <method name="getRecordDeviceList">
-      <arg type="as" name="list" direction="out"/>
-    </method>
-    
-    <method name="isRingtoneEnabled">
-      <arg type="i" name="bool" direction="out"/>
-    </method>
-
-    <method name="ringtoneEnabled">
-    </method>
-
-    <method name="getRingtoneChoice">
-      <arg type="s" name="tone" direction="out"/>
-    </method>
-
-    <method name="setRingtoneChoice">
-      <arg type="s" name="tone" direction="in"/>
-    </method>
-
-    <method name="getAudioManager">
-      <arg type="i" name="api" direction="out"/>
-    </method>
-
-    <method name="setAudioManager">
-      <arg type="i" name="api" direction="in"/>
-    </method>
-	 
-	 <method name="getRecordPath">
-		 <arg type="s" name="rec" direction="out"/>
-	 </method>
-	 
-	 <method name="setRecordPath">
-		 <arg type="s" name="rec" direction="in"/>
-	 </method>
-	 
-	 
-
-   <!--      ///////////////////////               -->
-   
-   <!-- Codecs-related methods -->
- 
-    <method name="getCodecList">
-      <arg type="as" name="list" direction="out"/>
-    </method>
-   
-   <method name="getCodecDetails">
-     <arg type="i" name="payload" direction="in"/>
-     <arg type="as" name="details" direction="out"/>
-   </method>
- 
-    <method name="getActiveCodecList">
-      <arg type="as" name="list" direction="out"/>
-    </method>
-
-    <method name="setActiveCodecList">
-      <arg type="as" name="list" direction="in"/>
-    </method>
-
-
-	<!-- Audio devices methods -->
-	
-    <method name="getInputAudioPluginList">
-      <arg type="as" name="list" direction="out"/>
-    </method>
-		
-    <method name="getOutputAudioPluginList">
-      <arg type="as" name="list" direction="out"/>
-    </method>
-    
-    <method name="setInputAudioPlugin">
-      <arg type="s" name="audioPlugin" direction="in"/>
-    </method>
-    
-    <method name="setOutputAudioPlugin">
-      <arg type="s" name="audioPlugin" direction="in"/>
-    </method>
-    
-    <method name="getAudioOutputDeviceList">
-      <arg type="as" name="list" direction="out"/>
-    </method>
-    
-    <method name="setAudioOutputDevice">
-      <arg type="i" name="index" direction="in"/>
-    </method>
-    
-    <method name="getAudioInputDeviceList">
-      <arg type="as" name="list" direction="out"/>
-    </method>
-    
-    <method name="setAudioInputDevice">
-      <arg type="i" name="index" direction="in"/>
-    </method>
-    
-    <method name="getCurrentAudioDevicesIndex">
-      <arg type="as" name="list" direction="out"/>
-    </method>
-
-    <method name="getAudioDeviceIndex">
-      <arg type="s" name="name" direction="in"/>
-      <arg type="i" name="index" direction="out"/>
-    </method>
-
-    <method name="getCurrentAudioOutputPlugin">
-      <arg type="s" name="plugin" direction="out"/>
-    </method>
-
-  <!--    General Settings Panel         -->
- 
-    <method name="isIax2Enabled">
-      <arg type="i" name="res" direction="out"/>
-    </method>
-
-    <method name="setNotify">
-    </method>
-
-    <method name="getNotify">
-      <arg type="i" name="level" direction="out"/>
-    </method>
-
-    <method name="setMailNotify">
-    </method>
-
-    <method name="getMailNotify">
-      <arg type="i" name="level" direction="out"/>
-    </method>
-
-    <method name="getDialpad">
-      <arg type="i" name="state" direction="out"/>
-    </method>
-
-    <method name="setDialpad">
-    </method>
-
-    <method name="getSearchbar">
-      <arg type="i" name="state" direction="out"/>
-    </method>
-
-    <method name="setSearchbar">
-    </method>
-
-    <method name="getVolumeControls">
-      <arg type="i" name="state" direction="out"/>
-    </method>
-
-    <method name="setVolumeControls">
-    </method>
-
-    <method name="getMaxCalls">
-      <arg type="i" name="calls" direction="out"/>
-    </method>
-
-    <method name="setMaxCalls">
-      <arg type="i" name="calls" direction="in"/>
-    </method>
-
-    <method name="startHidden">
-    </method>
-
-    <method name="isStartHidden">
-      <arg type="i" name="state" direction="out"/>
-    </method>
-
-    <method name="popupMode">
-      <arg type="i" name="state" direction="out"/>
-    </method>
-
-    <method name="switchPopupMode">
-    </method>
-
-    <method name="setPulseAppVolumeControl">
-    </method>
-
-    <method name="getPulseAppVolumeControl">
-      <arg type="i" name="state" direction="out"/>
-    </method>
-
-    <method name="setSipPort">
-      <arg type="i" name="port" direction="in"/>
-    </method>
-
-    <method name="getSipPort">
-      <arg type="i" name="port" direction="out"/>
-    </method>
-
-    <method name="setStunServer">
-      <arg type="s" name="server" direction="in"/>
-    </method>
-
-    <method name="getStunServer">
-      <arg type="s" name="server" direction="out"/>
-    </method>
-
-    <method name="enableStun">
-    </method>
-
-    <method name="isStunEnabled">
-      <arg type="i" name="state" direction="out"/>
-    </method>
-
-    <!-- Addressbook configuration -->
-	 <method name="getAddressbookSettings">
-      <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringInt"/>
-      <arg type="a{si}" name="settings" direction="out"/>
-    </method>
-
-	 <method name="setAddressbookSettings">
-      <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="MapStringInt"/>
-      <arg type="a{si}" name="settings" direction="in"/>
-    </method>
-
-    <!-- Hook configuration -->
-    <method name="getHookSettings">
-		<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringString"/>
-      <arg type="a{ss}" name="settings" direction="out"/>
-    </method>
-
-    <method name="setHookSettings">
-		<annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="MapStringString"/>
-      <arg type="a{ss}" name="settings" direction="in"/>
-    </method>
-
-  <!--        /////////////////////////////       -->
-    
-    <signal name="accountsChanged">
-    </signal>
-
-    <signal name="errorAlert">
-      <arg type="i" name="code" direction="out"/>
-    </signal>
-
-  </interface>
-</node>
diff --git a/sflphone_kde/instance-introspec.xml b/sflphone_kde/instance-introspec.xml
deleted file mode 100644
index 90a60d632d04ca83039efcadcfa2f4981bfda39e..0000000000000000000000000000000000000000
--- a/sflphone_kde/instance-introspec.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" ?>
-<node name="/org/sflphone/SFLphone">
-  <interface name="org.sflphone.SFLphone.Instance">
-  
-    <method name="Register">
-      <arg type="i" name="pid" direction="in"/>
-      <arg type="s" name="name" direction="in"/>
-    </method>
-    
-    <method name="Unregister">
-      <arg type="i" name="pid" direction="in"/>
-    </method>
-    
-    <method name="getRegistrationCount">
-      <arg type="i" name="count" direction="out"/>
-    </method>
-  </interface>
-</node>
diff --git a/sflphone_kde/sflphone_kde.cpp b/sflphone_kde/sflphone_kde.cpp
deleted file mode 100644
index ebc6ffe628ee2824f3663cb54c5c6e40aa6810c9..0000000000000000000000000000000000000000
--- a/sflphone_kde/sflphone_kde.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2009 by Jérémy Quentin   *
- *   jeremy.quentin@gmail.com   *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
- ***************************************************************************/
-
-
-#include "sflphone_kde.h"
-#include "sflphone_kdeview.h"
-#include "settings.h"
-
-#include <QtGui/QDropEvent>
-#include <QtGui/QPainter>
-
-#include <kconfigdialog.h>
-#include <kstatusbar.h>
-
-#include <kaction.h>
-#include <kactioncollection.h>
-#include <kstandardaction.h>
-
-#include <KDE/KLocale>
-
-sflphone_kde::sflphone_kde()
-    : KXmlGuiWindow(),
-      m_view(new sflphone_kdeView(this)),
-      m_printer(0)
-{
-    // accept dnd
-    setAcceptDrops(true);
-
-    // tell the KXmlGuiWindow that this is indeed the main widget
-    setCentralWidget(m_view);
-
-    // then, setup our actions
-    setupActions();
-
-    // add a status bar
-    statusBar()->show();
-
-    // a call to KXmlGuiWindow::setupGUI() populates the GUI
-    // with actions, using KXMLGUI.
-    // It also applies the saved mainwindow settings, if any, and ask the
-    // mainwindow to automatically save settings if changed: window size,
-    // toolbar position, icon size, etc.
-    setupGUI();
-}
-
-sflphone_kde::~sflphone_kde()
-{
-}
-
-void sflphone_kde::setupActions()
-{
-    KStandardAction::openNew(this, SLOT(fileNew()), actionCollection());
-    KStandardAction::quit(qApp, SLOT(quit()), actionCollection());
-
-    KStandardAction::preferences(this, SLOT(optionsPreferences()), actionCollection());
-
-    // custom menu and menu item - the slot is in the class sflphone_kdeView
-    KAction *custom = new KAction(KIcon("colorize"), i18n("Swi&tch Colors"), this);
-    actionCollection()->addAction( QLatin1String("switch_action"), custom );
-    connect(custom, SIGNAL(triggered(bool)), m_view, SLOT(switchColors()));
-}
-
-void sflphone_kde::fileNew()
-{
-    // this slot is called whenever the File->New menu is selected,
-    // the New shortcut is pressed (usually CTRL+N) or the New toolbar
-    // button is clicked
-
-    // create a new window
-    (new sflphone_kde)->show();
-}
-
-void sflphone_kde::optionsPreferences()
-{
-    // The preference dialog is derived from prefs_base.ui
-    //
-    // compare the names of the widgets in the .ui file
-    // to the names of the variables in the .kcfg file
-    //avoid to have 2 dialogs shown
-    if ( KConfigDialog::showDialog( "settings" ) )  {
-        return;
-    }
-    KConfigDialog *dialog = new KConfigDialog(this, "settings", Settings::self());
-    QWidget *generalSettingsDlg = new QWidget;
-    ui_prefs_base.setupUi(generalSettingsDlg);
-    dialog->addPage(generalSettingsDlg, i18n("General"), "package_setting");
-    connect(dialog, SIGNAL(settingsChanged(QString)), m_view, SLOT(settingsChanged()));
-    dialog->setAttribute( Qt::WA_DeleteOnClose );
-    dialog->show();
-}
-
-#include "sflphone_kde.moc"
diff --git a/sflphone_kde/sflphone_kde.h b/sflphone_kde/sflphone_kde.h
deleted file mode 100644
index 98f29d4ddbe010a0de9a1a0bc9ca24bf7f0b0059..0000000000000000000000000000000000000000
--- a/sflphone_kde/sflphone_kde.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2009 by Jérémy Quentin   *
- *   jeremy.quentin@gmail.com   *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
- ***************************************************************************/
-
-#ifndef SFLPHONE_KDE_H
-#define SFLPHONE_KDE_H
-
-
-#include <kxmlguiwindow.h>
-
-#include "ui_prefs_base.h"
-
-class sflphone_kdeView;
-class KPrinter;
-class KToggleAction;
-class KUrl;
-
-/**
- * This class serves as the main window for sflphone_kde.  It handles the
- * menus, toolbars, and status bars.
- *
- * @short Main window class
- * @author Andreas Pakulat <apaku@gmx.de>
- * @version 0.1
- */
-class sflphone_kde : public KXmlGuiWindow
-{
-    Q_OBJECT
-public:
-    /**
-     * Default Constructor
-     */
-    sflphone_kde();
-
-    /**
-     * Default Destructor
-     */
-    virtual ~sflphone_kde();
-
-private slots:
-    void fileNew();
-    void optionsPreferences();
-
-private:
-    void setupActions();
-
-private:
-    Ui::prefs_base ui_prefs_base ;
-    sflphone_kdeView *m_view;
-
-    KPrinter   *m_printer;
-    KToggleAction *m_toolbarAction;
-    KToggleAction *m_statusbarAction;
-};
-
-#endif // _sflphone_kde_H_
diff --git a/sflphone_kde/sflphone_kde.kcfg b/sflphone_kde/sflphone_kde.kcfg
deleted file mode 100644
index 1cbec6deddfde6e9c35c4fb0280ad693dd28d14f..0000000000000000000000000000000000000000
--- a/sflphone_kde/sflphone_kde.kcfg
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<kcfg xmlns="http://www.kde.org/standards/kcfg/1.0"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
-      http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
-  <kcfgfile name="KApp4rc"/>
-  <group name="Preferences">
-    <entry name="col_background" type="Color">
-	    <label>color of the background</label>
-	    <default>black</default>
-    </entry>
-    <entry name="col_foreground" type="Color">
-	    <label>color of the foreground</label>
-	    <default>yellow</default>
-    </entry>
-    <entry name="val_time" type="Int">
-	    <label>size of a ball</label>
-	    <default>2</default>
-    </entry>
-  </group>
-</kcfg>