summaryrefslogtreecommitdiff
path: root/src/file-manager
diff options
context:
space:
mode:
authorlukefromdc <[email protected]>2019-04-03 03:26:13 -0400
committerraveit65 <[email protected]>2019-04-08 19:55:25 +0200
commit830bf0b35622d68eb495bb66410a67386ca41af2 (patch)
tree7befa7e4ac94acc05cf7dcb2b58a24d48395cfc2 /src/file-manager
parent5d9b2d534d0ad13da7bbde0572dfec5b5b078c79 (diff)
downloadcaja-830bf0b35622d68eb495bb66410a67386ca41af2.tar.bz2
caja-830bf0b35622d68eb495bb66410a67386ca41af2.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/file-manager')
-rw-r--r--src/file-manager/fm-directory-view.c6
-rw-r--r--src/file-manager/fm-icon-view.c6
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 835d5e81..49072404 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -9187,9 +9187,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 fa71811e..110ed58c 100644
--- a/src/file-manager/fm-icon-view.c
+++ b/src/file-manager/fm-icon-view.c
@@ -2552,8 +2552,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