client/maynard: Avoid deactivating when activating a different surface

Currently when maynard activates either launcher or indicators_menu it
deactivates the previous surface. In order to be able to display the
previous displayed surface if it wasn't explicitly deactivated, avoid
deactivating it implicitly.

This allows now to be able to show the launcher menu when displaying
the indicators_menu as a popup.
Signed-off-by: Walter Lozano <walter.lozano@collabora.com>

client/maynard.c

@@ -239,12 +239,11 @@ launcher_toggle (GtkWidget *widget,
 {
   if (desktop->launcher_visible)
     {
-      all_deactivate (desktop);
+      launcher_deactivate (desktop);
     }
   else
     {
-      indicators_menu_deactivate (desktop);
-      launcher_activate(desktop);
+      launcher_activate (desktop);
     }
 }
 
@@ -317,11 +316,10 @@ indicators_menu_toggle (GtkWidget *widget,
 {
   if (desktop->indicators_menu_visible)
     {
-      all_deactivate (desktop);
+      indicators_menu_deactivate (desktop);
     }
   else
     {
-      launcher_deactivate (desktop);
       indicators_menu_activate (desktop);
     }
 }