From: Cody Russell Date: Mon, 4 Jun 2007 18:17:14 +0000 (+0000) Subject: Check if down_button is NULL. This happens when the pathbar button for the X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=ea8f3758dd089a0015388abd8cebbad0d5f6f6df;p=~andy%2Fgtk Check if down_button is NULL. This happens when the pathbar button for the 2007-06-04 Cody Russell * gtk/gtkpathbar.c (gtk_path_bar_scroll_down): Check if down_button is NULL. This happens when the pathbar button for the current directory is too large to fit in the space, e.g. on Windows for directories named something like "My Documents and Settings". svn path=/trunk/; revision=18030 --- diff --git a/ChangeLog b/ChangeLog index 61e9e487a..984c3ca02 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2007-06-04 Cody Russell + + * gtk/gtkpathbar.c (gtk_path_bar_scroll_down): Check + if down_button is NULL. This happens when the pathbar button + for the current directory is too large to fit in the + space, e.g. on Windows for directories named something like + "My Documents and Settings". + 2007-06-04 Matthias Clasen * configure.in: Bump version diff --git a/gtk/gtkpathbar.c b/gtk/gtkpathbar.c index fdda4f930..e63eeac9b 100644 --- a/gtk/gtkpathbar.c +++ b/gtk/gtkpathbar.c @@ -722,7 +722,10 @@ gtk_path_bar_scroll_down (GtkWidget *button, GtkPathBar *path_bar) } } - space_needed = BUTTON_DATA (down_button->data)->button->allocation.width + path_bar->spacing; + /* We check if down_button might be NULL in cases where the pathbar's horizontal size is smaller + * than the button and it doesn't get displayed. e.g., on Windows it might be "My Documents and Settings" + */ + space_needed = down_button ? BUTTON_DATA (down_button->data)->button->allocation.width : 0 + path_bar->spacing; if (direction == GTK_TEXT_DIR_RTL) space_available = path_bar->down_slider_button->allocation.x - GTK_WIDGET (path_bar)->allocation.x; else