From 890d7891c4b6be01c6cfaa0beaac2c00f99540aa Mon Sep 17 00:00:00 2001 From: chrisparker126 Date: Thu, 20 Dec 2012 20:22:22 +0000 Subject: [PATCH] To fix msg synchronisation and validation git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs_sync-validate-fix@6024 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- libretroshare/src/gxs/rsgxsifaceimpl.h | 5 +++-- libretroshare/src/libretroshare.pro | 18 ++++++++-------- openpgpsdk/src/openpgpsdk.pro | 7 ++++--- retroshare-gui/src/retroshare-gui.pro | 29 ++++++++++++++------------ 4 files changed, 32 insertions(+), 27 deletions(-) diff --git a/libretroshare/src/gxs/rsgxsifaceimpl.h b/libretroshare/src/gxs/rsgxsifaceimpl.h index 73d314259..055876349 100644 --- a/libretroshare/src/gxs/rsgxsifaceimpl.h +++ b/libretroshare/src/gxs/rsgxsifaceimpl.h @@ -46,6 +46,7 @@ public: */ RsGxsIfaceImpl(RsGenExchange* gxs); +protected: /*! * Gxs services should call this for automatic handling of * changes, send @@ -53,6 +54,8 @@ public: */ void receiveChanges(std::vector& changes); +public: + /*! * Checks to see if a change has been received for * for a message or group @@ -60,8 +63,6 @@ public: */ virtual bool updated(); -public: - /*! * The groups changed. \n * class can reimplement to use to tailor diff --git a/libretroshare/src/libretroshare.pro b/libretroshare/src/libretroshare.pro index 21b1b20d7..95af77df0 100644 --- a/libretroshare/src/libretroshare.pro +++ b/libretroshare/src/libretroshare.pro @@ -7,7 +7,7 @@ CONFIG += test_voip # GXS Stuff. # This should be disabled for releases until further notice. -#CONFIG += gxs +CONFIG += gxs # Beware: All data of the stripped services are lost DEFINES *= PQI_DISABLE_TUNNEL @@ -238,19 +238,19 @@ win32 { CONFIG += upnp_miniupnpc - UPNPC_DIR = ../../../miniupnpc-1.3 - - PTHREADS_DIR = ../../../pthreads-w32-2-8-0-release - ZLIB_DIR = ../../../zlib-1.2.3 - SSL_DIR = ../../../openssl-1.0.1c - OPENPGPSDK_DIR = ../../openpgpsdk/src + UPNPC_DIR = ../../../lib/miniupnpc-1.3 + PTHREADS_DIR = ../../../lib/pthreads-w32-2-8-0-release + ZLIB_DIR = ../../../lib/zlib-1.2.3 + SSL_DIR = ../../../OpenSSL + OPENPGPSDK_DIR = ../../openpgpsdk/src INCLUDEPATH += . $${SSL_DIR}/include $${UPNPC_DIR} $${PTHREADS_DIR} $${ZLIB_DIR} $${OPENPGPSDK_DIR} # SQLite include path is required to compile GXS. gxs { - SQLITE_DIR = ../../../sqlite-autoconf-3070900 - INCLUDEPATH += $${SQLITE_DIR} + SQLITE_DIR = ../../../../Libraries/sqlite/sqlite-autoconf-3070900 + INCLUDEPATH += . \ + $${SQLITE_DIR} } } diff --git a/openpgpsdk/src/openpgpsdk.pro b/openpgpsdk/src/openpgpsdk.pro index c7b58edbd..3eee869f2 100644 --- a/openpgpsdk/src/openpgpsdk.pro +++ b/openpgpsdk/src/openpgpsdk.pro @@ -27,9 +27,10 @@ win32 { #QMAKE_CXXFLAGS_DEBUG += -O2 #QMAKE_CFLAGS_DEBUG += -O2 - SSL_DIR = ../../../openssl-1.0.1c - ZLIB_DIR = ../../../zlib-1.2.3 - BZIP_DIR = ../../../bzip2-1.0.6 + SSL_DIR = ../../../OpenSSL + ZLIB_DIR = ../../../lib/zlib-1.2.3 + BZIP_DIR = ../../../lib/bzip2-1.0.6 + INCLUDEPATH += $${SSL_DIR}/include $${ZLIB_DIR} $${BZIP_DIR} } diff --git a/retroshare-gui/src/retroshare-gui.pro b/retroshare-gui/src/retroshare-gui.pro index 5b37736c8..1b17b2976 100644 --- a/retroshare-gui/src/retroshare-gui.pro +++ b/retroshare-gui/src/retroshare-gui.pro @@ -2,7 +2,7 @@ CONFIG += qt gui uic qrc resources uitools idle bitdht # Below is for GXS services. # Should be disabled for releases. -#CONFIG += gxs +CONFIG += gxs gxs { CONFIG += photoshare @@ -139,22 +139,23 @@ win32 { #LIBS += -L"D/Qt/2009.03/qt/plugins/imageformats" #QTPLUGIN += qjpeg - PRE_TARGETDEPS *= ../../libretroshare/src/lib/libretroshare.a - PRE_TARGETDEPS *= ../../openpgpsdk/src/lib/libops.a + PRE_TARGETDEPS += ../../libretroshare/libretroshare-build-desktop/lib/libretroshare.a + LIBS += ../../libretroshare/libretroshare-build-desktop/lib/libretroshare.a - LIBS += ../../libretroshare/src/lib/libretroshare.a - LIBS += ../../openpgpsdk/src/lib/libops.a -lbz2 - LIBS += -L"../../../lib" + + LIBS += C:\Development\Rs\rs_trunk\openpgpsdk\openpgpsdk-build-desktop\lib\libops.a + + LIBS += -L"../../../lib" LIBS += -lssl -lcrypto -lpthreadGC2d -lminiupnpc -lz # added after bitdht # LIBS += -lws2_32 - LIBS += -luuid -lole32 -liphlpapi -lcrypt32-cygwin -lgdi32 + LIBS += -luuid -lole32 -liphlpapi -lcrypt32-cygwin -lgdi32 -lbz2 LIBS += -lole32 -lwinmm RC_FILE = gui/images/retroshare_win.rc gxs { - LIBS += ../../supportlibs/pegmarkdown/lib/libpegmarkdown.a - LIBS += -lsqlite3 + LIBS += C:\Development\Rs\rs_trunk\supportlibs\pegmarkdown-build-desktop\lib\libpegmarkdown.a + LIBS += C:\Development\Libraries\sqlite\sqlite-autoconf-3070900\.libs\libsqlite3.a } # export symbols for the plugins @@ -223,8 +224,8 @@ freebsd-* { # ########################################### bitdht { - LIBS += ../../libbitdht/src/lib/libbitdht.a - PRE_TARGETDEPS *= ../../libbitdht/src/lib/libbitdht.a + LIBS += C:\Development\Rs\rs_trunk\libbitdht\libbitdht-build-desktop\lib\libbitdht.a + PRE_TARGETDEPS *= C:\Development\Rs\rs_trunk\libbitdht\libbitdht-build-desktop\lib\libbitdht.a } win32 { @@ -453,7 +454,8 @@ HEADERS += rshare.h \ gui/groups/CreateGroup.h \ gui/dht/DhtWindow.h \ gui/bwctrl/BwCtrlWindow.h \ - gui/GetStartedDialog.h + gui/GetStartedDialog.h \ + util/RsGxsUpdateBroadcast.h FORMS += gui/StartDialog.ui \ @@ -746,7 +748,8 @@ SOURCES += main.cpp \ gui/groups/CreateGroup.cpp \ gui/dht/DhtWindow.cpp \ gui/bwctrl/BwCtrlWindow.cpp \ - gui/GetStartedDialog.cpp + gui/GetStartedDialog.cpp \ + util/RsGxsUpdateBroadcast.cpp RESOURCES += gui/images.qrc lang/lang.qrc gui/help/content/content.qrc