separate updating window from updating layers

[inkscape.git] / src / jabber_whiteboard / defines.h

diff --git a/src/jabber_whiteboard/defines.h b/src/jabber_whiteboard/defines.h
index 675e1313615ad24158dbf5258e79c029560e0694..a9bc80ca6b1072193d6fa60bfe98fe921551867b 100644 (file)
--- a/src/jabber_whiteboard/defines.h
+++ b/src/jabber_whiteboard/defines.h
@@ -13,6 +13,7 @@
 #ifndef __INKSCAPE_WHITEBOARD_DEFINES_H__
 #define __INKSCAPE_WHITEBOARD_DEFINES_H__
 
+#include "xml/node.h"
 #include "jabber_whiteboard/message-tags.h"
 
 #include <algorithm>
@@ -26,8 +27,6 @@
 #include <glibmm.h>
 #include <sigc++/sigc++.h>
 
-#include "jabber_whiteboard/keynode.h"
-
 #include "gc-alloc.h"
 
 // Various specializations of std::less for XMLNodeTracker maps.
@@ -42,10 +41,10 @@ using Inkscape::XML::Node;
 template<>
 struct less< Node* > : public binary_function < Node*, Node*, bool >
 {
-       bool operator()(Node* _x, Node* _y) const
-       {
-               return _x < _y;
-       }
+    bool operator()(Node* _x, Node* _y) const
+    {
+        return _x < _y;
+    }
 
 };
 
@@ -99,9 +98,6 @@ namespace Vars {
     extern const std::string MOVE_MESSAGE; 
     extern const std::string REMOVE_MESSAGE; 
 
-
-
-
 }
 
 namespace State {
@@ -136,10 +132,10 @@ namespace Dialog {
 
 }
 
-// message types
-// explicitly numbered to aid protocol description later on
-
+class KeyNodePair;
+class KeyNodeTable;
 
+typedef std::pair<Glib::ustring, Glib::ustring> Configure;
 
 // Message handler modes
 enum HandlerMode {