Merge lp:~mterry/libdbusmenu-qt/dont-show-more-icons-than-desired into lp:~agateau/libdbusmenu-qt/trunk

[Michael Terry]

Respect QAction's setting for whether an icon should be shown in the menu or not.

[Aurélien Gâteau (agateau)]

Hi Michael,

The patch looks good, it only need some coding style fixes:
- 4-space indents
- curly braces around if and else blocks

Thanks!

review: Needs Fixing

[Michael Terry (mterry)]

Whoops! Updated.

review: Needs Resubmitting

[lp:~mterry/libdbusmenu-qt/dont-show-more-icons-than-desired]

209. By Michael Terry on 2011-04-27

style fixes

[Aurélien Gâteau (agateau)]

Your changes broke the unit tests, but I fixed them and added one test to test the new code. It is merged now, thanks!

review: Approve

=== modified file 'src/dbusmenuexporter.cpp'
--- src/dbusmenuexporter.cpp	2011-02-24 16:29:54 +0000
+++ src/dbusmenuexporter.cpp	2011-04-27 13:09:30 +0000
@@ -358,7 +358,11 @@
     DMRETURN_VALUE_IF_FAIL(action, QString());
 #ifdef HAVE_QICON_NAME
     QIcon icon = action->icon();
-    return icon.isNull() ? QString() : icon.name();
+    if (action->isIconVisibleInMenu() && !icon.isNull()) {
+        return icon.name();
+    } else {
+        return QString();
+    }
 #else
     return QString();
 #endif