Commit 2821457a authored by Alberts Muktupāvels's avatar Alberts Muktupāvels

panel: avoid deprecated gtk_menu_popup

parent d727e389
Pipeline #30463 failed with stage
in 2 minutes and 52 seconds
...@@ -232,8 +232,7 @@ make_popup_panel_menu (PanelWidget *panel_widget) ...@@ -232,8 +232,7 @@ make_popup_panel_menu (PanelWidget *panel_widget)
static gboolean static gboolean
panel_popup_menu (PanelToplevel *toplevel, panel_popup_menu (PanelToplevel *toplevel,
guint button, GdkEvent *event)
guint32 activate_time)
{ {
PanelWidget *panel_widget; PanelWidget *panel_widget;
GtkWidget *menu; GtkWidget *menu;
...@@ -247,7 +246,7 @@ panel_popup_menu (PanelToplevel *toplevel, ...@@ -247,7 +246,7 @@ panel_popup_menu (PanelToplevel *toplevel,
gtk_menu_set_screen (GTK_MENU (menu), gtk_menu_set_screen (GTK_MENU (menu),
gtk_window_get_screen (GTK_WINDOW (toplevel))); gtk_window_get_screen (GTK_WINDOW (toplevel)));
gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, button, activate_time); gtk_menu_popup_at_pointer (GTK_MENU (menu), event);
return TRUE; return TRUE;
} }
...@@ -264,7 +263,7 @@ panel_button_press_event (PanelToplevel *toplevel, ...@@ -264,7 +263,7 @@ panel_button_press_event (PanelToplevel *toplevel,
modifiers = event->state & gtk_accelerator_get_default_mod_mask (); modifiers = event->state & gtk_accelerator_get_default_mod_mask ();
if (modifiers == panel_bindings_get_mouse_button_modifier_keymask ()) if (modifiers == panel_bindings_get_mouse_button_modifier_keymask ())
return panel_popup_menu (toplevel, event->button, event->time); return panel_popup_menu (toplevel, (GdkEvent *) event);
return FALSE; return FALSE;
} }
...@@ -283,7 +282,7 @@ panel_key_press_event (PanelToplevel *toplevel, ...@@ -283,7 +282,7 @@ panel_key_press_event (PanelToplevel *toplevel,
panel_util_key_event_is_popup_panel (event, &is_popup, NULL); panel_util_key_event_is_popup_panel (event, &is_popup, NULL);
if (is_popup) if (is_popup)
return panel_popup_menu (toplevel, 3, event->time); return panel_popup_menu (toplevel, (GdkEvent *) event);
return FALSE; return FALSE;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment