Updating branch refs/heads/master to 5c5d03aa79d9a987efad664fca983970c80660c8 (commit) from abe2ce34e45b552216869cd59639fe74875d5b26 (commit)
commit 5c5d03aa79d9a987efad664fca983970c80660c8 Author: Nick Schermer <n...@xfce.org> Date: Thu Dec 29 16:24:38 2011 +0100 Avoid segfault on null iter data. src/appfinder-category-model.c | 10 +++++++--- src/appfinder-window.c | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/appfinder-category-model.c b/src/appfinder-category-model.c index 8325ea3..483c4cc 100644 --- a/src/appfinder-category-model.c +++ b/src/appfinder-category-model.c @@ -563,10 +563,14 @@ xfce_appfinder_category_model_row_separator_func (GtkTreeModel *tree_model, appfinder_return_val_if_fail (XFCE_IS_APPFINDER_CATEGORY_MODEL (tree_model), FALSE); appfinder_return_val_if_fail (iter->stamp == XFCE_APPFINDER_CATEGORY_MODEL (tree_model)->stamp, FALSE); - appfinder_return_val_if_fail (iter->user_data != NULL, FALSE); - item = ITER_GET_DATA (iter); - return (item->directory == NULL); + if (iter->user_data != NULL) + { + item = ITER_GET_DATA (iter); + return (item->directory == NULL); + } + + return FALSE; } diff --git a/src/appfinder-window.c b/src/appfinder-window.c index 238127a..9b64e1d 100644 --- a/src/appfinder-window.c +++ b/src/appfinder-window.c @@ -259,7 +259,7 @@ xfce_appfinder_window_init (XfceAppfinderWindow *window) G_CALLBACK (xfce_appfinder_window_entry_activate), window); g_signal_connect (G_OBJECT (entry), "key-press-event", G_CALLBACK (xfce_appfinder_window_entry_key_press_event), window); - gtk_entry_set_icon_tooltip_text (GTK_ENTRY (window->entry), + gtk_entry_set_icon_tooltip_text (GTK_ENTRY (entry), GTK_ENTRY_ICON_SECONDARY, _("Toggle view mode")); gtk_widget_show (entry); _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits