From bcce0a6c16acf9af63ea1b9b4bf9add12104ea75 Mon Sep 17 00:00:00 2001
From: HanzZ <hanzz.k@gmail.com>
Date: Tue, 27 Sep 2011 20:46:48 +0200
Subject: [PATCH] Added StatusType into protobuf protocol

---
 src/networkplugin.cpp       |  4 ++--
 src/networkpluginserver.cpp | 10 +++++-----
 src/pbnetwork.proto         | 16 +++++++++++++---
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/networkplugin.cpp b/src/networkplugin.cpp
index d16a827f..eb18a86d 100644
--- a/src/networkplugin.cpp
+++ b/src/networkplugin.cpp
@@ -138,7 +138,7 @@ void NetworkPlugin::handleBuddyChanged(const std::string &user, const std::strin
 	buddy.set_buddyname(buddyName);
 	buddy.set_alias(alias);
 	buddy.set_groups(groups);
-	buddy.set_status((int)status);
+	buddy.set_status((pbnetwork::StatusType) status);
 	buddy.set_statusmessage(statusMessage);
 	buddy.set_iconhash(iconHash);
 	buddy.set_blocked(blocked);
@@ -237,7 +237,7 @@ void NetworkPlugin::handleParticipantChanged(const std::string &user, const std:
 	d.set_room(room);
 	d.set_flag(flags);
 	d.set_newname(newname);
-	d.set_status(status);
+	d.set_status((pbnetwork::StatusType) status);
 	d.set_statusmessage(statusMessage);
 
 	std::string message;
diff --git a/src/networkpluginserver.cpp b/src/networkpluginserver.cpp
index 8fdaf0b9..939c67e0 100644
--- a/src/networkpluginserver.cpp
+++ b/src/networkpluginserver.cpp
@@ -838,10 +838,10 @@ void NetworkPluginServer::handleUserPresenceChanged(User *user, Swift::Presence:
 	bool isInvisible = presence->getPayload<Swift::InvisiblePayload>() != NULL;
 	if (isInvisible) {
 		LOG4CXX_INFO(logger, "This presence is invisible");
-		status.set_status(255);
+		status.set_status((pbnetwork::STATUS_INVISIBLE));
 	}
 	else {
-		status.set_status((int) presence->getShow());
+		status.set_status((pbnetwork::StatusType) presence->getShow());
 	}
 
 	status.set_statusmessage(presence->getStatus());
@@ -1030,7 +1030,7 @@ void NetworkPluginServer::handleBuddyRemoved(Buddy *b) {
 	buddy.set_buddyname(b->getName());
 	buddy.set_alias(b->getAlias());
 	buddy.set_groups(b->getGroups().size() == 0 ? "" : b->getGroups()[0]);
-	buddy.set_status(Swift::StatusShow::None);
+	buddy.set_status(pbnetwork::STATUS_NONE);
 
 	std::string message;
 	buddy.SerializeToString(&message);
@@ -1056,7 +1056,7 @@ void NetworkPluginServer::handleBuddyUpdated(Buddy *b, const Swift::RosterItemPa
 	buddy.set_buddyname(b->getName());
 	buddy.set_alias(b->getAlias());
 	buddy.set_groups(b->getGroups().size() == 0 ? "" : b->getGroups()[0]);
-	buddy.set_status(Swift::StatusShow::None);
+	buddy.set_status(pbnetwork::STATUS_NONE);
 
 	std::string message;
 	buddy.SerializeToString(&message);
@@ -1082,7 +1082,7 @@ void NetworkPluginServer::handleBlockToggled(Buddy *b) {
 	buddy.set_buddyname(b->getName());
 	buddy.set_alias(b->getAlias());
 	buddy.set_groups(b->getGroups().size() == 0 ? "" : b->getGroups()[0]);
-	buddy.set_status(Swift::StatusShow::None);
+	buddy.set_status(pbnetwork::STATUS_NONE);
 	buddy.set_blocked(!b->isBlocked());
 
 	std::string message;
diff --git a/src/pbnetwork.proto b/src/pbnetwork.proto
index 0a77b850..b478bb15 100644
--- a/src/pbnetwork.proto
+++ b/src/pbnetwork.proto
@@ -1,5 +1,15 @@
 package pbnetwork;
 
+enum StatusType {
+	STATUS_ONLINE		= 0;
+	STATUS_AWAY			= 1;
+	STATUS_FFC			= 2;
+	STATUS_XA			= 3;
+	STATUS_DND			= 4;
+	STATUS_NONE			= 5;
+	STATUS_INVISIBLE	= 6;
+}
+
 message Connected {
 	required string user = 1;
 }
@@ -26,7 +36,7 @@ message Buddy {
 	required string buddyName = 2;
 	optional string alias = 3;
 	optional string groups = 4;
-	optional int32 status = 5;
+	optional StatusType status = 5;
 	optional string statusMessage = 6;
 	optional string iconHash = 7;
 	optional bool blocked = 8;
@@ -52,7 +62,7 @@ message Participant {
 	required string room = 2;
 	required string nickname = 3;
 	required int32 flag = 4;
-	required int32 status = 5;
+	required StatusType status = 5;
 	optional string statusMessage = 6;
 	optional string newname = 7;
 }
@@ -68,7 +78,7 @@ message VCard {
 
 message Status {
 	required string userName = 1;
-	required int32 status = 3;
+	required StatusType status = 3;
 	optional string statusMessage = 4;
 }