[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdenetwork/kopete/protocols/jabber
From:       Olivier Goffart <ogoffart () kde ! org>
Date:       2005-04-09 18:38:56
Message-ID: 20050409183856.6CB723EF () office ! kde ! org
[Download RAW message or body]

CVS commit by ogoffart: 

Few corrections in some not-yet-implemented method, which will make the new way for \
changing status work


  M +4 -0      jabberaccount.cpp   1.148
  M +4 -4      jabberprotocol.cpp   1.227


--- kdenetwork/kopete/protocols/jabber/jabberaccount.cpp  #1.147:1.148
@@ -738,4 +738,6 @@ void JabberAccount::slotIncomingFileTran
 void JabberAccount::setOnlineStatus( const Kopete::OnlineStatus& status  , const \
QString &reason)  {
+#warning  TODO do this properly
+  //and actually set the correct status  - Olivier  2005-04-09
         if ( myself()->onlineStatus().status() == Kopete::OnlineStatus::Offline && \
status.status() == Kopete::OnlineStatus::Online )  connect( status );
@@ -744,4 +746,6 @@ void JabberAccount::setOnlineStatus( con
         else if ( myself()->onlineStatus().status() != Kopete::OnlineStatus::Offline \
&& status.status() == Kopete::OnlineStatus::Away )  setAway( true, reason );
+        else if(isConnected() && isAway() &&  status.status() == \
Kopete::OnlineStatus::Online ) +                setAway(false, reason );
 }
 

--- kdenetwork/kopete/protocols/jabber/jabberprotocol.cpp  #1.226:1.227
@@ -67,9 +67,9 @@ K_EXPORT_COMPONENT_FACTORY( kopete_jabbe
 JabberProtocol::JabberProtocol (QObject * parent, const char *name, const \
QStringList &)  : Kopete::Protocol( JabberProtocolFactory::instance(), parent, name \
                ),
-        JabberKOSChatty(Kopete::OnlineStatus::Online,        100, this, 1, \
"jabber_chatty",      i18n ("Free to Chat"), i18n ("Free to Chat"), \
Kopete::OnlineStatusManager::Online), +        \
JabberKOSChatty(Kopete::OnlineStatus::Online,        100, this, 1, "jabber_chatty",   \
i18n ("Free to Chat"), i18n ("Free to Chat")),  \
JabberKOSOnline(Kopete::OnlineStatus::Online,         90, this, 0, QString::null,     \
                i18n ("Online"), i18n ("Online"), \
                Kopete::OnlineStatusManager::Online),
-        JabberKOSAway(Kopete::OnlineStatus::Away,             80, this, 2, \
"contact_away_overlay",        i18n ("Away"), i18n ("Away"), \
                Kopete::OnlineStatusManager::Busy),
-        JabberKOSXA(Kopete::OnlineStatus::Away,               70, this, 3, \
"contact_xa_overlay",          i18n ("Extended Away"), i18n ("Extended Away"), \
                Kopete::OnlineStatusManager::Away),
-        JabberKOSDND(Kopete::OnlineStatus::Away,              60, this, 4, \
"contact_busy_overlay",          i18n ("Do not Disturb"), i18n ("Do not Disturb"), \
Kopete::OnlineStatusManager::Away), +        \
JabberKOSAway(Kopete::OnlineStatus::Away,             80, this, 2, \
"contact_away_overlay",        i18n ("Away"), i18n ("Away"), \
Kopete::OnlineStatusManager::Away), +        JabberKOSXA(Kopete::OnlineStatus::Away,  \
70, this, 3, "contact_xa_overlay",          i18n ("Extended Away"), i18n ("Extended \
Away")), +        JabberKOSDND(Kopete::OnlineStatus::Away,              60, this, 4, \
"contact_busy_overlay",          i18n ("Do not Disturb"), i18n ("Do not Disturb"), \
Kopete::OnlineStatusManager::Busy),  JabberKOSOffline(Kopete::OnlineStatus::Offline,  \
50, this, 5, QString::null,        i18n ("Offline") ,i18n ("Offline"), \
Kopete::OnlineStatusManager::Offline),  \
JabberKOSInvisible(Kopete::OnlineStatus::Invisible,   40, this, 6, \
"contact_invisible_overlay",   i18n ("Invisible") ,i18n ("Invisible"), \
Kopete::OnlineStatusManager::Invisible),


[prev in list] [next in list] [prev in thread] [next in thread]