X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fjabber_whiteboard%2Fdefines.cpp;h=ad064126016c92b30d942f7984813115746b2619;hb=205a481ac2cd26acf27b5edc2ac34665100f06fd;hp=3e3895ea04207e71e77e02e48e039ef0eadba4e2;hpb=f8baee4ba103cf6d6be4012d6fe0484861665e8f;p=inkscape.git

diff --git a/src/jabber_whiteboard/defines.cpp b/src/jabber_whiteboard/defines.cpp
index 3e3895ea0..ad0641260 100644
--- a/src/jabber_whiteboard/defines.cpp
+++ b/src/jabber_whiteboard/defines.cpp
@@ -21,30 +21,53 @@ namespace Whiteboard {
 
 namespace Message {
 
-    Wrapper PROTOCOL =     "protocol";
-    Wrapper NEW =          "new";
-    Wrapper REMOVE =       "remove";
-    Wrapper CONFIGURE =    "configure";
-    Wrapper MOVE =         "move";
-
-    Message CONNECT_REQUEST =     "<connect-request />";
-    Message CONNECTED =           "<connected />";
-    Message ACCEPT_INVITATION =   "<accept-invitation />";
-    Message DECLINE_INVITATION =  "<decline-invitation />";
-    Message DOCUMENT_BEGIN =      "<document-begin />";
-    Message DOCUMENT_END =        "<document-end />";
+    Wrapper PROTOCOL       ("protocol");
+    Wrapper NEW            ("new");
+    Wrapper REMOVE         ("remove");
+    Wrapper CONFIGURE      ("configure");
+    Wrapper MOVE           ("move");
+
+    Message CONNECT_REQUEST       ("connect-request");
+    Message CONNECTED             ("connected");
+    Message ACCEPT_INVITATION     ("accept-invitation");
+    Message DECLINE_INVITATION    ("decline-invitation");
+    Message DOCUMENT_BEGIN        ("document-begin");
+    Message DOCUMENT_END          ("document-end");
 }
 
 namespace Vars {
 
-    char const* INKBOARD_XMLNS =    "http://inkscape.org/inkboard"; 
+    const std::string DOCUMENT_ROOT_NODE("ROOT"); 
+    const std::string INKBOARD_XMLNS("http://inkscape.org/inkboard"); 
 
+    const std::string WHITEBOARD_MESSAGE(
+        "<message type='%1' from='%2' to='%3'>"
+            "<wb xmlns='%4' session='%5'>%6</wb>"
+        "</message>"); 
+
+    const std::string PROTOCOL_MESSAGE(
+        "<%1><%2 /></%1>");
+
+    const std::string NEW_MESSAGE(
+        "<new parent=\"%1\" id=\"%2\" index=\"%3\" version=\"%4\">%5</new>");
+
+    const std::string CONFIGURE_MESSAGE(
+        "<configure target=\"%1\" version=\"%2\" attribute=\"%3\" value=\"%4\" />");
+
+    const std::string CONFIGURE_TEXT_MESSAGE(
+        "<configure target=\"%1\" version=\"%2\"><text>%3</text></configure>");
+
+    const std::string MOVE_MESSAGE(
+        "<move target=\"%1\" n=\"%2\" />");
+
+    const std::string REMOVE_MESSAGE(
+        "<remove target=\"%1\" />");
 }
 
 namespace State {
 
-    SessionType WHITEBOARD_MUC =    "groupchat"; 
-    SessionType WHITEBOARD_PEER =   "chat";
+    SessionType WHITEBOARD_MUC      ("groupchat"); 
+    SessionType WHITEBOARD_PEER     ("chat");
 
 }
 
@@ -75,23 +98,6 @@ char const* DOCUMENT_NAMEDVIEW_NODE =	"NAMEDVIEW";
 char const* DOCUMENT_ROOT_NAME =		"svg:svg";
 char const* DOCUMENT_NAMEDVIEW_NAME =	"sodipodi:namedview";
 
-// Inkboard client states
-int const IN_WHITEBOARD =				0;
-int const LOGGED_IN	=					1;
-int const IN_CHATROOM =					2;
-int const WAITING_FOR_INVITE_RESPONSE =	3;
-int const CONNECTING_TO_CHAT =			4;
-int const WAITING_TO_SYNC_TO_CHAT =		5;
-int const SYNCHRONIZING_WITH_CHAT =		6;
-int const OPEN_FOR_DOC =				7;
-int const PLAYING_SESSION_FILE =		8;
-
-// TODO: make this user-configurable, within sane limits
-// ("sane" limits being roughly in the range (10, 100], from personal testing)
-// Based on discussions with Ted, it seems that we're going to make the Jabber guys
-// accomodate Inkscape, not the other way around...
-// Dispatch interval (in milliseconds)
-int const SEND_TIMEOUT = 35;
 
 }
 }