[gtk+/wip/attachment-rectangle] Revert "menubutton: use gtk_menu_popup_against ()"

[William Hua <williamhua src gnome org>]

commit 873717f2ac816d67c30ce68f358667ca45c4dabb
Author: William Hua <william hua canonical com>
Date:   Thu Aug 27 11:20:48 2015 +0100

    Revert "menubutton: use gtk_menu_popup_against ()"
    
    This reverts commit 420ca22f4c10a90ec48fd15dc8f65eb27ace4ae5.

 gtk/gtkmenubutton.c |   49 ++++++++++++++++++++-----------------------------
 1 files changed, 20 insertions(+), 29 deletions(-)
---
diff --git a/gtk/gtkmenubutton.c b/gtk/gtkmenubutton.c
index 4a5a05d..2126087 100644
--- a/gtk/gtkmenubutton.c
+++ b/gtk/gtkmenubutton.c
@@ -376,7 +376,7 @@ popup_menu (GtkMenuButton *menu_button,
             GdkEvent      *event)
 {
   GtkMenuButtonPrivate *priv = menu_button->priv;
-  GdkAttachmentOptions options;
+  GtkMenuPositionFunc func;
   GdkDevice *device;
   guint button;
   guint32 time;
@@ -387,6 +387,17 @@ popup_menu (GtkMenuButton *menu_button,
   if (!priv->menu)
     return;
 
+  switch (priv->arrow_type)
+    {
+      case GTK_ARROW_LEFT:
+      case GTK_ARROW_RIGHT:
+        func = (GtkMenuPositionFunc) menu_position_side_func;
+        break;
+      default:
+        func = (GtkMenuPositionFunc) menu_position_up_down_func;
+        break;
+  }
+
   if (event != NULL &&
       gdk_event_get_screen (event) == gtk_widget_get_screen (GTK_WIDGET (menu_button)))
     {
@@ -401,34 +412,14 @@ popup_menu (GtkMenuButton *menu_button,
       time = gtk_get_current_event_time ();
     }
 
-  switch (priv->arrow_type)
-    {
-    case GTK_ARROW_UP:
-      options = GDK_ATTACHMENT_ATTACH_TOP_EDGE;
-      break;
-    case GTK_ARROW_DOWN:
-    case GTK_ARROW_NONE:
-      options = GDK_ATTACHMENT_ATTACH_BOTTOM_EDGE;
-      break;
-    case GTK_ARROW_LEFT:
-      options = GDK_ATTACHMENT_ATTACH_LEFT_EDGE;
-      break;
-    case GTK_ARROW_RIGHT:
-      options = GDK_ATTACHMENT_ATTACH_RIGHT_EDGE;
-      break;
-    }
-
-  gtk_menu_popup_against (GTK_MENU (priv->menu),
-                          device,
-                          NULL,
-                          GTK_WIDGET (menu_button),
-                          NULL,
-                          options,
-                          NULL,
-                          NULL,
-                          NULL,
-                          button,
-                          time);
+  gtk_menu_popup_for_device (GTK_MENU (priv->menu),
+                             device,
+                             NULL, NULL,
+                             func,
+                             GTK_WIDGET (menu_button),
+                             NULL,
+                             button,
+                             time);
 }
 
 static void