From 7c85760c482a04669867cb7e1d671c29424895ac Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Tue, 13 Mar 2012 13:11:15 -0500 Subject: Fix minor linking and string issues. This resolves bug report 748. --- kopete/protocols/jabber/kioslave/CMakeLists.txt | 2 +- kopete/protocols/sms/services/smsclient.cpp | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/kopete/protocols/jabber/kioslave/CMakeLists.txt b/kopete/protocols/jabber/kioslave/CMakeLists.txt index 24b4ce81..6c691ae5 100644 --- a/kopete/protocols/jabber/kioslave/CMakeLists.txt +++ b/kopete/protocols/jabber/kioslave/CMakeLists.txt @@ -35,7 +35,7 @@ install( FILES jabberdisco.protocol DESTINATION ${SERVICES_INSTALL_DIR} ) tde_add_kpart( kio_jabberdisco AUTOMOC SOURCES jabberdisco.cpp LINK - jabberclient-static + jabberclient-static idn iris_xmpp_core-static iris_xmpp_im-static iris_jabber-static iris-static qca-static cutestuff_network-static cutestuff_util-static kio-shared idn DESTINATION ${PLUGIN_INSTALL_DIR} diff --git a/kopete/protocols/sms/services/smsclient.cpp b/kopete/protocols/sms/services/smsclient.cpp index 5d9882b3..9fb5a929 100644 --- a/kopete/protocols/sms/services/smsclient.cpp +++ b/kopete/protocols/sms/services/smsclient.cpp @@ -59,7 +59,7 @@ void SMSClient::send(const Kopete::Message& msg) m_msg = msg; KConfigGroup* c = m_account->configGroup(); - TQString provider = c->readEntry(TQString("%1:%2").arg("SMSClient").arg("ProviderName"), TQString()); + TQString provider = c->readEntry(TQString("%1:%2").arg("SMSClient").arg("ProviderName"); if (provider.isNull()) { @@ -67,7 +67,7 @@ void SMSClient::send(const Kopete::Message& msg) return; } - TQString programName = c->readEntry(TQString("%1:%2").arg("SMSClient").arg("ProgramName"), TQString()); + TQString programName = c->readEntry(TQString("%1:%2").arg("SMSClient").arg("ProgramName"); if (programName.isNull()) programName = "/usr/bin/sms_client"; @@ -97,15 +97,14 @@ TQWidget* SMSClient::configureWidget(TQWidget* parent) prefWidget->configDir->setMode(KFile::Directory); TQString configDir; if (m_account) - configDir = m_account->configGroup()->readEntry(TQString("%1:%2").arg("SMSClient").arg("ConfigDir"), TQString()); + configDir = m_account->configGroup()->readEntry(TQString("%1:%2").arg("SMSClient").arg("ConfigDir"); if (configDir.isNull()) configDir = "/etc/sms"; prefWidget->configDir->setURL(configDir); TQString programName; if (m_account) - programName = m_account->configGroup()->readEntry(TQString("%1:%2").arg("SMSClient").arg("ProgramName"), - TQString()); + programName = m_account->configGroup()->readEntry(TQString("%1:%2").arg("SMSClient").arg("ProgramName"); if (programName.isNull()) programName = "/usr/bin/sms_client"; prefWidget->program->setURL(programName); -- cgit v1.2.1