Commit 9bc80b77 authored by Sebastian Ramacher's avatar Sebastian Ramacher
Browse files

Update handling of event == NULL


Signed-off-by: Sebastian Ramacher's avatarSebastian Ramacher <sebastian+dev@ramacher.at>
parent e087fa66
...@@ -967,7 +967,11 @@ static void ...@@ -967,7 +967,11 @@ static void
zathura_page_widget_popup_menu(GtkWidget* widget, GdkEventButton* event) zathura_page_widget_popup_menu(GtkWidget* widget, GdkEventButton* event)
{ {
g_return_if_fail(widget != NULL); g_return_if_fail(widget != NULL);
g_return_if_fail(event != NULL); if (event == NULL) {
/* do something here in the future in case we have general popups */
return;
}
zathura_page_widget_private_t* priv = ZATHURA_PAGE_GET_PRIVATE(widget); zathura_page_widget_private_t* priv = ZATHURA_PAGE_GET_PRIVATE(widget);
if (priv->images.retrieved == false) { if (priv->images.retrieved == false) {
...@@ -1015,16 +1019,8 @@ zathura_page_widget_popup_menu(GtkWidget* widget, GdkEventButton* event) ...@@ -1015,16 +1019,8 @@ zathura_page_widget_popup_menu(GtkWidget* widget, GdkEventButton* event)
} }
/* attach and popup */ /* attach and popup */
int event_button = 0;
int event_time = gtk_get_current_event_time();
if (event != NULL) {
event_button = event->button;
event_time = event->time;
}
gtk_menu_attach_to_widget(GTK_MENU(menu), widget, NULL); gtk_menu_attach_to_widget(GTK_MENU(menu), widget, NULL);
gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, event_button, event_time); gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, event->button, event->time);
} }
static gboolean static gboolean
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment