summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorraveit65 <[email protected]>2018-05-09 09:46:41 +0200
committerraveit65 <[email protected]>2018-05-09 09:46:41 +0200
commitef714ac8eb7581e50a42f40eb484ad3adc4a5f66 (patch)
treefcb6a30a04aa2abc395671ebdfe0592e4f49638c
parenta03aa8c164e1a595a12c44127912b2e75c12e56d (diff)
downloadengrampa-ef714ac8eb7581e50a42f40eb484ad3adc4a5f66.tar.bz2
engrampa-ef714ac8eb7581e50a42f40eb484ad3adc4a5f66.tar.xz
fr-window: Replace deprecated gtk_menu_popup functions
-rw-r--r--src/fr-window.c28
1 files changed, 8 insertions, 20 deletions
diff --git a/src/fr-window.c b/src/fr-window.c
index 16c757a..33d42f5 100644
--- a/src/fr-window.c
+++ b/src/fr-window.c
@@ -3604,11 +3604,8 @@ dir_tree_button_press_cb (GtkWidget *widget,
gtk_tree_selection_select_iter (selection, &iter);
}
- gtk_menu_popup (GTK_MENU (window->priv->sidebar_folder_popup_menu),
- NULL, NULL, NULL,
- window,
- event->button,
- event->time);
+ gtk_menu_popup_at_pointer (GTK_MENU (window->priv->sidebar_folder_popup_menu),
+ (const GdkEvent*) event);
}
else
gtk_tree_selection_unselect_all (selection);
@@ -3796,17 +3793,11 @@ file_button_press_cb (GtkWidget *widget,
n_selected = fr_window_get_n_selected_files (window);
if ((n_selected == 1) && selection_has_a_dir (window))
- gtk_menu_popup (GTK_MENU (window->priv->folder_popup_menu),
- NULL, NULL, NULL,
- window,
- event->button,
- event->time);
+ gtk_menu_popup_at_pointer (GTK_MENU (window->priv->folder_popup_menu),
+ (const GdkEvent*) event);
else
- gtk_menu_popup (GTK_MENU (window->priv->file_popup_menu),
- NULL, NULL, NULL,
- window,
- event->button,
- event->time);
+ gtk_menu_popup_at_pointer (GTK_MENU (window->priv->file_popup_menu),
+ (const GdkEvent*) event);
return TRUE;
}
else if ((event->type == GDK_BUTTON_PRESS) && (event->button == 1)) {
@@ -4604,11 +4595,8 @@ key_press_cb (GtkWidget *widget,
if (selection == NULL)
return FALSE;
- gtk_menu_popup (GTK_MENU (window->priv->file_popup_menu),
- NULL, NULL, NULL,
- window,
- 3,
- GDK_CURRENT_TIME);
+ gtk_menu_popup_at_pointer (GTK_MENU (window->priv->file_popup_menu),
+ (const GdkEvent*) event);
retval = TRUE;
}
break;