AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

scrolledwindow: Avoid usage of uninitialized local

Browse Source 
the scrollbar passed in better be either priv->hscrollbar or
priv->vscrollbar. Ensure that by using a simple else instead of an
else-if and a g_assert.
This commit is contained in:
Timm Bäder 2017-02-18 10:43:14 +01:00
parent 54a0df69d7
commit ed245b42cb
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk/gtkscrolledwindow.c
View File

@ -3188,8 +3188,10 @@ gtk_scrolled_window_allocate_scrollbar (GtkScrolledWindow *scrolled_window,
child_allocation.width = content_allocation.width; child_allocation.width = content_allocation.width;
child_allocation.height = sb_height; child_allocation.height = sb_height;
} }
else if (scrollbar == priv->vscrollbar) else
{ {
g_assert (scrollbar == priv->vscrollbar);
if ((_gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL && if ((_gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL &&
(priv->window_placement == GTK_CORNER_TOP_RIGHT || (priv->window_placement == GTK_CORNER_TOP_RIGHT ||
priv->window_placement == GTK_CORNER_BOTTOM_RIGHT)) || priv->window_placement == GTK_CORNER_BOTTOM_RIGHT)) ||