Merge lp:~unity-team/unity/unity.fix-for-quicklist-artifacts into lp:unity

[Jay Taoko]

In reference to bug 617339. This branch add the label menu item to the quicklist menu. There are cases when the quicklist is requested and the menu hasn't been previously filled with the label item.

[Mirco Müller (macslow)]

Approved.

review: Approve

=== modified file 'unity-private/launcher/quicklist-controller.vala'
--- unity-private/launcher/quicklist-controller.vala	2010-09-14 08:55:25 +0000
+++ unity-private/launcher/quicklist-controller.vala	2010-09-16 00:17:51 +0000
@@ -196,6 +196,16 @@
           if (Unity.global_shell is Unity.Shell)
             Unity.global_shell.add_fullscreen_request (this);
 
+          if(menu.get_num_items() == 0)
+            {
+              // It can happen that the quicklist menu is requested and the menu was not previously filled with a label. 
+              // In this case we fill the menu with the label first.
+              string label = attached_controller.name;
+              var menuitem = new QuicklistMenuItem.with_label (label);
+              menuitem.reactive = false;
+              menu.append (menuitem, false);
+            }
+            
           menu.close_on_leave = false;
           menu.set_detect_clicks (true);
           // grab the top menu