diff --git a/sflphone-client-kde/ConfigDialog.cpp b/sflphone-client-kde/ConfigDialog.cpp index 1af6859843c659e044b73e921d5d4b0461ce26cc..e53bb34fa892288328332d87575e40cedec8092b 100644 --- a/sflphone-client-kde/ConfigDialog.cpp +++ b/sflphone-client-kde/ConfigDialog.cpp @@ -130,9 +130,9 @@ void ConfigurationDialog::loadOptions() // //alsa settings comboBox1_alsaPlugin->clear(); -// QStringList pluginList = configurationManager.getOutputAudioPluginList(); -// comboBox1_alsaPlugin->addItems(pluginList); -// comboBox1_alsaPlugin->setCurrentIndex(comboBox1_alsaPlugin->findText(configurationManager.getCurrentAudioOutputPlugin())); + QStringList pluginList = configurationManager.getOutputAudioPluginList(); + comboBox1_alsaPlugin->addItems(pluginList); + comboBox1_alsaPlugin->setCurrentIndex(comboBox1_alsaPlugin->findText(configurationManager.getCurrentAudioOutputPlugin())); QStringList devices = configurationManager.getCurrentAudioDevicesIndex(); diff --git a/sflphone-client-kde/SFLPhone.cpp b/sflphone-client-kde/SFLPhone.cpp index 5c7af76dfb2b755ccedc0a0c416f3263f26ef2a5..acd6e6b632a188af6592b8e1b044f28cd181ad4d 100644 --- a/sflphone-client-kde/SFLPhone.cpp +++ b/sflphone-client-kde/SFLPhone.cpp @@ -140,10 +140,8 @@ void SFLPhone::on_trayIcon_messageClicked() void SFLPhone::changeEvent(QEvent * event) { - qDebug() << "changeEvent event->type() = " << event->type() << " , iconChanged = " << iconChanged << " , isActiveWindow() = " << isActiveWindow(); if (event->type() == QEvent::ActivationChange && iconChanged && isActiveWindow()) { - qDebug() << "changeEvent2"; trayIcon->setIcon(this->windowIcon()); iconChanged = false; } diff --git a/sflphone-client-kde/callmanager_interface_singleton.cpp b/sflphone-client-kde/callmanager_interface_singleton.cpp index 6617204ab37ef3dc660ca07f7b9f32af936ac3ea..68f0d88dbbe47c74e7513f1207509a121f46194d 100644 --- a/sflphone-client-kde/callmanager_interface_singleton.cpp +++ b/sflphone-client-kde/callmanager_interface_singleton.cpp @@ -9,15 +9,15 @@ CallManagerInterface * CallManagerInterfaceSingleton::interface CallManagerInterface & CallManagerInterfaceSingleton::getInstance(){ - /*if(!interface){ + if(!interface){ interface = new CallManagerInterface( "org.sflphone.SFLphone", "/org/sflphone/SFLphone/CallManager", QDBusConnection::sessionBus()); - }*/ + } if(!interface->isValid()) { - throw "Error : sflphoned not connected"; + throw "Error : sflphoned not connected. Service " + interface->service() + " not connected. From call manager interface."; } return *interface; diff --git a/sflphone-client-kde/configurationmanager_interface_singleton.cpp b/sflphone-client-kde/configurationmanager_interface_singleton.cpp index c45202b03bb0e0d108a0a242d33664b8c0c6af74..22e9ad70aa06f01bc45569de2635dd2bfe06a088 100644 --- a/sflphone-client-kde/configurationmanager_interface_singleton.cpp +++ b/sflphone-client-kde/configurationmanager_interface_singleton.cpp @@ -9,7 +9,7 @@ ConfigurationManagerInterface & ConfigurationManagerInterfaceSingleton::getInsta interface = new ConfigurationManagerInterface("org.sflphone.SFLphone", "/org/sflphone/SFLphone/ConfigurationManager", QDBusConnection::sessionBus()); } if(!interface->isValid()) - throw "Error : sflphoned not connected"; + throw "Error : sflphoned not connected. Service " + interface->service() + " not connected. From configuration manager interface."; return *interface; } \ No newline at end of file diff --git a/sflphone-client-kde/instance_interface_singleton.cpp b/sflphone-client-kde/instance_interface_singleton.cpp index 42c35be4090a2f15337cd8faa7ee2c5463327a10..6f89f3b17eca58f3a8398ad0251ca4c322eb3787 100644 --- a/sflphone-client-kde/instance_interface_singleton.cpp +++ b/sflphone-client-kde/instance_interface_singleton.cpp @@ -29,15 +29,15 @@ InstanceInterface * InstanceInterfaceSingleton::interface InstanceInterface & InstanceInterfaceSingleton::getInstance(){ - /*if(!interface){ + if(!interface){ interface = new InstanceInterface( "org.sflphone.SFLphone", "/org/sflphone/SFLphone/Instance", QDBusConnection::sessionBus()); - }*/ + } if(!interface->isValid()) { - throw "Error : sflphoned not connected"; + throw "Error : sflphoned not connected. Service " + interface->service() + " not connected. From instance interface."; } return *interface;