Merge lp:~marcobiscaro2112/unity/fixes-742985 into lp:unity

[Marco Biscaro]

Check the value of the shortcut before attempting to draw his character.

[Marco Biscaro (marcobiscaro2112)]

The problem is already fixed on trunk, but merging with this branch can prevent other similar problems in future (see https://bugs.launchpad.net/askubuntu-lens/+bug/742985/comments/4).

[Didier Roche-Tolomelli (didrocks)]

Hey Marco, I'm afraid this is invalid for now.

Indeed, shortcut is a gint, so it can be > 32 (like for a, f and t…) but the fix I was discussing is still in my branch (it's at the other hand). And for that, we need to check that the shortcut != 0 as 0 is the initial value :)

Hope that the explanations helps! Thanks however for your strong merge and participation commitment for unity. There is still a lot of bitesize around (if you need any pointer, to not hesitate to join irc!) :)

review: Disapprove

[Didier Roche-Tolomelli (didrocks)]

Setting the state to reject as my previous comment to clean the list and you proposed another branch making that :)

BTW, do you know that there is a "resubmit proposal" button that can automatically superseed this proposal?

=== modified file 'src/Launcher.cpp'
--- src/Launcher.cpp	2011-03-24 14:37:16 +0000
+++ src/Launcher.cpp	2011-03-28 14:41:17 +0000
@@ -2345,11 +2345,12 @@
   {
     guint64 shortcut = arg.icon->GetShortcut ();
 
-    /* deal with dynamic labels for places, which can be set via the locale */
-    if (shortcut != 0)
+    /* invalid values must be ignored */
+    if (shortcut > 32)
     {
       if (!g_ascii_isdigit ((gchar) shortcut))
       {
+        /* deal with dynamic labels for places, which can be set via the locale */
         RenderIcon (GfxContext,
                     arg,
                     arg.icon->GetSuperkeyLabel ()->GetDeviceTexture (),