diff options
| author | lukefromdc <[email protected]> | 2019-04-03 03:26:13 -0400 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2019-04-08 19:58:25 +0200 |
| commit | 03879a95d4e7af812be6e0d7017855da67cf2ab3 (patch) | |
| tree | caa61ac390f830436e7472f907c19e81cc8351d6 /src | |
| parent | dac2499eca04cdc0c96636b3ef0b9e8f4de7f0e7 (diff) | |
| download | caja-03879a95d4e7af812be6e0d7017855da67cf2ab3.tar.bz2 caja-03879a95d4e7af812be6e0d7017855da67cf2ab3.tar.xz | |
Pass "NULL" for keyboard event
Fix #1198 "Context menu with menu key broken"
Pass "NULL" for event which is passed ultimately to gtk_menu_popup_at_pointer as an invalid event was being passed when the menu key was used to open the icon views context menu
Diffstat (limited to 'src')
| -rw-r--r-- | src/file-manager/fm-directory-view.c | 6 | ||||
| -rw-r--r-- | src/file-manager/fm-icon-view.c | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c index ef3daa87..2be71ead 100644 --- a/src/file-manager/fm-directory-view.c +++ b/src/file-manager/fm-directory-view.c @@ -9188,9 +9188,13 @@ fm_directory_view_pop_up_selection_context_menu (FMDirectoryView *view, update_context_menu_position_from_event (view, event); + /* FIXME: passing event from here won't work + * for gtk_menu_popup_at_pointer (in eel_pop_up_context_menu() ) + * if the menu is being triggered from here by the menu key + */ eel_pop_up_context_menu (create_popup_menu (view, FM_DIRECTORY_VIEW_POPUP_PATH_SELECTION), - event); + NULL); } /** diff --git a/src/file-manager/fm-icon-view.c b/src/file-manager/fm-icon-view.c index 147218ab..87bdee15 100644 --- a/src/file-manager/fm-icon-view.c +++ b/src/file-manager/fm-icon-view.c @@ -2556,8 +2556,12 @@ icon_container_context_click_background_callback (CajaIconContainer *container, g_assert (CAJA_IS_ICON_CONTAINER (container)); g_assert (FM_IS_ICON_VIEW (icon_view)); + /* FIXME: passing event from here won't work + * for gtk_menu_popup_at_pointer (in eel_pop_up_context_menu() ) + * if the menu is being triggered from here by the menu key + */ fm_directory_view_pop_up_background_context_menu - (FM_DIRECTORY_VIEW (icon_view), event); + (FM_DIRECTORY_VIEW (icon_view), NULL); } static gboolean |