Merged Code from: /branches/v0.5-new_cache_system/ into main trunk.

- Revisions 4771 => 5334

 * This merge brings a lot of unfinished code for GXS (new cache system)
 	- See branch commits for more details.
 * Code is disabled, and should have minimal effect on trunk build.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5338 b45a01b8-16f6-495d-af2f-9b41ad6348cc

retroshare-gui/src/gui/common/FriendList.cpp

@@ -41,7 +41,7 @@
 #include "gui/notifyqt.h"
 #include "gui/RetroShareLink.h"
 #include "retroshare-gui/RsAutoUpdatePage.h"
-#ifdef UNFINISHED
+#ifdef UNFINISHED_FD
 #include "gui/unfinished/profile/ProfileView.h"
 #endif
 #include "RSTreeWidgetItem.h"
@@ -1344,7 +1344,7 @@ QTreeWidgetItem *FriendList::getCurrentPeer() const
     return item;
 }
 
-#ifdef UNFINISHED
+#ifdef UNFINISHED_FD
 /* GUI stuff -> don't do anything directly with Control */
 void FriendsDialog::viewprofile()
 {

retroshare-gui/src/gui/common/FriendList.h

@@ -114,7 +114,7 @@ private slots:
     void msgfriend();
     void recommendfriend();
     void removefriend();
-#ifdef UNFINISHED
+#ifdef UNFINISHED_FD
     void viewprofile();
 #endif