diff -r 46a5db31d820 -r a7b3becdc6ea pidgin/gtkdebug.c
--- a/pidgin/gtkdebug.c	Tue Sep 19 22:43:12 2017 -0500
+++ b/pidgin/gtkdebug.c	Fri Sep 22 03:44:07 2017 +0000
@@ -396,7 +396,7 @@
 	GtkToolbarStyle value[3];
 	int i;
 
-	if (!(event->button == 3 && event->type == GDK_BUTTON_PRESS))
+	if (!gdk_event_triggers_context_menu((GdkEvent *)event))
 		return FALSE;
 
 	text[0] = _("_Icon Only");          value[0] = GTK_TOOLBAR_ICONS;
@@ -416,7 +416,7 @@
 
 	gtk_widget_show_all(menu);
 
-	gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, 3, event->time);
+	gtk_menu_popup_at_pointer(GTK_MENU(menu), (GdkEvent *)event);
 	return FALSE;
 }