[gtk+/wip/attachment-parameters-4: 174/180] gtkwindow: use gtk_menu_popup_with_params ()

[William Hua <williamhua src gnome org>]

commit 47ff4b34583ec72c71bb240dac5eea1bc1087589
Author: William Hua <william hua canonical com>
Date:   Wed Sep 23 11:47:07 2015 -0400

    gtkwindow: use gtk_menu_popup_with_params ()

 gtk/gtkwindow.c |   26 +++++++-------------------
 1 files changed, 7 insertions(+), 19 deletions(-)
---
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index b929a9c..4c902e2 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -8785,15 +8785,6 @@ popup_menu_detach (GtkWidget *widget,
 }
 
 static void
-popup_position_func (GtkMenu   *menu,
-                     gint      *x,
-                     gint      *y,
-                     gboolean  *push_in,
-                     gpointer   user_data)
-{
-}
-
-static void
 close_window_clicked (GtkMenuItem *menuitem,
                       gpointer     user_data)
 {
@@ -8829,16 +8820,13 @@ gtk_window_do_popup_fallback (GtkWindow      *window,
                     G_CALLBACK (close_window_clicked), window);
   gtk_menu_shell_append (GTK_MENU_SHELL (priv->popup_menu), menuitem);
 
-  if (event)
-    gtk_menu_popup (GTK_MENU (priv->popup_menu),
-                    NULL, NULL,
-                    NULL, NULL,
-                    event->button, event->time);
-  else
-    gtk_menu_popup (GTK_MENU (priv->popup_menu),
-                    NULL, NULL,
-                    popup_position_func, window,
-                    0, gtk_get_current_event_time ());
+  gtk_menu_popup_with_params (GTK_MENU (priv->popup_menu),
+                              NULL,
+                              NULL,
+                              NULL,
+                              event ? event->button : 0,
+                              event ? event->time : gtk_get_current_event_time (),
+                              NULL);
 }
 
 static void