[metacity] menu: fix build warnings

[Alberts Muktupāvels <muktupavels src gnome org>]

commit 556316cf4fbe04b3814568b53fd47206ace959e3
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Sun Sep 20 18:55:17 2015 +0300

    menu: fix build warnings

 src/ui/menu.c |   14 ++++----------
 1 files changed, 4 insertions(+), 10 deletions(-)
---
diff --git a/src/ui/menu.c b/src/ui/menu.c
index 11471a4..52df466 100644
--- a/src/ui/menu.c
+++ b/src/ui/menu.c
@@ -352,18 +352,15 @@ meta_window_menu_new   (MetaFrames         *frames,
           mi = menu_item_new (&menuitem, -1);
 
           /* Set the activeness of radiobuttons. */
-          switch (menuitem.op)
+          if (menuitem.op == META_MENU_OP_STICK)
             {
-            case META_MENU_OP_STICK:
               gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (mi),
                                               active_workspace == 0xFFFFFFFF);
-              break;
-            case META_MENU_OP_UNSTICK:
+            }
+          else if (menuitem.op == META_MENU_OP_UNSTICK)
+            {
               gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (mi),
                                               active_workspace != 0xFFFFFFFF);
-              break;
-            default:
-              break;
             }
 
           if (menuitem.type == MENU_ITEM_WORKSPACE_LIST)
@@ -400,9 +397,6 @@ meta_window_menu_new   (MetaFrames         *frames,
                   for (j = 0; j < n_workspaces; j++)
                     {
                       char *label;
-                      MenuData *md;
-                      unsigned int key;
-                      MetaVirtualModifier mods;
                       MenuItem moveitem;
                       GtkWidget *submi;