small changes to allow compilation on windows

diff --git a/Makefile.mingw.common b/Makefile.mingw.common
index e9533b0f8bba8a0d40e75c2444f6d9a2157b005d..a3d6680125fe17459b1fbe9d78372ad18b130b31 100644 (file)
--- a/Makefile.mingw.common
+++ b/Makefile.mingw.common
@@ -148,7 +148,7 @@ CFLAGS = -O3 -Wall -mms-bitfields -DVERSION=$(VERSION) \
 
 ####### Inkboard abilities.
 ####### You must 'make -f Makefile.mingw clean' when turning this on or off
-##CFLAGS += -DWITH_INKBOARD
+CFLAGS += -DWITH_INKBOARD
 
 ####### IMPLICIT RULES
 .cpp.o:

diff --git a/src/make.exclude b/src/make.exclude
index 6ac66cc777f333a5849f483704fb05139c90ab96..e23adc6c37b859200c13f0fa77cf5409794f9a92 100644 (file)
--- a/src/make.exclude
+++ b/src/make.exclude
@@ -39,7 +39,6 @@ libnr/nr-types-test.cpp
 livarot/Path-test.cpp
 main.cpp
 mod360-test.cpp
-pedro
 trace/potrace/potest.cpp
 round-test.cpp
 sp-gradient-test.cpp
@@ -57,24 +56,25 @@ io/streamtest.cpp
 # For the moment, DO NOT remove these from cvs
 # until those files compile everywhere
 ###############################################
-# Uncomment the following to prevent building with Loudmouth
-###############################################
-dialogs/whiteboard-connect-dialog.cpp
-dialogs/whiteboard-common-dialog.cpp
-dialogs/whiteboard-sharewithchat-dialog.cpp
-dialogs/whiteboard-sharewithuser-dialog.cpp
-jabber_whiteboard
 ui/dialog/session-player.cpp
 ui/dialog/whiteboard-connect.cpp
 ui/dialog/whiteboard-sharewithchat.cpp
 ui/dialog/whiteboard-sharewithuser.cpp
+dialogs/whiteboard-connect-dialog.cpp
+dialogs/whiteboard-common-dialog.cpp
+dialogs/whiteboard-sharewithchat-dialog.cpp
+dialogs/whiteboard-sharewithuser-dialog.cpp
+
 ###############################################
-# Uncomment the following to prevent building with Pedro
+# Uncomment the following to prevent building with Loudmouth
 ###############################################
-jabber_whiteboard/pedroxmpp.h
-jabber_whiteboard/pedrodom.h
-jabber_whiteboard/pedroxmpp.cpp
-jabber_whiteboard/pedrodom.cpp
+jabber_whiteboard/node-tracker.cpp
+jabber_whiteboard/inkboard-session.h
+jabber_whiteboard/message-verifier.h
+jabber_whiteboard/node-tracker.h
+jabber_whiteboard/node-utilities.h
+jabber_whiteboard/inkboard-session.cpp
+jabber_whiteboard/node-utilities.cpp
 
 ###############################################
 # Various test harnesses in removeoverlap

diff --git a/src/pedro/work/filerec.cpp b/src/pedro/work/filerec.cpp
index 9fc8b8647d5be722d9cc2573bc05e9762975677f..01d9b6bd89e231f69fdc161b38a16050aa3cc666 100644 (file)
--- a/src/pedro/work/filerec.cpp
+++ b/src/pedro/work/filerec.cpp
@@ -102,7 +102,8 @@ bool doTest()
         }
 
     printf("#####GOT A FILE\n");
-
+/*
+TODO: Just Commented out to compile
     if (!client.fileReceive(listener.from, 
                             listener.iqId,
                             listener.streamId, 
@@ -112,7 +113,7 @@ bool doTest()
         {
         return false;
         }   
-
+*/
     client.pause(1000000);
 
     client.disconnect();

diff --git a/src/pedro/work/groupchat.cpp b/src/pedro/work/groupchat.cpp
index 38a17abb6ebe0612c7fa46e48e1248f9f582f474..6c2e186d9a005c78295868f1df1755e789a5fd3a 100644 (file)
--- a/src/pedro/work/groupchat.cpp
+++ b/src/pedro/work/groupchat.cpp
@@ -53,7 +53,8 @@ public:
                 {
                 printf("PRESENCE\n");
                 printf("from     : %s\n", evt.getFrom().c_str());
-                printf("presence : %s\n", evt.getPresence().c_str());
+                //printf("presence : %s\n", evt.getPresence().c_str());
+                // TODO: Just Commented out to compile
                 break;
                 }
             case Pedro::XmppEvent::EVENT_MUC_MESSAGE:
@@ -66,7 +67,8 @@ public:
                 printf("MUC JOIN\n");
                 printf("group: %s\n", evt.getGroup().c_str());
                 printf("from    : %s\n", evt.getFrom().c_str());
-                printf("presence: %s\n", evt.getPresence().c_str());
+                //printf("presence: %s\n", evt.getPresence().c_str());
+                // TODO: Just Commented out to compile
                 break;
                 }
             case Pedro::XmppEvent::EVENT_MUC_LEAVE:
@@ -74,7 +76,8 @@ public:
                 printf("MUC LEAVE\n");
                 printf("group: %s\n", evt.getGroup().c_str());
                 printf("from    : %s\n", evt.getFrom().c_str());
-                printf("presence: %s\n", evt.getPresence().c_str());
+                //printf("presence: %s\n", evt.getPresence().c_str());
+                // TODO: Just Commented out to compile
                 break;
                 }
             case Pedro::XmppEvent::EVENT_MUC_PRESENCE:
@@ -82,7 +85,8 @@ public:
                 printf("MUC PRESENCE\n");
                 printf("group   : %s\n", evt.getGroup().c_str());
                 printf("from    : %s\n", evt.getFrom().c_str());
-                printf("presence: %s\n", evt.getPresence().c_str());
+                //printf("presence: %s\n", evt.getPresence().c_str());
+                // TODO: Just Commented out to compile
                 break;
                 }