Merge lp:~uriboni/unity-2d/panel-check-valid-applet into lp:unity-2d/3.0

[Ugo Riboni]

[panel] Check that the applet returned by plugins is valid before using it

[Alberto Mardegan (mardy)]

Cool, plugin writers are warned! :-)

review: Approve

=== modified file 'panel/app/panelmanager.cpp'
--- panel/app/panelmanager.cpp	2011-08-17 09:21:18 +0000
+++ panel/app/panelmanager.cpp	2011-08-17 09:45:28 +0000
@@ -157,7 +157,12 @@
         } else {
             if (screen == leftmost || !onlyLeftmost) {
                 QWidget *applet = provider->createApplet();
-                panel->addWidget(applet);
+                if (applet == 0) {
+                    qWarning() << "The panel applet plugin for" << appletName
+                               << "did not return a valid plugin.";
+                } else {
+                    panel->addWidget(applet);
+                }
             }
         }
     }