[gnome-applets/wip-geiger-warnings: 3/4] window-picker: use gp_applet_popup_menu_for_widget

[Sebastian Geiger <segeiger src gnome org>]

commit 4bf77336010463bc82b38abd0a623f9fa5472cae
Author: Sebastian Geiger <sbastig gmx net>
Date:   Sun Apr 5 20:25:48 2020 +0200

    window-picker: use gp_applet_popup_menu_for_widget

 gnome-applets/window-picker/task-item.c     | 44 ++---------------------------
 gnome-applets/window-picker/wp-task-title.c | 44 ++---------------------------
 2 files changed, 6 insertions(+), 82 deletions(-)
---
diff --git a/gnome-applets/window-picker/task-item.c b/gnome-applets/window-picker/task-item.c
index bc373d1c1..22655eca4 100644
--- a/gnome-applets/window-picker/task-item.c
+++ b/gnome-applets/window-picker/task-item.c
@@ -459,46 +459,6 @@ static void on_size_allocate (
     update_hints (item);
 }
 
-static void
-popup_menu_at_item (TaskItem *item,
-                    GtkMenu  *menu,
-                    GdkEvent *event)
-{
-    GdkGravity widget_anchor;
-    GdkGravity menu_anchor;
-
-    switch (gp_applet_get_position (GP_APPLET (item->windowPickerApplet)))
-    {
-        case GTK_POS_TOP:
-            widget_anchor = GDK_GRAVITY_SOUTH_WEST;
-            menu_anchor = GDK_GRAVITY_NORTH_WEST;
-            break;
-
-        case GTK_POS_LEFT:
-            widget_anchor = GDK_GRAVITY_NORTH_EAST;
-            menu_anchor = GDK_GRAVITY_NORTH_WEST;
-            break;
-
-        case GTK_POS_RIGHT:
-            widget_anchor = GDK_GRAVITY_NORTH_WEST;
-            menu_anchor = GDK_GRAVITY_NORTH_EAST;
-            break;
-
-        case GTK_POS_BOTTOM:
-            widget_anchor = GDK_GRAVITY_NORTH_WEST;
-            menu_anchor = GDK_GRAVITY_SOUTH_WEST;
-            break;
-
-        default:
-            g_assert_not_reached ();
-            break;
-    }
-
-    gtk_menu_popup_at_widget (menu, GTK_WIDGET (item),
-                              widget_anchor, menu_anchor,
-                              event);
-}
-
 static gboolean on_button_pressed (
     GtkWidget      *button,
     GdkEventButton *event,
@@ -512,7 +472,9 @@ static gboolean on_button_pressed (
     if (event->button == 3) {
         GtkWidget *menu = wnck_action_menu_new (window);
 
-        popup_menu_at_item (item, GTK_MENU (menu), (GdkEvent *) event);
+        gp_applet_popup_menu_for_widget (GP_APPLET (item->windowPickerApplet),
+                                         GTK_MENU (menu), GTK_WIDGET (item),
+                                         (GdkEvent *) event);
 
         return TRUE;
     }
diff --git a/gnome-applets/window-picker/wp-task-title.c b/gnome-applets/window-picker/wp-task-title.c
index ee7d66f5d..a0c281eb3 100644
--- a/gnome-applets/window-picker/wp-task-title.c
+++ b/gnome-applets/window-picker/wp-task-title.c
@@ -470,46 +470,6 @@ wp_task_title_class_init (WpTaskTitleClass *title_class)
   g_object_class_install_properties (object_class, LAST_PROP, properties);
 }
 
-static void
-popup_menu_at_item (WpTaskTitle *title,
-                    GtkMenu     *menu,
-                    GdkEvent    *event)
-{
-    GdkGravity widget_anchor;
-    GdkGravity menu_anchor;
-
-    switch (gp_applet_get_position (GP_APPLET (title->applet)))
-    {
-        case GTK_POS_TOP:
-            widget_anchor = GDK_GRAVITY_SOUTH_WEST;
-            menu_anchor = GDK_GRAVITY_NORTH_WEST;
-            break;
-
-        case GTK_POS_LEFT:
-            widget_anchor = GDK_GRAVITY_NORTH_EAST;
-            menu_anchor = GDK_GRAVITY_NORTH_WEST;
-            break;
-
-        case GTK_POS_RIGHT:
-            widget_anchor = GDK_GRAVITY_NORTH_WEST;
-            menu_anchor = GDK_GRAVITY_NORTH_EAST;
-            break;
-
-        case GTK_POS_BOTTOM:
-            widget_anchor = GDK_GRAVITY_NORTH_WEST;
-            menu_anchor = GDK_GRAVITY_SOUTH_WEST;
-            break;
-
-        default:
-            g_assert_not_reached ();
-            break;
-    }
-
-    gtk_menu_popup_at_widget (menu, GTK_WIDGET (title),
-                              widget_anchor, menu_anchor,
-                              event);
-}
-
 static gboolean
 label_button_press_event_cb (GtkWidget      *widget,
                              GdkEventButton *event,
@@ -531,7 +491,9 @@ label_button_press_event_cb (GtkWidget      *widget,
 
           menu = wnck_action_menu_new (title->active_window);
 
-          popup_menu_at_item (title, GTK_MENU (menu), (GdkEvent *) event);
+          gp_applet_popup_menu_for_widget (GP_APPLET (title->applet),
+                                           GTK_MENU (menu), GTK_WIDGET (title),
+                                           (GdkEvent *) event);
 
           return TRUE;
         }