Code

manually merging the INKBOARD_PEDRO branch into trunk
authordaleharvey <daleharvey@users.sourceforge.net>
Fri, 23 Jun 2006 13:15:16 +0000 (13:15 +0000)
committerdaleharvey <daleharvey@users.sourceforge.net>
Fri, 23 Jun 2006 13:15:16 +0000 (13:15 +0000)
commit535b1596de71acb960a629b0f34f0d2171a34348
tree41c3f39b304687f41ec169c8aa95a5984aa5910f
parentc73fd7fd8d1713c95ecf111e49dd068d4b9adf69
manually merging the INKBOARD_PEDRO branch into trunk
84 files changed:
configure.ac
mkinstalldirs
pedro.ini [new file with mode: 0644]
src/Makefile.am
src/Makefile_insert
src/desktop.cpp
src/document.cpp
src/document.h
src/file.cpp
src/jabber_whiteboard/Makefile_insert
src/jabber_whiteboard/buddy-list-manager.cpp [deleted file]
src/jabber_whiteboard/buddy-list-manager.h [deleted file]
src/jabber_whiteboard/callbacks.cpp [deleted file]
src/jabber_whiteboard/callbacks.h [deleted file]
src/jabber_whiteboard/chat-handler.cpp [deleted file]
src/jabber_whiteboard/chat-handler.h [deleted file]
src/jabber_whiteboard/connection-establishment.cpp [deleted file]
src/jabber_whiteboard/defines.h
src/jabber_whiteboard/deserializer.cpp [deleted file]
src/jabber_whiteboard/deserializer.h [deleted file]
src/jabber_whiteboard/empty.cpp
src/jabber_whiteboard/error-codes.h [deleted file]
src/jabber_whiteboard/inkboard-document.cpp [new file with mode: 0644]
src/jabber_whiteboard/inkboard-document.h [new file with mode: 0644]
src/jabber_whiteboard/inkboard-session.cpp [new file with mode: 0644]
src/jabber_whiteboard/inkboard-session.h [new file with mode: 0644]
src/jabber_whiteboard/internal-constants.cpp
src/jabber_whiteboard/internal-constants.h
src/jabber_whiteboard/invitation-confirm-dialog.cpp
src/jabber_whiteboard/invitation-confirm-dialog.h
src/jabber_whiteboard/invitation-handlers.cpp [new file with mode: 0644]
src/jabber_whiteboard/jabber-handlers.cpp [deleted file]
src/jabber_whiteboard/jabber-handlers.h [deleted file]
src/jabber_whiteboard/keynode.cpp [new file with mode: 0644]
src/jabber_whiteboard/keynode.h [new file with mode: 0644]
src/jabber_whiteboard/message-aggregator.cpp
src/jabber_whiteboard/message-aggregator.h
src/jabber_whiteboard/message-contexts.cpp [deleted file]
src/jabber_whiteboard/message-contexts.h [deleted file]
src/jabber_whiteboard/message-handler.cpp [deleted file]
src/jabber_whiteboard/message-handler.h [deleted file]
src/jabber_whiteboard/message-node.h
src/jabber_whiteboard/message-processors.cpp [deleted file]
src/jabber_whiteboard/message-processors.h [deleted file]
src/jabber_whiteboard/message-queue.cpp
src/jabber_whiteboard/message-queue.h
src/jabber_whiteboard/message-tags.cpp
src/jabber_whiteboard/message-tags.h
src/jabber_whiteboard/message-utilities.cpp
src/jabber_whiteboard/message-utilities.h
src/jabber_whiteboard/message-verifier.h [new file with mode: 0644]
src/jabber_whiteboard/new-inkboard-document.cpp [new file with mode: 0644]
src/jabber_whiteboard/new-inkboard-document.h [new file with mode: 0644]
src/jabber_whiteboard/node-tracker-event-tracker.cpp [deleted file]
src/jabber_whiteboard/node-tracker-event-tracker.h [deleted file]
src/jabber_whiteboard/node-tracker-observer.h [deleted file]
src/jabber_whiteboard/node-tracker.cpp
src/jabber_whiteboard/node-tracker.h
src/jabber_whiteboard/node-utilities.cpp
src/jabber_whiteboard/node-utilities.h
src/jabber_whiteboard/pedrodom.cpp [deleted file]
src/jabber_whiteboard/pedrodom.h [deleted file]
src/jabber_whiteboard/pedroxmpp.cpp [deleted file]
src/jabber_whiteboard/pedroxmpp.h [deleted file]
src/jabber_whiteboard/serializer.cpp [deleted file]
src/jabber_whiteboard/serializer.h [deleted file]
src/jabber_whiteboard/session-file-player.cpp [deleted file]
src/jabber_whiteboard/session-file-player.h [deleted file]
src/jabber_whiteboard/session-file-selector.cpp
src/jabber_whiteboard/session-file-selector.h
src/jabber_whiteboard/session-file.cpp [deleted file]
src/jabber_whiteboard/session-file.h [deleted file]
src/jabber_whiteboard/session-manager.cpp
src/jabber_whiteboard/session-manager.h
src/jabber_whiteboard/tracker-node.h
src/jabber_whiteboard/typedefs.h
src/jabber_whiteboard/undo-stack-observer.cpp [deleted file]
src/jabber_whiteboard/undo-stack-observer.h [deleted file]
src/menus-skeleton.h
src/ui/dialog/Makefile_insert
src/ui/dialog/dialog-manager.cpp
src/ui/view/edit-widget.cpp
src/verbs.cpp
src/verbs.h