* Batch 1/2 of kdemultimedia bugfix patches from the Chakra project

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1172709 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

2 files changed, 5 insertions, 2 deletions

diff --git a/kopete/protocols/oscar/aim/aimcontact.cpp b/kopete/protocols/oscar/aim/aimcontact.cpp
index fc55537d..b32a5305 100644
--- a/kopete/protocols/oscar/aim/aimcontact.cpp
+++ b/kopete/protocols/oscar/aim/aimcontact.cpp
@@ -438,6 +438,9 @@ void AIMContact::slotSendMsg(Kopete::Message& message, Kopete::ChatSession *)
 	//30- (and any I missed) are size 7
 	s.replace ( TQRegExp ( TQString::fromLatin1("<font ptsize=\"[^\"]*\">")),TQString::fromLatin1("<font size=\"7\">"));
 
+	// strip left over line break
+	s.remove(TQRegExp(TQString::fromLatin1("<br\b[^>]*>$")));
+
 	s.replace ( TQRegExp ( TQString::fromLatin1("<br[ /]*>")), TQString::fromLatin1("<br>") );
 
 	// strip left over line break
diff --git a/kopete/protocols/oscar/oscarversionupdater.cpp b/kopete/protocols/oscar/oscarversionupdater.cpp
index 75f38b74..92c7a5e2 100644
--- a/kopete/protocols/oscar/oscarversionupdater.cpp
+++ b/kopete/protocols/oscar/oscarversionupdater.cpp
@@ -88,8 +88,8 @@ void OscarVersionUpdater::initICQVersionInfo()
 {
 	kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << endl;
 	KConfigGroup config( KGlobal::config(), "ICQVersion" );
-	
-	mICQVersion.clientString = config.readEntry( "ClientString", "ICQBasic" );
+
+	mICQVersion.clientString = config.readEntry( "ClientString", "ICQ Client" );
 	mICQVersion.clientId = config.readEntry( "ClientId", "0x010A" ).toUShort( 0, 0 );
 	mICQVersion.major = config.readEntry( "Major", "0x0006" ).toUShort( 0, 0 );
 	mICQVersion.minor = config.readEntry( "Minor", "0x0000" ).toUShort( 0, 0 );