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

List:       kde-commits
Subject:    branches/KDE/4.3/kdenetwork/kopete/protocols/jabber
From:       Roman Jarosz <kedgedev () gmail ! com>
Date:       2009-11-01 15:54:50
Message-ID: 1257090890.138980.16452.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1043458 by rjarosz:

Backport commit 1043454 + Busy fix
Set correct category for Extended away status

CCBUG: 198785



 M  +2 -2      jabberprotocol.cpp  


--- branches/KDE/4.3/kdenetwork/kopete/protocols/jabber/jabberprotocol.cpp \
#1043457:1043458 @@ -65,8 +65,8 @@
 	JabberKOSChatty(Kopete::OnlineStatus::Online,        100, this, JabberFreeForChat, \
QStringList("jabber_chatty"), i18n ("Free for Chat"), i18n ("Free for Chat"), \
Kopete::OnlineStatusManager::FreeForChat, \
Kopete::OnlineStatusManager::HasStatusMessage ),  \
JabberKOSOnline(Kopete::OnlineStatus::Online,         90, this, JabberOnline, \
QStringList(), i18n ("Online"), i18n ("Online"), Kopete::OnlineStatusManager::Online, \
Kopete::OnlineStatusManager::HasStatusMessage ),  \
JabberKOSAway(Kopete::OnlineStatus::Away,             80, this, JabberAway, \
QStringList("contact_away_overlay"), i18n ("Away"), i18n ("Away"), \
                Kopete::OnlineStatusManager::Away, \
                Kopete::OnlineStatusManager::HasStatusMessage),
-	JabberKOSXA(Kopete::OnlineStatus::Away,               70, this, JabberXA, \
QStringList("contact_xa_overlay"), i18n ("Extended Away"), i18n ("Extended Away"), 0, \
                Kopete::OnlineStatusManager::HasStatusMessage),
-	JabberKOSDND(Kopete::OnlineStatus::Away,              60, this, JabberDND, \
QStringList("contact_busy_overlay"), i18n ("Do not Disturb"), i18n ("Do not \
Disturb"), Kopete::OnlineStatusManager::Busy, \
Kopete::OnlineStatusManager::HasStatusMessage), \
+	JabberKOSXA(Kopete::OnlineStatus::Away,               70, this, JabberXA, \
QStringList("contact_xa_overlay"), i18n ("Extended Away"), i18n ("Extended Away"), \
Kopete::OnlineStatusManager::ExtendedAway, \
Kopete::OnlineStatusManager::HasStatusMessage), \
+	JabberKOSDND(Kopete::OnlineStatus::Busy,              60, this, JabberDND, \
QStringList("contact_busy_overlay"), i18n ("Do not Disturb"), i18n ("Do not \
Disturb"), Kopete::OnlineStatusManager::Busy, \
Kopete::OnlineStatusManager::HasStatusMessage),  \
JabberKOSOffline(Kopete::OnlineStatus::Offline,       50, this, JabberOffline, \
QStringList(), i18n ("Offline") ,i18n ("Offline"), \
Kopete::OnlineStatusManager::Offline, Kopete::OnlineStatusManager::HasStatusMessage \
),  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")),


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