and remove gimp_button_event_triggers_context_menu() again. Update all callers to use the new function.