[kde-doc-english] [trojita] src/Gui: GUI: don't provide a misleading icon for the "Reply by Guess"

[Jan Kundrát]

Git commit f5937a531831de146443b5b3afe3319d809edec2 by Jan Kundrát.
Committed on 14/03/2013 at 01:47.
Pushed by jkt into branch 'master'.

GUI: don't provide a misleading icon for the "Reply by Guess"

M  +3    -1    src/Gui/ShortcutHandler/ShortcutHandler.cpp
M  +1    -1    src/Gui/Window.cpp

http://commits.kde.org/trojita/f5937a531831de146443b5b3afe3319d809edec2

diff --git a/src/Gui/ShortcutHandler/ShortcutHandler.cpp b/src/Gui/ShortcutHandler/ShortcutHandler.cpp
index 77282a3..9df3290 100644
--- a/src/Gui/ShortcutHandler/ShortcutHandler.cpp
+++ b/src/Gui/ShortcutHandler/ShortcutHandler.cpp
@@ -87,7 +87,9 @@ QAction *ShortcutHandler::createAction(const QString &actionName, QObject *recei
     ActionDescription actionDescription = m_actionDescriptions[actionName];
     QAction *action = new QAction(parent);
     action->setObjectName(actionName);
-    action->setIcon(loadIcon(actionDescription.iconName));
+    if (!actionDescription.iconName.isEmpty()) {
+        action->setIcon(loadIcon(actionDescription.iconName));
+    }
     action->setText(actionDescription.text);
     action->setShortcut(actionDescription.shortcut);
     if (receiver)
diff --git a/src/Gui/Window.cpp b/src/Gui/Window.cpp
index 53afeaf..7746ba5 100644
--- a/src/Gui/Window.cpp
+++ b/src/Gui/Window.cpp
@@ -143,7 +143,7 @@ void MainWindow::defineActions()
     shortcutHandler->defineAction(QLatin1String("action_reply_all_but_me"), QLatin1String("mail-reply-all"), tr("Reply to All &but Me"), tr("Ctrl+Shift+R"));
     shortcutHandler->defineAction(QLatin1String("action_reply_all"), QLatin1String("mail-reply-all"), tr("Reply to &All"), tr("Ctrl+Alt+Shift+R"));
     shortcutHandler->defineAction(QLatin1String("action_reply_list"), QLatin1String("mail-reply-list"), tr("Reply to &Mailing List"), tr("Ctrl+L"));
-    shortcutHandler->defineAction(QLatin1String("action_reply_guess"), QLatin1String("mail-reply-sender"), tr("Reply by &Guess"), tr("Ctrl+R"));
+    shortcutHandler->defineAction(QLatin1String("action_reply_guess"), QString(), tr("Reply by &Guess"), tr("Ctrl+R"));
 }
 
 void MainWindow::createActions()