[gtk+/wip/attach-params-2: 5/13] 99db2f96 gtkmenu: initializer fix-up

[William Hua <williamhua src gnome org>]

commit 9cd913ee0e56f99412b7a58470208339d0137816
Author: William Hua <william hua canonical com>
Date:   Thu Feb 18 14:40:35 2016 -0500

    99db2f96 gtkmenu: initializer fix-up

 gtk/gtkmenu.c |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index 0059056..6a1e867 100644
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -1781,12 +1781,12 @@ get_arrows_border (GtkMenu   *menu,
                    GtkBorder *border)
 {
   GtkMenuPrivate *priv = menu->priv;
-  guint scroll_arrow_height;
   GtkArrowPlacement arrow_placement;
+  guint scroll_arrow_height;
 
   gtk_widget_style_get (GTK_WIDGET (menu),
-                        "scroll-arrow-vlength", &scroll_arrow_height,
                         "arrow_placement", &arrow_placement,
+                        "scroll-arrow-vlength", &scroll_arrow_height,
                         NULL);
 
   switch (arrow_placement)
@@ -1809,7 +1809,8 @@ get_arrows_border (GtkMenu   *menu,
       break;
     }
 
-  border->left = border->right = 0;
+  border->left = 0;
+  border->right = 0;
 }
 
 /**
@@ -1944,11 +1945,11 @@ gtk_menu_popup_with_params (GtkMenu           *menu,
                             GdkWindowTypeHint  type_hint,
                             GdkAttachParams   *params)
 {
+  GdkRectangle rectangle = { 0 };
+  GdkWindow *parent = NULL;
+  GdkEvent *current_event;
   GdkDisplay *display;
   GdkDevice *pointer;
-  GdkWindow *parent;
-  GdkEvent *current_event;
-  GdkRectangle rectangle = { 0 };
   gint x;
   gint y;
 
@@ -1963,8 +1964,6 @@ gtk_menu_popup_with_params (GtkMenu           *menu,
 
       if (!attach_widget)
         {
-          parent = NULL;
-
           if (!seat)
             {
               current_event = gtk_get_current_event ();