[gtk+/wip/attach-params-2: 11/13] 99db2f96 gtkmenu: params must be non-NULL

[William Hua <williamhua src gnome org>]

commit e7503248d7111bf2926c7ae76eba0f1c1a595829
Author: William Hua <william hua canonical com>
Date:   Thu Feb 18 15:14:46 2016 -0500

    99db2f96 gtkmenu: params must be non-NULL

 gtk/gtkmenu.c |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)
---
diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index 6a1e867..ea070f2 100644
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -4554,20 +4554,22 @@ gtk_menu_position (GtkMenu  *menu,
    */
   gtk_widget_realize (priv->toplevel);
 
-  if (!gtk_widget_get_mapped (priv->toplevel) && priv->attach_params)
+  if (priv->attach_params)
     {
-      type_hint = priv->type_hint;
+      if (!gtk_widget_get_mapped (priv->toplevel))
+        {
+          type_hint = priv->type_hint;
 
-      if (type_hint == GDK_WINDOW_TYPE_HINT_NORMAL)
-        type_hint = GDK_WINDOW_TYPE_HINT_POPUP_MENU;
+          if (type_hint == GDK_WINDOW_TYPE_HINT_NORMAL)
+            type_hint = GDK_WINDOW_TYPE_HINT_POPUP_MENU;
 
-      gtk_window_set_type_hint (GTK_WINDOW (priv->toplevel), type_hint);
-    }
+          gtk_window_set_type_hint (GTK_WINDOW (priv->toplevel), type_hint);
+        }
 
-  gdk_window_move_using_params (gtk_widget_get_window (priv->toplevel), priv->attach_params);
+      gdk_window_move_using_params (gtk_widget_get_window (priv->toplevel), priv->attach_params);
 
-  if (priv->attach_params)
-    return;
+      return;
+    }
 
   widget = GTK_WIDGET (menu);