Commit d65ccf96 authored by Philip Withnall's avatar Philip Withnall

gtknotebook: Add more non-NULL checks for cur_page

These were not spotted by scan-build, but from some brief mental
reasoning could potentially be problem areas.

https://bugzilla.gnome.org/show_bug.cgi?id=712760
parent 3b45be94
......@@ -3401,7 +3401,7 @@ scroll_notebook_timer (gpointer data)
first_tab = gtk_notebook_search_page (notebook, priv->first_tab,
(pointer_position == POINTER_BEFORE) ? STEP_PREV : STEP_NEXT,
TRUE);
if (first_tab)
if (first_tab && priv->cur_page)
{
priv->first_tab = first_tab;
gtk_notebook_pages_allocate (notebook);
......@@ -3692,6 +3692,8 @@ gtk_notebook_drag_begin (GtkWidget *widget,
priv->dnd_timer = 0;
}
g_assert (priv->cur_page != NULL);
priv->operation = DRAG_OPERATION_DETACH;
gtk_notebook_pages_allocate (notebook);
......@@ -3827,6 +3829,8 @@ gtk_notebook_drag_motion (GtkWidget *widget,
goto out;
}
g_assert (priv->cur_page != NULL);
stop_scrolling (notebook);
target = gtk_drag_dest_find_target (widget, context, NULL);
tab_target = gdk_atom_intern_static_string ("GTK_NOTEBOOK_TAB");
......@@ -6096,6 +6100,8 @@ gtk_notebook_calculate_tabs_allocation (GtkNotebook *notebook,
GtkAllocation child_allocation = { 0, };
GtkOrientation tab_expand_orientation;
g_assert (priv->cur_page != NULL);
widget = GTK_WIDGET (notebook);
container = GTK_CONTAINER (notebook);
gtk_widget_style_get (widget, "tab-overlap", &tab_overlap, NULL);
......
Markdown is supported
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