From 6a9be43f3188b63f59db989d733c7fb5b9fe13a4 Mon Sep 17 00:00:00 2001
From: drbob <retroshare.project@gmail.com>
Date: Sat, 31 Jul 2010 18:19:12 +0000
Subject: [PATCH] Changes for bitdht compilation.  * disabled BlogItems, when
 BLOGS not defined.  * added bitdht compile option to Retroshare.pro.  *
 disabled BLOGS until it can compile in libretroshare

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3324 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 retroshare-gui/src/RetroShare.pro   | 24 ++++++++++++++----------
 retroshare-gui/src/gui/NewsFeed.cpp |  8 ++++++++
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/retroshare-gui/src/RetroShare.pro b/retroshare-gui/src/RetroShare.pro
index afc04e66d..51b13a21d 100644
--- a/retroshare-gui/src/RetroShare.pro
+++ b/retroshare-gui/src/RetroShare.pro
@@ -1,4 +1,4 @@
-CONFIG += qt gui uic qrc resources uitools idle blogs
+CONFIG += qt gui uic qrc resources uitools idle # bitdht  blogs
 QT     += network xml script opengl
 
 TEMPLATE = app
@@ -14,6 +14,7 @@ debug {
 	QMAKE_CFLAGS += -g
 }
 
+
 ################################# Linux ##########################################
 # Put lib dir in QMAKE_LFLAGS so it appears before -L/usr/lib
 linux-* {
@@ -119,6 +120,9 @@ macx {
 
 # ###########################################
 
+bitdht {
+	LIBS += ../../libbitdht/src/lib/libbitdht.a
+}
 
 DEPENDPATH += . \
             rsiface \
@@ -275,8 +279,6 @@ HEADERS +=  rshare.h \
             gui/feeds/MsgItem.h \
             gui/feeds/ChanNewItem.h \
             gui/feeds/ChanMsgItem.h \
-            gui/feeds/BlogNewItem.h \
-            gui/feeds/BlogMsgItem.h \
             gui/feeds/SubFileItem.h \
             gui/feeds/SubDestItem.h \
             gui/feeds/AttachFileItem.h \
@@ -351,8 +353,6 @@ FORMS +=    gui/StartDialog.ui \
             gui/feeds/MsgItem.ui \
             gui/feeds/ChanNewItem.ui \
             gui/feeds/ChanMsgItem.ui \
-            gui/feeds/BlogNewItem.ui \
-            gui/feeds/BlogMsgItem.ui \
             gui/feeds/SubFileItem.ui \
             gui/feeds/SubDestItem.ui \
             gui/feeds/AttachFileItem.ui
@@ -478,8 +478,6 @@ SOURCES +=  main.cpp \
             gui/feeds/MsgItem.cpp \
             gui/feeds/ChanNewItem.cpp \
             gui/feeds/ChanMsgItem.cpp \
-            gui/feeds/BlogNewItem.cpp \
-            gui/feeds/BlogMsgItem.cpp \
             gui/feeds/SubFileItem.cpp \
             gui/feeds/SubDestItem.cpp \
             gui/feeds/AttachFileItem.cpp \
@@ -542,19 +540,25 @@ HEADERS += gui/unfinished/blogs/BlogsDialog.h \
            gui/unfinished/blogs/CreateBlog.h \  
            gui/unfinished/blogs/CreateBlogMsg.h \
            gui/unfinished/blogs/BlogsMsgItem.h \
-           gui/unfinished/blogs/BlogDetails.h
+           gui/unfinished/blogs/BlogDetails.h \
+            gui/feeds/BlogNewItem.h \
+            gui/feeds/BlogMsgItem.h \
 
 FORMS += gui/unfinished/blogs/BlogsDialog.ui \
          gui/unfinished/blogs/CreateBlog.ui \
          gui/unfinished/blogs/CreateBlogMsg.ui \
          gui/unfinished/blogs/BlogsMsgItem.ui \
-         gui/unfinished/blogs/BlogDetails.ui  
+         gui/unfinished/blogs/BlogDetails.ui \ 
+            gui/feeds/BlogNewItem.ui \
+            gui/feeds/BlogMsgItem.ui \
          
 SOURCES += gui/unfinished/blogs/BlogsDialog.cpp \
            gui/unfinished/blogs/CreateBlog.cpp \
            gui/unfinished/blogs/CreateBlogMsg.cpp \
            gui/unfinished/blogs/BlogsMsgItem.cpp \
-           gui/unfinished/blogs/BlogDetails.cpp
+           gui/unfinished/blogs/BlogDetails.cpp \
+            gui/feeds/BlogNewItem.cpp \
+            gui/feeds/BlogMsgItem.cpp \
 
           DEFINES *= BLOGS
 }
diff --git a/retroshare-gui/src/gui/NewsFeed.cpp b/retroshare-gui/src/gui/NewsFeed.cpp
index 890ba3acf..e57fc76e1 100644
--- a/retroshare-gui/src/gui/NewsFeed.cpp
+++ b/retroshare-gui/src/gui/NewsFeed.cpp
@@ -29,8 +29,12 @@
 #include "feeds/ChanMsgItem.h"
 #include "feeds/ForumNewItem.h"
 #include "feeds/ForumMsgItem.h"
+
+#ifdef BLOGS
 #include "feeds/BlogNewItem.h"
 #include "feeds/BlogMsgItem.h"
+#endif
+
 #include "feeds/MsgItem.h"
 #include "feeds/PeerItem.h"
 
@@ -325,6 +329,7 @@ void	NewsFeed::addFeedItemForumMsg(RsFeedItem &fi)
 
 void	NewsFeed::addFeedItemBlogNew(RsFeedItem &fi)
 {
+#ifdef BLOGS
 	/* make new widget */
 	BlogNewItem *bni = new BlogNewItem(this, NEWSFEED_BLOGNEWLIST, fi.mId1, false, true);
 
@@ -332,6 +337,7 @@ void	NewsFeed::addFeedItemBlogNew(RsFeedItem &fi)
 
 	/* add to layout */
 	verticalLayout->addWidget(bni);
+#endif
 
 #ifdef NEWS_DEBUG
 	std::cerr << "NewsFeed::addFeedItemBlogNew()";
@@ -341,6 +347,7 @@ void	NewsFeed::addFeedItemBlogNew(RsFeedItem &fi)
 
 void	NewsFeed::addFeedItemBlogMsg(RsFeedItem &fi)
 {
+#ifdef BLOGS
 	/* make new widget */
 	BlogMsgItem *bm = new BlogMsgItem(this, NEWSFEED_BLOGMSGLIST, fi.mId1, fi.mId2, false);
 
@@ -348,6 +355,7 @@ void	NewsFeed::addFeedItemBlogMsg(RsFeedItem &fi)
 
 	/* add to layout */
 	verticalLayout->addWidget(bm);
+#endif
 
 #ifdef NEWS_DEBUG
 	std::cerr << "NewsFeed::addFeedItemBlogMsg()";