general: Stop relying on side effect in warning macros

The expression will not be evaluated if the macros are disabled.
This commit is contained in:
Ernestas Kulik 2018-05-25 15:56:46 +03:00
parent fc4cbbe647
commit 35536fdea8
2 changed files with 8 additions and 2 deletions

View file

@ -1704,7 +1704,10 @@ on_motion_notify (GtkWidget *widget,
update_row_shadowing (dialog->preselected_row2, FALSE);
}
g_return_val_if_fail (gdk_event_get_coords (event, NULL, &y), GDK_EVENT_PROPAGATE);
if (G_UNLIKELY (!gdk_event_get_coords (event, NULL, &y)))
{
g_return_val_if_reached (GDK_EVENT_PROPAGATE);
}
if (widget == dialog->result_listbox)
{

View file

@ -285,7 +285,10 @@ nautilus_list_view_dnd_drag_begin (NautilusListView *list_view,
source_target_list = nautilus_list_model_get_drag_target_list ();
}
g_return_val_if_fail (gdk_event_get_coords (event, &x, &y), GDK_EVENT_PROPAGATE);
if (G_UNLIKELY (!gdk_event_get_coords (event, &x, &y)))
{
g_return_val_if_reached (GDK_EVENT_PROPAGATE);
}
if (gtk_drag_check_threshold (GTK_WIDGET (list_view->details->tree_view),
list_view->details->drag_x,