Merge lp:~andyhorng/unity/fix-for-unity-bug-741787 into lp:unity

[Andy Horng]

Fix Bug #741787 - Launcher Icon count breaks when count > 9999, due to only being alotted four char spaces. All counts > 9999 will be represented by "****" instead.
Extra check inserted in OnRemoteCountChanged() in LauncherIcon.cpp.

[Mirco Müller (macslow)]

Hey Andy! First of all thanks for the fix! This attention to detail is terrific! Code looks good, but you have not signed the contributor agreement yet from all I can tell. That needs to be done first, before I can merge your branch into trunk. Please see http://www.canonical.com/contributors and follow the instructions listed there. Thanks in advance!

[Mirco Müller (macslow)]

Got note of the signed agreement. Approved!

review: Approve

=== modified file 'src/LauncherIcon.cpp'
--- src/LauncherIcon.cpp	2011-04-06 17:53:41 +0000
+++ src/LauncherIcon.cpp	2011-04-07 10:47:06 +0000
@@ -944,8 +944,13 @@
 {
   if (!remote->CountVisible ())
     return;
-  
-  gchar *text = g_strdup_printf ("%i", (int) remote->Count ());
+
+  gchar *text;
+  if (remote->Count() > 9999)
+    text = g_strdup_printf("****");
+  else 
+    text = g_strdup_printf ("%i", (int) remote->Count ());
+
   SetEmblemText (text);
   g_free (text);
 }