From kde-commits  Mon Jun 02 21:21:32 2008
From: Roman Jarosz <kedgedev () centrum ! cz>
Date: Mon, 02 Jun 2008 21:21:32 +0000
To: kde-commits
Subject: KDE/kdenetwork/kopete/protocols/jabber
Message-Id: <1212441692.201144.17843.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=121244171731004

SVN commit 815953 by rjarosz:

Use setStatusMessage instead of own status message property.
This will show the message in Change message submenu.



 M  +1 -8      jabberbasecontact.cpp  
 M  +1 -1      jabbercontact.cpp  
 M  +0 -1      jabberprotocol.cpp  
 M  +0 -1      jabberprotocol.h  


--- trunk/KDE/kdenetwork/kopete/protocols/jabber/jabberbasecontact.cpp #815952:815953
@@ -323,14 +323,7 @@
 	 * Set away message property.
 	 * We just need to read it from the current resource.
 	 */
-	if ( !resource.status ().status ().isEmpty () )
-	{
-		setProperty ( protocol()->propAwayMessage, resource.status().status () );
-	}
-	else
-	{
-		removeProperty ( protocol()->propAwayMessage );
-	}
+	setStatusMessage( resource.status().status() );
 
 }
 
--- trunk/KDE/kdenetwork/kopete/protocols/jabber/jabbercontact.cpp #815952:815953
@@ -610,7 +610,7 @@
 		setProperty ( protocol()->propLastSeen, QDateTime::currentDateTime().addSecs ( -task->seconds () ) );
 		if( !task->message().isEmpty() )
 		{
-			setProperty( protocol()->propAwayMessage, task->message() );
+			setStatusMessage( task->message() );
 		}
 	}
 
--- trunk/KDE/kdenetwork/kopete/protocols/jabber/jabberprotocol.cpp #815952:815953
@@ -71,7 +71,6 @@
 	JabberKOSInvisible(Kopete::OnlineStatus::Invisible,   40, this, JabberInvisible, QStringList("contact_invisible_overlay"),   i18n ("Invisible") ,i18n ("Invisible"), Kopete::OnlineStatusManager::Invisible),
 	JabberKOSConnecting(Kopete::OnlineStatus::Connecting, 30, this, JabberConnecting, QStringList("jabber_connecting"),  i18n("Connecting")),
 	propLastSeen(Kopete::Global::Properties::self()->lastSeen()),
-	propAwayMessage(Kopete::Global::Properties::self()->statusMessage()),
 	propFirstName(Kopete::Global::Properties::self()->firstName()),
 	propLastName(Kopete::Global::Properties::self()->lastName()),
 	propFullName(Kopete::Global::Properties::self()->fullName()),
--- trunk/KDE/kdenetwork/kopete/protocols/jabber/jabberprotocol.h #815952:815953
@@ -81,7 +81,6 @@
 	const Kopete::OnlineStatus JabberKOSConnecting;
 
 	const Kopete::PropertyTmpl propLastSeen;
-	const Kopete::PropertyTmpl propAwayMessage;
 	const Kopete::PropertyTmpl propFirstName;
 	const Kopete::PropertyTmpl propLastName;
 	const Kopete::PropertyTmpl propFullName;