diff --git a/daemon/src/audio/codecs/audiocodecfactory.cpp b/daemon/src/audio/codecs/audiocodecfactory.cpp
index 0dc73e5832f3a36ee0b45f5b75d2471e10c84bb0..1bbc5006f6f51934c9d133e6b8c1cf8aee2c021b 100644
--- a/daemon/src/audio/codecs/audiocodecfactory.cpp
+++ b/daemon/src/audio/codecs/audiocodecfactory.cpp
@@ -78,7 +78,8 @@ std::vector<int32_t >
AudioCodecFactory::getAudioCodecList() const
{
std::vector<int32_t> list;
-
+int size = codecsMap_.size();
+printf("%d\n",size);
for (CodecsMap::const_iterator iter = codecsMap_.begin(); iter != codecsMap_.end(); ++iter)
if (iter->second)
list.push_back((int32_t)iter->first);
diff --git a/daemon/src/dbus/configurationmanager-introspec.xml b/daemon/src/dbus/configurationmanager-introspec.xml
index 21493d0a003e6dc6c04833ed202416b36867d7bf..13f666940b39300c39b405ac4abe3ff7ce1e0aa0 100644
--- a/daemon/src/dbus/configurationmanager-introspec.xml
+++ b/daemon/src/dbus/configurationmanager-introspec.xml
@@ -89,7 +89,7 @@
<tp:docstring>
</tp:docstring>
</arg>
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorMapStringString"/>
+ <annotation name="com.trolltech.QtDBus.QtTypeName.In1" value="VectorMapStringString"/>
<arg type="aa{ss}" name="credentialInformation" direction="in" tp:type="String_String_Map">
<tp:docstring>
</tp:docstring>
@@ -308,7 +308,7 @@
<method name="getActiveAudioCodecList" tp:name-for-bindings="getActiveAudioCodecList">
<tp:docstring>
</tp:docstring>
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
+ <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorInt"/>
<arg type="s" name="accountID" direction="in">
<tp:docstring>
</tp:docstring>
@@ -667,7 +667,7 @@
<method name="setTlsSettings" tp:name-for-bindings="setTlsSettings">
<tp:docstring>
</tp:docstring>
- <annotation name="com.trolltech.QtDBus.QtTypeName.In1" value="MapStringString"/>
+ <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="MapStringString"/>
<arg type="a{ss}" name="details" direction="in">
<tp:docstring>
</tp:docstring>
diff --git a/kde/plasma/dataengine/sflphonEngine.cpp b/kde/plasma/dataengine/sflphonEngine.cpp
index e624414d8d9a7aaf44e4fe15f74dc086ba0535eb..741a86ae8ea9bd5f04ea799e19591f685ec23e65 100644
--- a/kde/plasma/dataengine/sflphonEngine.cpp
+++ b/kde/plasma/dataengine/sflphonEngine.cpp
@@ -17,7 +17,6 @@ SFLPhoneEngine::SFLPhoneEngine(QObject* parent, const QVariantList& args)
m_pModel->initCall();
m_pModel->initHistory();
- ConfigurationManagerInterface& configurationManager = ConfigurationManagerInterfaceSingleton::getInstance();
CallManagerInterface& callManager = CallManagerInterfaceSingleton::getInstance();
connect(m_pModel , SIGNAL( callStateChanged(Call*)) , this , SLOT(callStateChangedSignal(Call*) ));
diff --git a/kde/plasma/plasmoid/MainWidget.cpp b/kde/plasma/plasmoid/MainWidget.cpp
index 1bcb7b5e6352eabf73b21ff9d6e47464d03501c9..b71ae991786d647e5263cbd4719509d6c76238c7 100644
--- a/kde/plasma/plasmoid/MainWidget.cpp
+++ b/kde/plasma/plasmoid/MainWidget.cpp
@@ -91,8 +91,8 @@ void MainWidget::dataUpdated(const QString& source, const Plasma::DataEngine::Da
topLevelItems[value.key(call)] = callWidgetList[value.key(call)];
}
- //if (modified)
- //sflphoneEngine->connectSource("conferences", this,0/*Update only if something happen*/);
+// if (modified)
+// sflphoneEngine->connectSource("conferences", this,0/*Update only if something happen*/);
}
else if (source == "info") {
if (!data["Account"].isNull() || data["Account"].isValid())
@@ -153,6 +153,7 @@ QGraphicsLinearLayout* MainWidget::mainLayout()
void MainWidget::call(QString number)
{
+ Q_UNUSED(number);
// qDebug() << "Calling " << number << " with account " << currentAccountId << ", " << CallModelConvenience::getAccountList()->size() << " account registred";
// CallManagerInterface& callManager = CallManagerInterfaceSingleton::getInstance();
// callManager.placeCall(currentAccountId, CallModelConvenience::generateCallId(), number);
diff --git a/kde/src/conf/dlgaccounts.cpp b/kde/src/conf/dlgaccounts.cpp
index 3213b295c63c1afbaa083999a9c801af576ec433..d9ec80755511ded5f31b85277fb7ac7d3b540c59 100755
--- a/kde/src/conf/dlgaccounts.cpp
+++ b/kde/src/conf/dlgaccounts.cpp
@@ -333,11 +333,11 @@ void DlgAccounts::loadAccount(QListWidgetItem * item)
spinBox_ni_local_port->setValue(account->getAccountDetail(LOCAL_PORT).toInt());
comboBox_ni_local_address->setCurrentIndex(comboBox_ni_local_address->findText(account->getAccountDetail(LOCAL_INTERFACE))); //TODO need to load the list first
- QStringList activeCodecList = configurationManager.getActiveAudioCodecList(account->getAccountDetail(ACCOUNT_ID));
+ QVector<int> activeCodecList = configurationManager.getActiveAudioCodecList(account->getAccountDetail(ACCOUNT_ID));
keditlistbox_codec->clear();
- foreach (QString aCodec, activeCodecList) {
+ foreach (int aCodec, activeCodecList) {
foreach (StringHash _aCodec, codecList) {
-; if (_aCodec["id"] == aCodec)
+ if (_aCodec["id"] == QString::number(aCodec))
keditlistbox_codec->insertItem(_aCodec["alias"]);
}
}
diff --git a/kde/src/dbus/callmanager-introspec.xml b/kde/src/dbus/callmanager-introspec.xml
index 8b23a3f68dc04fecfce79a233b5669f4882bc7b8..46cec40068df52b9d16a50324c3947821ed7f443 100755
--- a/kde/src/dbus/callmanager-introspec.xml
+++ b/kde/src/dbus/callmanager-introspec.xml
@@ -289,7 +289,7 @@
A map containing the ID of the conferences
and their states:
<ul>
- <li>ACTIVE_ATACHED</li>
+ <li>ACTIVE_ATTACHED</li>
<li>ACTIVE_DETACHED</li>
<li>HOLD</li>
</ul>
diff --git a/kde/src/dbus/configurationmanager-introspec.xml b/kde/src/dbus/configurationmanager-introspec.xml
index 5f84e72cf9ee167477914f15e91666212160fb65..043a19bff83388726e65670e5a9aed4bc2db04fe 100755
--- a/kde/src/dbus/configurationmanager-introspec.xml
+++ b/kde/src/dbus/configurationmanager-introspec.xml
@@ -85,11 +85,11 @@
<method name="setCredentials" tp:name-for-bindings="setCredentials">
<tp:docstring>
</tp:docstring>
- <annotation name="com.trolltech.QtDBus.QtTypeName.In2" value="MapStringString"/>
<arg type="s" name="accountID" direction="in">
<tp:docstring>
</tp:docstring>
</arg>
+ <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorMapStringString"/>
<arg type="aa{ss}" name="credentialInformation" direction="in" tp:type="String_String_Map">
<tp:docstring>
</tp:docstring>
@@ -137,11 +137,11 @@
<method name="getCredentials" tp:name-for-bindings="getCredentials">
<tp:docstring>
</tp:docstring>
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringString"/>
<arg type="s" name="accountID" direction="in">
<tp:docstring>
</tp:docstring>
</arg>
+ <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorMapStringString"/>
<arg type="aa{ss}" name="credentialInformation" direction="out">
<tp:docstring>
</tp:docstring>
@@ -284,8 +284,8 @@
<method name="getAudioCodecList" tp:name-for-bindings="getAudioCodecList">
<tp:docstring>
</tp:docstring>
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
- <arg type="as" name="list" direction="out">
+ <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorInt"/>
+ <arg type="ai" name="list" direction="out">
<tp:docstring>
</tp:docstring>
</arg>
@@ -308,7 +308,7 @@
<method name="getActiveAudioCodecList" tp:name-for-bindings="getActiveAudioCodecList">
<tp:docstring>
</tp:docstring>
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
+ <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorInt"/>
<arg type="s" name="accountID" direction="in">
<tp:docstring>
</tp:docstring>
diff --git a/kde/src/lib/CMakeLists.txt b/kde/src/lib/CMakeLists.txt
index 6e0c8d42106321d92fd4b8a9ccb3ad5751f145b6..c2fa10571ef547aeec51bee8f033c6322ec560ba 100644
--- a/kde/src/lib/CMakeLists.txt
+++ b/kde/src/lib/CMakeLists.txt
@@ -17,7 +17,7 @@ FIND_PACKAGE ( Qt4 REQUIRED )
INCLUDE ( KDE4Defaults )
-set(GENERIC_LIB_VERSION "0.9.8")
+set(GENERIC_LIB_VERSION "1.0.2")
INCLUDE_DIRECTORIES ( ${QT_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR})
diff --git a/kde/src/lib/dbus/callmanager-introspec.xml b/kde/src/lib/dbus/callmanager-introspec.xml
index 8b23a3f68dc04fecfce79a233b5669f4882bc7b8..46cec40068df52b9d16a50324c3947821ed7f443 100644
--- a/kde/src/lib/dbus/callmanager-introspec.xml
+++ b/kde/src/lib/dbus/callmanager-introspec.xml
@@ -289,7 +289,7 @@
A map containing the ID of the conferences
and their states:
<ul>
- <li>ACTIVE_ATACHED</li>
+ <li>ACTIVE_ATTACHED</li>
<li>ACTIVE_DETACHED</li>
<li>HOLD</li>
</ul>
diff --git a/kde/src/lib/dbus/configurationmanager-introspec.xml b/kde/src/lib/dbus/configurationmanager-introspec.xml
index 8ae56bf3edef18ba3f9503d4a7049afdc66697a2..13f666940b39300c39b405ac4abe3ff7ce1e0aa0 100644
--- a/kde/src/lib/dbus/configurationmanager-introspec.xml
+++ b/kde/src/lib/dbus/configurationmanager-introspec.xml
@@ -71,11 +71,11 @@
<tp:rationale>Account settings are written to the configuration file when sflphone properly quits.</tp:rationale>
<tp:rationale>After calling this method, the core will emit the signal <tp:member-ref>accountsChanged</tp:member-ref> with the updated data. The client must subscribe to this signal and use it to update its internal data structure.</tp:rationale>
</tp:docstring>
+ <annotation name="com.trolltech.QtDBus.QtTypeName.In1" value="MapStringString"/>
<arg type="s" name="accountID" direction="in">
<tp:docstring>
</tp:docstring>
</arg>
- <annotation name="com.trolltech.QtDBus.QtTypeName.In1" value="MapStringString"/>
<arg type="a{ss}" name="details" direction="in" tp:type="String_String_Map">
<tp:docstring>
</tp:docstring>
@@ -89,7 +89,7 @@
<tp:docstring>
</tp:docstring>
</arg>
- <annotation name="com.trolltech.QtDBus.QtTypeName.In1" value="VectorMapStringString"/>
+ <annotation name="com.trolltech.QtDBus.QtTypeName.In1" value="VectorMapStringString"/>
<arg type="aa{ss}" name="credentialInformation" direction="in" tp:type="String_String_Map">
<tp:docstring>
</tp:docstring>
@@ -101,6 +101,7 @@
Get configuration settings of the IP2IP_PROFILE. They are sligthly different from account settings since no VoIP accounts are involved.
</tp:docstring>
<annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringString"/>
+ <!--<annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="MapStringString"/>-->
<arg type="a{ss}" name="details" direction="out" tp:type="String_String_Map">
<tp:docstring>
Available parameters are:
@@ -307,12 +308,12 @@
<method name="getActiveAudioCodecList" tp:name-for-bindings="getActiveAudioCodecList">
<tp:docstring>
</tp:docstring>
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/>
+ <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorInt"/>
<arg type="s" name="accountID" direction="in">
<tp:docstring>
</tp:docstring>
</arg>
- <arg type="as" name="list" direction="out">
+ <arg type="ai" name="list" direction="out">
<tp:docstring>
</tp:docstring>
</arg>
@@ -605,6 +606,7 @@
<method name="getHistory" tp:name-for-bindings="getHistory">
<tp:docstring>
</tp:docstring>
+ <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringString"/>
<arg type="as" name="entries" direction="out">
<tp:docstring>
</tp:docstring>
@@ -706,9 +708,9 @@
</method>
<method name="getShortcuts" tp:name-for-bindings="getShortcuts">
+ <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringString"/>
<tp:docstring>
</tp:docstring>
- <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringString"/>
<arg type="a{ss}" name="shortcutsMap" direction="out">
<tp:docstring>
</tp:docstring>
@@ -716,9 +718,9 @@
</method>
<method name="setShortcuts" tp:name-for-bindings="setShortcuts">
+ <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="MapStringString"/>
<tp:docstring>
</tp:docstring>
- <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="MapStringString"/>
<arg type="a{ss}" name="shortcutsMap" direction="in">
<tp:docstring>
</tp:docstring>