merged upstream/master

build_scripts/Debian+Ubuntu/control.jessie

@@ -0,0 +1,44 @@
+Source: retroshare06
+Section: devel
+Priority: standard
+Maintainer: Cyril Soler <csoler@users.sourceforge.net>
+Build-Depends: debhelper (>= 7),  libglib2.0-dev, libupnp-dev, libssl-dev, libxss-dev, libgnome-keyring-dev, libbz2-dev, libspeex-dev, libspeexdsp-dev, libxslt1-dev, cmake, libcurl4-openssl-dev, libopencv-dev, tcl8.6, libsqlcipher-dev, libmicrohttpd-dev, libavcodec-dev, qtmultimedia5-dev, qttools5-dev, libqt5x11extras5-dev, qt5-default
+Standards-Version: 3.9.6
+Homepage: http://retroshare.sourceforge.net
+
+Package: retroshare06-voip-plugin
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare06, libspeex1, libspeexdsp1, libqt5multimedia5
+Description: RetroShare VOIP plugin
+ This package provides a plugin for RetroShare, a secured Friend-to-Friend communication 
+ plateform. The plugin adds voice-over-IP functionality to the private chat window. Both
+ friends chatting together need the plugin installed to be able to talk together.
+
+Package: retroshare06-feedreader-plugin
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, retroshare06
+Description: RetroShare FeedReader plugin
+ This package provides a plugin for RetroShare, a secured Friend-to-Friend communication 
+ plateform. The plugin adds a RSS feed reader tab to retroshare.
+
+Package: retroshare06-nogui
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring
+Conflicts: retroshare06
+Description: Secure communication with friends
+ This is the command-line client for RetroShare network. This client
+ can be contacted and talked-to using SSL. Clients exist for portable
+ devices running e.g. Android. 
+
+Package: retroshare06
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, gnome-keyring
+Conflicts: retroshare06-nogui
+Description: Secure communication with friends
+ RetroShare is a Open Source cross-platform, private and secure decentralised 
+ commmunication platform. It lets you to securely chat and share files with your 
+ friends and family, using a web-of-trust to authenticate peers and OpenSSL to 
+ encrypt all communication. RetroShare provides filesharing, chat, messages, 
+ forums and channels.
+
+

build_scripts/Debian+Ubuntu/makeSourcePackage.sh

@@ -20,6 +20,12 @@ dist=""
 # This is the key for "Cyril Soler <csoler@sourceforge.net>"
 gpgkey="0932399B"
 
+date=`git log --pretty=format:"%ai" | head -1 | cut -d\  -f1 | sed -e s/-//g`
+time=`git log --pretty=format:"%aD" | head -1 | cut -d\  -f5 | sed -e s/://g`
+hhsh=`git log --pretty=format:"%H" | head -1 | cut -c1-8`
+
+rev=${date}.${hhsh}
+
 while [ ${#} -gt 0 ]; do
     case ${1} in
         "-rev") shift
@@ -54,12 +60,6 @@ echo Attempting to get revision number...
 ccount=`git rev-list --count --all`
 ccount=`expr $ccount + 8613 - 8267`
 
-date=`git log --pretty=format:"%ai" | head -1 | cut -d\  -f1 | sed -e s/-//g`
-time=`git log --pretty=format:"%aD" | head -1 | cut -d\  -f5 | sed -e s/://g`
-hhsh=`git log --pretty=format:"%H" | head -1 | cut -c1-8`
-
-rev=${date}.${hhsh}
-
 echo "  "Using PGP key id   : ${gpgkey}
 echo "  "Using distributions: ${dist}
 echo "  "Commit count       : ${ccount}
@@ -137,7 +137,8 @@ for i in ${dist}; do
         cp ../control.xenial debian/control
     elif test "${i}" = "stretch" ; then
         cp ../control.${i} debian/control
-        cp ../rules.${i} debian/rules
+    elif test "${i}" = "jessie" ; then
+        cp ../control.${i} debian/control
     else
         cp ../debian/control debian/control
     fi

build_scripts/Debian+Ubuntu/ppa_upload.sh

@@ -1,4 +1,4 @@
 #!/bin/sh
-for i in `ls retroshare06_0.6.0-1.*.changes` ; do
+for i in `ls retroshare06_0.6.1-1.*.changes` ; do
 	dput ppa:retroshare/unstable $i
 done

libbitdht/src/udp/udplayer.cc

@@ -243,74 +243,66 @@ void UdpLayer::run()
 /* higher level interface */
 void UdpLayer::recv_loop()
 {
-	int maxsize = 16000;
+	size_t maxsize = 16000;
 	void *inbuf = malloc(maxsize);
 
-    	if(inbuf == NULL)
+	if(inbuf == NULL)
-        {
+	{
-            std::cerr << "(EE) Error in memory allocation of size " << maxsize << " in " << __PRETTY_FUNCTION__ << std::endl;
+		std::cerr << "(EE) Error in memory allocation of size " << maxsize
-            return ;
+		          << " in " << __PRETTY_FUNCTION__ << std::endl;
-        }
+		return;
-        
+	}
-        int status;
+
-        struct timeval timeout;
+	int status;
+	struct timeval timeout;
 
 	while(1)
 	{
-                fd_set rset;
+		for(;;)
-                for(;;) 
 		{
 			/* check if we need to stop */
 			bool toStop = false;
 			{
-				bdStackMutex stack(sockMtx);   /********** LOCK MUTEX *********/
+				bdStackMutex stack(sockMtx); (void) stack;
 				toStop = stopThread;
 			}
-			
+
 			if (toStop)
 			{
 #ifdef DEBUG_UDP_LAYER
 				std::cerr << "UdpLayer::recv_loop() stopping thread" << std::endl;
 #endif
-                free(inbuf) ;
+				free(inbuf);
 				stop();
+				return; // Avoid compiler warning about usage of inbuf after free
 			}
 
-                        FD_ZERO(&rset);
+			fd_set rset;
-                        FD_SET(sockfd, &rset);
+			FD_ZERO(&rset);
-                        timeout.tv_sec = 0;
+			FD_SET(sockfd, &rset);
-                        timeout.tv_usec = 500000;       /* 500 ms timeout */
+			timeout.tv_sec = 0;
-                        status = select(sockfd+1, &rset, NULL, NULL, &timeout);
+			timeout.tv_usec = 500000; // 500 ms timeout
-                        if (status > 0)
+			status = select(sockfd+1, &rset, NULL, NULL, &timeout);
-			{
+			if (status > 0) break; // data available, go read it
-                                break;  /* data available, go read it */
-                        } 
-			else if (status < 0) 
-			{
 #ifdef DEBUG_UDP_LAYER
-                                std::cerr << "UdpLayer::recv_loop() Error: " << bdnet_errno() << std::endl;
+			else if (status < 0) std::cerr << "UdpLayer::recv_loop() Error: "
+			                               << bdnet_errno() << std::endl;
 #endif
-                        }
+		};
-                };      
 
-		int nsize = maxsize;
+		int nsize = static_cast<int>(maxsize);
 		struct sockaddr_in from;
 		if (0 < receiveUdpPacket(inbuf, &nsize, from))
 		{
 #ifdef DEBUG_UDP_LAYER
-			std::cerr << "UdpLayer::readPkt()  from : " << from << std::endl;
+			std::cerr << "UdpLayer::readPkt()  from : " << from << std::endl
-			std::cerr << printPkt(inbuf, nsize);
+			          << printPkt(inbuf, nsize);
 #endif
-			// send to reciever.
+			recv->recvPkt(inbuf, nsize, from); // pass to reciever.
-			recv -> recvPkt(inbuf, nsize, from);
 		}
-		else
-		{
 #ifdef DEBUG_UDP_LAYER
-			std::cerr << "UdpLayer::readPkt() not ready" << from;
+		else std::cerr << "UdpLayer::readPkt() not ready" << from << std::endl;
-			std::cerr << std::endl;
 #endif
-		}
 	}
 }
 

libresapi/src/api/ApiServer.cpp

@@ -15,6 +15,7 @@
 
 #include "ApiPluginHandler.h"
 #include "ChannelsHandler.h"
+#include "StatsHandler.h"
 
 /*
 data types in json       http://json.org/
@@ -234,7 +235,8 @@ public:
         mTransfersHandler(sts, ifaces.mFiles),
         mChatHandler(sts, ifaces.mNotify, ifaces.mMsgs, ifaces.mPeers, ifaces.mIdentity, &mPeersHandler),
         mApiPluginHandler(sts, ifaces),
-        mChannelsHandler(ifaces.mGxsChannels)
+	    mChannelsHandler(ifaces.mGxsChannels),
+	    mStatsHandler()
     {
         // the dynamic cast is to not confuse the addResourceHandler template like this:
         // addResourceHandler(derived class, parent class)
@@ -258,6 +260,8 @@ public:
                                   &ChatHandler::handleRequest);
         router.addResourceHandler("channels", dynamic_cast<ResourceRouter*>(&mChannelsHandler),
                                   &ChannelsHandler::handleRequest);
+		router.addResourceHandler("stats", dynamic_cast<ResourceRouter*>(&mStatsHandler),
+		                          &StatsHandler::handleRequest);
     }
 
     PeersHandler mPeersHandler;
@@ -269,6 +273,7 @@ public:
     ChatHandler mChatHandler;
     ApiPluginHandler mApiPluginHandler;
     ChannelsHandler mChannelsHandler;
+	StatsHandler mStatsHandler;
 };
 
 ApiServer::ApiServer():

libresapi/src/api/StatsHandler.cpp

@@ -0,0 +1,50 @@
+#include "StatsHandler.h"
+#include "Operators.h"
+
+#include <retroshare/rsconfig.h>
+#include <retroshare/rspeers.h>
+#include <pqi/authssl.h>
+
+namespace resource_api
+{
+
+StatsHandler::StatsHandler()
+{
+	addResourceHandler("*", this, &StatsHandler::handleStatsRequest);
+}
+
+void StatsHandler::handleStatsRequest(Request &/*req*/, Response &resp)
+{
+	StreamBase& itemStream = resp.mDataStream.getStreamToMember();
+
+	// location info
+	itemStream << makeKeyValue("name", rsPeers->getGPGName(rsPeers->getGPGOwnId()));
+	itemStream << makeKeyValue("location", AuthSSL::getAuthSSL()->getOwnLocation());
+
+	// peer info
+	unsigned int all, online;
+	rsPeers->getPeerCount(&all, &online, false);
+	itemStream << makeKeyValue("peers_all", all);
+	itemStream << makeKeyValue("peers_connected", online);
+
+	// bandwidth info
+	float downKb, upKb;
+	rsConfig->GetCurrentDataRates(downKb, upKb);
+	itemStream << makeKeyValue("bandwidth_up_kb", (double)upKb);
+	itemStream << makeKeyValue("bandwidth_down_kb", (double)downKb);
+
+	// DHT/NAT info
+	RsConfigNetStatus config;
+	rsConfig->getConfigNetStatus(config);
+	itemStream << makeKeyValue("dht_active",	config.DHTActive);
+	itemStream << makeKeyValue("dht_ok",		config.netDhtOk);
+	itemStream << makeKeyValue("dht_size_all",	config.netDhtNetSize);
+	itemStream << makeKeyValue("dht_size_rs",	config.netDhtRsNetSize);
+	uint32_t netState = rsConfig -> getNetState();
+	itemStream << makeKeyValue("nat_state", netState);
+
+	// ok
+	resp.setOk();
+}
+
+} // namespace resource_api

libresapi/src/api/StatsHandler.h

@@ -0,0 +1,25 @@
+#ifndef STATSHANDLER_H
+#define STATSHANDLER_H
+
+/*
+ * simple class to output some basic stats about RS
+ * like bandwidth, connected peers, ...
+ */
+
+#include "ResourceRouter.h"
+
+namespace resource_api
+{
+
+class StatsHandler : public ResourceRouter
+{
+public:
+	StatsHandler();
+
+private:
+	void handleStatsRequest(Request& req, Response& resp);
+};
+
+} // namespace resource_api
+
+#endif // STATSHANDLER_H

libresapi/src/libresapi.pro

@@ -146,7 +146,8 @@ SOURCES += \
     api/TmpBlobStore.cpp \
     util/ContentTypes.cpp \
     api/ApiPluginHandler.cpp \
-    api/ChannelsHandler.cpp
+    api/ChannelsHandler.cpp \
+    api/StatsHandler.cpp
 
 HEADERS += \
 	api/ApiServer.h \
@@ -172,7 +173,8 @@ HEADERS += \
     api/TmpBlobStore.h \
     util/ContentTypes.h \
     api/ApiPluginHandler.h \
-    api/ChannelsHandler.h
+    api/ChannelsHandler.h \
+    api/StatsHandler.h
 
 libresapilocalserver {
     CONFIG *= qt

libretroshare/src/libretroshare.pro

@@ -225,7 +225,7 @@ version_detail_bash_script {
     linux-* {
         QMAKE_EXTRA_TARGETS += write_version_detail
         PRE_TARGETDEPS = write_version_detail
-        write_version_detail.commands = ./version_detail.sh
+        write_version_detail.commands = $$PWD/version_detail.sh
     }
     win32 {
         QMAKE_EXTRA_TARGETS += write_version_detail
@@ -298,7 +298,7 @@ mac {
                 DEFINES *= MINIUPNPC_VERSION=13
 
 		CONFIG += upnp_miniupnpc
-		CONFIG += c+11
+                CONFIG += c++11
 
 		# zeroconf disabled at the end of libretroshare.pro (but need the code)
 		#CONFIG += zeroconf

libretroshare/src/serialiser/rsserial.h

@@ -178,32 +178,21 @@ std::ostream &printIndent(std::ostream &out, uint16_t indent);
 
 class RsRawItem: public RsItem
 {
-	public:
+public:
-		RsRawItem(uint32_t t, uint32_t size)
+	RsRawItem(uint32_t t, uint32_t size) : RsItem(t), len(size)
-			:RsItem(t), len(size)
+	{ data = rs_malloc(len); }
-		{ 
+	virtual ~RsRawItem() { free(data); }
-			data = rs_malloc(len);
-		}
 
-		virtual ~RsRawItem()
+	uint32_t getRawLength() { return len; }
-		{
+	void * getRawData() { return data; }
-			if (data)
-				free(data);
-			data = NULL;
-			len = 0;
-		}
 
-		uint32_t	getRawLength() { return len; }
+	virtual void clear() {}
-		void  *getRawData() { return data; }
+	virtual std::ostream &print(std::ostream &out, uint16_t indent = 0);
 
-		virtual void clear() { return; } /* what can it do? */
+private:
-		virtual std::ostream &print(std::ostream &out, uint16_t indent = 0);
+	void *data;
-
+	uint32_t len;
-	private:
-		void *data;
-		uint32_t len;
 };
 
 
-
 #endif /* RS_BASE_SERIALISER_H */

libretroshare/src/version_detail.sh

@@ -3,6 +3,8 @@
 #don't exit even if a command fails
 set +e
 
+pushd $(dirname "$0")
+
 SCRIPT_PATH=$(dirname "`readlink -f "${0}"`")
 
 OLDLANG=${LANG}
@@ -32,5 +34,8 @@ if [[ ${version} != '' ]]; then
 fi
 
 export LANG=${OLDLANG}
+
+popd
+
 echo "script version_detail.sh finished normally"
 exit 0

plugins/Common/retroshare_plugin.pri

@@ -3,8 +3,8 @@
 TEMPLATE = lib
 CONFIG *= plugin
 
-DEPENDPATH += ../../libretroshare/src/ ../../retroshare-gui/src/
+DEPENDPATH += $$PWD/../../libretroshare/src/ $$PWD/../../retroshare-gui/src/
-INCLUDEPATH += ../../libretroshare/src/ ../../retroshare-gui/src/
+INCLUDEPATH += $$PWD/../../libretroshare/src/ $$PWD/../../retroshare-gui/src/
 
 unix {
 	target.path = "$${PLUGIN_DIR}"
@@ -67,8 +67,8 @@ win32 {
 	DEPENDPATH += . $$INC_DIR
 	INCLUDEPATH += . $$INC_DIR
 
-	PRE_TARGETDEPS += ../../retroshare-gui/src/lib/libretroshare-gui.a
+	PRE_TARGETDEPS += $$OUT_PWD/../../retroshare-gui/src/lib/libretroshare-gui.a
-	LIBS += -L"../../retroshare-gui/src/lib" -lretroshare-gui
+	LIBS += -L"$$OUT_PWD/../../retroshare-gui/src/lib" -lretroshare-gui
 
 	for(lib, LIB_DIR):LIBS += -L"$$lib"
 	for(bin, BIN_DIR):LIBS += -L"$$bin"

plugins/VOIP/VOIP.pro

@@ -13,8 +13,8 @@ exists($$[QMAKE_MKSPECS]/features/mobility.prf) {
 CONFIG += qt uic qrc resources
 MOBILITY = multimedia
 
-DEPENDPATH += ../../retroshare-gui/src/temp/ui ../../libretroshare/src
+DEPENDPATH += $$PWD/../../retroshare-gui/src/temp/ui
-INCLUDEPATH += ../../retroshare-gui/src/temp/ui ../../libretroshare/src
+INCLUDEPATH += $$PWD/../../retroshare-gui/src/temp/ui
 
 #################################### Linux #####################################
 

retroshare-gui/src/gui/GenCertDialog.cpp

@@ -107,13 +107,13 @@ void GenCertDialog::grabMouse()
 	if(ui.entropy_bar->value() < 20)
 	{
 		ui.genButton->setEnabled(false) ;
-		ui.genButton->setIcon(QIcon(":/images/delete.png")) ;
+		//ui.genButton->setIcon(QIcon(":/images/delete.png")) ;
 		ui.genButton->setToolTip(tr("Currently disabled. Please move your mouse around until you reach at least 20%")) ;
 	}
 	else
 	{
 		ui.genButton->setEnabled(true) ;
-		ui.genButton->setIcon(QIcon(":/images/resume.png")) ;
+		//ui.genButton->setIcon(QIcon(":/images/resume.png")) ;
 		ui.genButton->setToolTip(tr("Click to create your node and/or profile")) ;
 	}
 
@@ -133,7 +133,7 @@ GenCertDialog::GenCertDialog(bool onlyGenerateIdentity, QWidget *parent)
 	/* Invoke Qt Designer generated QObject setup routine */
 	ui.setupUi(this);
 	
-	ui.headerFrame->setHeaderImage(QPixmap(":/images/contact_new128.png"));
+	ui.headerFrame->setHeaderImage(QPixmap(":/icons/svg/profile.svg"));
 	ui.headerFrame->setHeaderText(tr("Create a new profile"));
 
 	connect(ui.new_gpg_key_checkbox, SIGNAL(clicked()), this, SLOT(newGPGKeyGenUiSetup()));

retroshare-gui/src/gui/icons.qrc

@@ -1,5 +1,6 @@
 <RCC>
   <qresource prefix="/">
+    <file>icons/svg/profile.svg</file>
     <file>icons/svg/download.svg</file>
     <file>icons/svg/folders.svg</file>
     <file>icons/svg/folders1.svg</file>

retroshare-gui/src/gui/icons/svg/profile.svg

@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg4155"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   xml:space="preserve"
+   width="80"
+   height="80"
+   viewBox="0 0 80 80"
+   sodipodi:docname="profile.svg"><metadata
+     id="metadata4161"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs4159" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1366"
+     inkscape:window-height="706"
+     id="namedview4157"
+     showgrid="false"
+     inkscape:zoom="7.2390057"
+     inkscape:cx="21.406376"
+     inkscape:cy="40.981104"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g4163" /><g
+     id="g4163"
+     inkscape:groupmode="layer"
+     inkscape:label="ink_ext_XXXXXX"
+     transform="matrix(1.25,0,0,-1.25,0,80)"><path
+       inkscape:connector-curvature="0"
+       id="path4167"
+       style="fill:#039bd5;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       d="M 64,32 C 64,14.327 49.673,0 32,0 14.327,0 0,14.327 0,32 0,49.673 14.327,64 32,64 49.673,64 64,49.673 64,32" /><g
+       transform="matrix(0.11606694,0,0,-0.11606694,7.5674886,58.025781)"
+       id="g3"><g
+         id="g5"><path
+           style="fill:#ffffff"
+           inkscape:connector-curvature="0"
+           d="m 382.93,100.232 -94.965,0 0,-0.833 c 0,-13.808 -11.193,-25 -25,-25 l -17.775,0 c -0.524,-13.343 -11.504,-24 -24.975,-24 l -17.5,0 c -13.471,0 -24.449,10.657 -24.975,24 l -17.775,0 c -13.807,0 -25,11.192 -25,25 l 0,0.833 -94.965,0 c -22.056,0 -40,17.944 -40,40 L 0,332.53 c 0,22.057 17.944,40 40,40 l 342.93,0 c 22.055,0 40,-17.943 40,-40 l 0,-192.298 c 0,-22.056 -17.946,-40 -40,-40 z M 211.465,74.714 c 8.422,0 15.25,6.827 15.25,15.25 0,8.423 -6.828,15.25 -15.25,15.25 -8.422,0 -15.25,-6.827 -15.25,-15.25 0,-8.423 6.828,-15.25 15.25,-15.25 z M 392.93,332.529 c 0,5.515 -4.486,10 -10,10 l -342.93,0 c -5.514,0 -10,-4.485 -10,-10 l 0,-192.297 c 0,-5.514 4.486,-10 10,-10 l 95.518,0 0,0.065 c 0,13.808 11.193,25 25,25 l 101.895,0 c 13.807,0 25,-11.192 25,-25 l 0,-0.065 95.518,0 c 5.515,0 10,4.486 10,10 l -10e-4,192.297 0,0 z"
+           id="path7" /><path
+           style="fill:#ffffff"
+           inkscape:connector-curvature="0"
+           d="m 353.165,184.131 -138.066,0 c -5.522,0 -10,4.477 -10,10 0,5.523 4.478,10 10,10 l 138.066,0 c 5.521,0 10,-4.477 10,-10 0,-5.523 -4.477,-10 -10,-10 z"
+           id="path9" /><path
+           style="fill:#ffffff"
+           inkscape:connector-curvature="0"
+           d="m 353.165,234.132 -138.066,0 c -5.522,0 -10,4.477 -10,10 0,5.522 4.478,10 10,10 l 138.066,0 c 5.521,0 10,-4.478 10,-10 0,-5.524 -4.477,-10 -10,-10 z"
+           id="path11" /><path
+           style="fill:#ffffff"
+           inkscape:connector-curvature="0"
+           d="m 353.165,284.132 -138.066,0 c -5.522,0 -10,4.477 -10,10 0,5.522 4.478,10 10,10 l 138.066,0 c 5.521,0 10,-4.478 10,-10 0,-5.524 -4.477,-10 -10,-10 z"
+           id="path13" /><path
+           style="fill:#ffffff"
+           inkscape:connector-curvature="0"
+           d="m 154.844,264.318 -17.537,-8.074 -8.424,-7.104 -13.059,12.988 6.01,40.172 c 0.021,0.146 -0.016,0.297 -0.104,0.418 l -6.716,9.189 c -0.106,0.146 -0.276,0.232 -0.458,0.232 -0.182,0 -0.352,-0.086 -0.459,-0.232 l -6.715,-9.189 c -0.088,-0.121 -0.125,-0.271 -0.104,-0.418 l 6.01,-40.174 -13.057,-12.986 -8.424,7.104 -17.538,8.074 c -2.595,1.063 -5.655,3.222 -6.441,5.496 0,0 -19.063,45.383 -8.724,45.383 l 110.903,0 c 10.339,0 -8.723,-45.383 -8.723,-45.383 -1.128,-2.701 -3.845,-4.43 -6.44,-5.496 z"
+           id="path15" /><path
+           style="fill:#ffffff"
+           inkscape:connector-curvature="0"
+           d="m 114.557,248.884 c 17.937,0 31.32,-16.711 31.625,-44.734 0.195,-19.447 -9.066,-31.084 -31.625,-31.084 -22.559,0 -31.822,11.637 -31.625,31.084 0.304,28.023 13.689,44.734 31.625,44.734 z"
+           id="path17" /></g></g></g></svg>

retroshare-gui/src/gui/qss/stylesheet/Standard.qss

@@ -639,3 +639,22 @@ IdEditDialog QLabel#info_label
 	background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #FFFFD7, stop:1 #FFFFB2);
 }
 
+GenCertDialog QPushButton#genButton { 
+	border-image: url(:/images/btn_blue.png) 4;
+	border-width: 4;
+	padding: 0px 6px;
+	font-size: 16px;
+	font: bold;
+	color: white;
+}
+
+GenCertDialog QPushButton#genButton:hover {
+	border-image: url(:/images/btn_blue_hover.png) 4;
+}
+
+GenCertDialog QPushButton#genButton:disabled {
+	border-image: url(:/images/btn_27.png) 4;
+  font-size: 16px;
+	font: bold;
+	color: black;
+}

retroshare-gui/src/idle/idle_platform.cpp

@@ -74,7 +74,7 @@ bool IdlePlatform::init()
 
 	int event_base, error_base;
 #if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
-	if(XScreenSaverQueryExtension(QX11Info::display(), &event_base, &error_base)) {
+	if(QX11Info::isPlatformX11() && XScreenSaverQueryExtension(QX11Info::display(), &event_base, &error_base)) {
 #else
 	if(XScreenSaverQueryExtension(QApplication::desktop()->screen()->x11Info().display(), &event_base, &error_base)) {
 #endif
@@ -89,7 +89,7 @@ int IdlePlatform::secondsIdle()
 	if(!d->ss_info)
 		return 0;
 #if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
-	if(!XScreenSaverQueryInfo(QX11Info::display(), QX11Info::appRootWindow(), d->ss_info))
+	if(!QX11Info::isPlatformX11() || !XScreenSaverQueryInfo(QX11Info::display(), QX11Info::appRootWindow(), d->ss_info))
 #else
 	if(!XScreenSaverQueryInfo(QApplication::desktop()->screen()->x11Info().display(), QX11Info::appRootWindow(), d->ss_info))
 #endif

retroshare-gui/src/retroshare-gui.pro

@@ -123,7 +123,7 @@ version_detail_bash_script {
 		DEFINES += ADD_LIBRETROSHARE_VERSION_INFO
 		QMAKE_EXTRA_TARGETS += write_version_detail
 		PRE_TARGETDEPS = write_version_detail
-		write_version_detail.commands = ./version_detail.sh
+		write_version_detail.commands = $$PWD/version_detail.sh
 	}
 	win32 {
 		QMAKE_EXTRA_TARGETS += write_version_detail
@@ -305,22 +305,22 @@ openbsd-* {
 
 # ###########################################
 
-DEPENDPATH += . ../../libretroshare/src/
+DEPENDPATH += . $$PWD/../../libretroshare/src/
-INCLUDEPATH += ../../libretroshare/src/
+INCLUDEPATH += $$PWD/../../libretroshare/src/
 
-PRE_TARGETDEPS *= ../../libretroshare/src/lib/libretroshare.a
+PRE_TARGETDEPS *= $$OUT_PWD/../../libretroshare/src/lib/libretroshare.a
-LIBS *= ../../libretroshare/src/lib/libretroshare.a
+LIBS *= $$OUT_PWD/../../libretroshare/src/lib/libretroshare.a
 
 wikipoos {
-	PRE_TARGETDEPS *= ../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
+	PRE_TARGETDEPS *= $$OUT_PWD/../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
-	LIBS *= ../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
+	LIBS *= $$OUT_PWD/../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
 }
 
 # webinterface
-DEPENDPATH += ../../libresapi/src
+DEPENDPATH += $$PWD/../../libresapi/src
-INCLUDEPATH += ../../libresapi/src
+INCLUDEPATH += $$PWD/../../libresapi/src
-PRE_TARGETDEPS *= ../../libresapi/src/lib/libresapi.a
+PRE_TARGETDEPS *= $$OUT_PWD/../../libresapi/src/lib/libresapi.a
-LIBS += ../../libresapi/src/lib/libresapi.a
+LIBS += $$OUT_PWD/../../libresapi/src/lib/libresapi.a
 
 # Input
 HEADERS +=  rshare.h \

retroshare-gui/src/version_detail.sh

@@ -5,6 +5,8 @@
 #don't exit even if a command fails
 set +e
 
+pushd $(dirname "$0")
+
 OLDLANG=${LANG}
 
 export LANG=C
@@ -34,5 +36,8 @@ if (ls &> /dev/null); then
 fi
 
 export LANG=${OLDLANG}
+
+popd
+
 echo "version_detail.sh scripts finished"
 exit 0

retroshare-nogui/src/retroshare-nogui.pro

@@ -165,11 +165,11 @@ haiku-* {
 
 ############################## Common stuff ######################################
 
-DEPENDPATH += . ../../libretroshare/src
+DEPENDPATH += . $$PWD/../../libretroshare/src
-INCLUDEPATH += . ../../libretroshare/src
+INCLUDEPATH += . $$PWD/../../libretroshare/src
 
-PRE_TARGETDEPS *= ../../libretroshare/src/lib/libretroshare.a
+PRE_TARGETDEPS *= $$OUT_PWD/../../libretroshare/src/lib/libretroshare.a
-LIBS *= ../../libretroshare/src/lib/libretroshare.a
+LIBS *= $$OUT_PWD/../../libretroshare/src/lib/libretroshare.a
 
 # Input
 HEADERS +=  notifytxt.h
@@ -184,10 +184,10 @@ introserver {
 
 libresapihttpserver {
 	DEFINES *= ENABLE_WEBUI
-        PRE_TARGETDEPS *= ../../libresapi/src/lib/libresapi.a
+        PRE_TARGETDEPS *= $$OUT_PWD/../../libresapi/src/lib/libresapi.a
-	LIBS += ../../libresapi/src/lib/libresapi.a
+	LIBS += $$OUT_PWD/../../libresapi/src/lib/libresapi.a
-        DEPENDPATH += ../../libresapi/src
+        DEPENDPATH += $$PWD/../../libresapi/src
-	INCLUDEPATH += ../../libresapi/src
+	INCLUDEPATH += $$PWD/../../libresapi/src
         HEADERS += \
             TerminalApiClient.h
         SOURCES +=  \
@@ -200,8 +200,8 @@ sshserver {
 	# Please use this path below.
         # (You can modify it locally if required - but dont commit it!)
 
-	#LIBSSH_DIR = ../../../lib/libssh-0.5.2
+	#LIBSSH_DIR = $PWD/../../../lib/libssh-0.5.2
-	LIBSSH_DIR = ../../../libssh-0.6.0rc1
+	LIBSSH_DIR = $PWD/../../../libssh-0.6.0rc1
 
 	#
 	# Use the following commend to generate a Server RSA Key.

retroshare.pri

@@ -84,7 +84,7 @@ macx {
 		message(***retroshare.pri: No SDK, set it to MacOS 10.10 )
 		QMAKE_MAC_SDK = macosx10.10
 	}
-	CONFIG += c+11
+        CONFIG += c++11
 }
 
 unfinished {