From 95b24c493dad757f16b0486f28838fe28cd78cca Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Sat, 16 May 2015 07:14:18 +0200
Subject: [PATCH] Fixes for e-mail sending.

---
 src/gui/feedmessageviewer.cpp  |  2 +-
 src/gui/feedsview.cpp          | 12 ++++++------
 src/gui/feedsview.h            |  2 +-
 src/network-web/webfactory.cpp |  4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/gui/feedmessageviewer.cpp b/src/gui/feedmessageviewer.cpp
index 1138587e9..e5bdbb573 100755
--- a/src/gui/feedmessageviewer.cpp
+++ b/src/gui/feedmessageviewer.cpp
@@ -206,7 +206,7 @@ void FeedMessageViewer::createConnections() {
 
   // State of many messages is changed, then we need
   // to reload selections.
-  connect(m_feedsView, SIGNAL(feedsNeedToBeReloaded(int)), m_messagesView, SLOT(reloadSelections(int)));
+  connect(m_feedsView, SIGNAL(feedsNeedToBeReloaded(bool)), m_messagesView, SLOT(reloadSelections(bool)));
 
   // If counts of unread/all messages change, update the tray icon.
   connect(m_feedsView, SIGNAL(messageCountsChanged(int,int,bool)), this, SLOT(updateTrayIconStatus(int,int,bool)));
diff --git a/src/gui/feedsview.cpp b/src/gui/feedsview.cpp
index d4d382b37..26ed8b1ac 100755
--- a/src/gui/feedsview.cpp
+++ b/src/gui/feedsview.cpp
@@ -234,14 +234,14 @@ void FeedsView::setSelectedFeedsClearStatus(int clear) {
   m_sourceModel->markFeedsDeleted(selectedFeeds(), clear, 0);
   updateCountsOfSelectedFeeds(true);
 
-  emit feedsNeedToBeReloaded(1);
+  emit feedsNeedToBeReloaded(true);
 }
 
 void FeedsView::setAllFeedsClearStatus(int clear) {
   m_sourceModel->markFeedsDeleted(allFeeds(), clear, 0);
   updateCountsOfAllFeeds(true);
 
-  emit feedsNeedToBeReloaded(1);
+  emit feedsNeedToBeReloaded(true);
 }
 
 void FeedsView::clearSelectedFeeds() {
@@ -422,7 +422,7 @@ void FeedsView::markSelectedFeedsReadStatus(int read) {
   m_sourceModel->markFeedsRead(selectedFeeds(), read);
   updateCountsOfSelectedFeeds(false);
 
-  emit feedsNeedToBeReloaded(read);
+  emit feedsNeedToBeReloaded(read == 1);
 }
 
 void FeedsView::markSelectedFeedsRead() {
@@ -437,7 +437,7 @@ void FeedsView::markAllFeedsReadStatus(int read) {
   m_sourceModel->markFeedsRead(allFeeds(), read);
   updateCountsOfAllFeeds(false);
 
-  emit feedsNeedToBeReloaded(read);
+  emit feedsNeedToBeReloaded(read == 1);
 }
 
 void FeedsView::markAllFeedsRead() {
@@ -465,7 +465,7 @@ void FeedsView::emptyRecycleBin() {
     m_sourceModel->recycleBin()->empty();
     updateCountsOfSelectedFeeds(true);
 
-    emit feedsNeedToBeReloaded(1);
+    emit feedsNeedToBeReloaded(true);
   }
 }
 
@@ -473,7 +473,7 @@ void FeedsView::restoreRecycleBin() {
   m_sourceModel->recycleBin()->restore();
   updateCountsOfAllFeeds(true);
 
-  emit feedsNeedToBeReloaded(1);
+  emit feedsNeedToBeReloaded(true);
 }
 
 void FeedsView::updateCountsOfSelectedFeeds(bool update_total_too) { 
diff --git a/src/gui/feedsview.h b/src/gui/feedsview.h
index 511d5dd68..87dd978f4 100644
--- a/src/gui/feedsview.h
+++ b/src/gui/feedsview.h
@@ -176,7 +176,7 @@ class FeedsView : public QTreeView {
     void messageCountsChanged(int unread_messages, int total_messages, bool any_feed_has_unread_messages);
 
     // Emitted if currently selected feeds needs to be reloaded.
-    void feedsNeedToBeReloaded(int mark_current_index_read);
+    void feedsNeedToBeReloaded(bool mark_current_index_read);
 
     // Emitted if user selects new feeds.
     void feedsSelected(const FeedsSelection &selection);
diff --git a/src/network-web/webfactory.cpp b/src/network-web/webfactory.cpp
index 0ec536c64..2d779ef3d 100755
--- a/src/network-web/webfactory.cpp
+++ b/src/network-web/webfactory.cpp
@@ -33,8 +33,8 @@ bool WebFactory::sendMessageViaEmail(const Message &message) {
     QString browser = qApp->settings()->value(GROUP(Browser), SETTING(Browser::CustomExternalEmailExecutable)).toString();
     QString arguments = qApp->settings()->value(GROUP(Browser), SETTING(Browser::CustomExternalEmailArguments)).toString();
 
-    return QProcess::startDetached(QString("\"") + browser + "\"", QStringList() << arguments.arg(message.m_title,
-                                                                           stripTags(message.m_contents)));
+    return QProcess::startDetached(QString("\"") + browser + "\" " + arguments.arg(message.m_title,
+                                                                                   stripTags(message.m_contents)));
   }
   else {
     // TODO: Check encoding when using mailto.