diff --git a/libretroshare/src/serialiser/rsblogitems.cc b/libretroshare/src/serialiser/rsblogitems.cc index 28a07ca9c..d5c4a5950 100644 --- a/libretroshare/src/serialiser/rsblogitems.cc +++ b/libretroshare/src/serialiser/rsblogitems.cc @@ -47,7 +47,7 @@ void RsBlogMsg::clear() std::ostream &RsBlogMsg::print(std::ostream &out, uint16_t indent) { - printRsItemBase(out, "RsChannelMsg", indent); + printRsItemBase(out, "RsBlogMsg", indent); uint16_t int_Indent = indent + 2; RsDistribMsg::print(out, int_Indent); @@ -186,7 +186,7 @@ RsBlogMsg *RsBlogSerialiser::deserialiseMsg(void *data, uint32_t *pktsize) ok &= GetTlvWideString(data, rssize, &offset, TLV_TYPE_WSTR_SUBJECT, item->subject); ok &= GetTlvWideString(data, rssize, &offset, TLV_TYPE_WSTR_MSG, item->message); - ok &= GetTlvString(data, rssize, &offset, TLV_TYPE_STR_MSGID, item->mIdReply); + ok &= GetTlvString(data, rssize, &offset, TLV_TYPE_STR_MSG, item->mIdReply); ok &= item->attachment.GetTlv(data, rssize, &offset); diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp index d2e8b2d2d..c15999373 100644 --- a/retroshare-gui/src/gui/MainWindow.cpp +++ b/retroshare-gui/src/gui/MainWindow.cpp @@ -33,6 +33,7 @@ #include "LinksDialog.h" #include "ForumsDialog.h" #include "NewsFeed.h" +#include "blogs/BlogsDialog.h" #include "rshare.h" #include "MainWindow.h" @@ -97,6 +98,7 @@ #define IMAGE_NOONLINE ":/images/rstray0.png" #define IMAGE_ONEONLINE ":/images/rstray1.png" #define IMAGE_TWOONLINE ":/images/rstray2.png" +#define IMAGE_BLOGS ":/images/kblogger.png" /** Constructor */ @@ -183,6 +185,12 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags) ui.stackPages->add(channelFeed = new ChannelFeed(ui.stackPages), createPageAction(QIcon(IMAGE_CHANNELS), tr("Channels"), grp)); #endif + + #ifndef RS_RELEASE_VERSION + BlogsDialog *blogsFeed = NULL; + ui.stackPages->add(blogsFeed = new BlogsDialog(ui.stackPages), + createPageAction(QIcon(IMAGE_BLOGS), tr("Blogs"), grp)); + #endif ForumsDialog *forumsDialog = NULL; ui.stackPages->add(forumsDialog = new ForumsDialog(ui.stackPages), diff --git a/retroshare-gui/src/gui/blogs/CreateBlogMsg.cpp b/retroshare-gui/src/gui/blogs/CreateBlogMsg.cpp index 1dd31d0a9..ae9fecbbc 100644 --- a/retroshare-gui/src/gui/blogs/CreateBlogMsg.cpp +++ b/retroshare-gui/src/gui/blogs/CreateBlogMsg.cpp @@ -173,7 +173,7 @@ void CreateBlogMsg::parseRsFileListAttachments(std::string attachList) for(it = attachItems.begin(); it != attachItems.end(); it++) { - std::cerr << "CreateChannelMsg::parseRsFileListAttachments() Entry: "; + std::cerr << "CreateBlogMsg::parseRsFileListAttachments() Entry: "; QStringList parts = (*it).split("/"); @@ -355,7 +355,7 @@ void CreateBlogMsg::checkAttachmentReady() void CreateBlogMsg::cancelMsg() { - std::cerr << "CreateChannelMsg::cancelMsg()"; + std::cerr << "CreateBlogMsg::cancelMsg()"; std::cerr << std::endl; close(); return; @@ -383,7 +383,7 @@ void CreateBlogMsg::newBlogMsg() void CreateBlogMsg::sendMsg() { - std::cerr << "CreateChannelMsg::sendMsg()"; + std::cerr << "CreateBlogMsg::sendMsg()"; std::cerr << std::endl; /* construct message bits */ @@ -423,6 +423,8 @@ void CreateBlogMsg::sendMsg() void CreateBlogMsg::sendMessage(std::wstring subject, std::wstring msg, std::list &files) { + std::cerr << "CreateBlogMsg::sendMessage()" << std::endl; + QString name = subjectEdit->text(); if(name.isEmpty()) @@ -446,7 +448,7 @@ void CreateBlogMsg::sendMessage(std::wstring subject, std::wstring msg, std::lis msgInfo.subject = subject; msgInfo.msg = msg; msgInfo.files = files; - + msgInfo.msgIdReply = "nothing"; rsBlogs->BlogMessageSend(msgInfo); }