From dcc515c86296643f01f0895018ba69b879bb787a Mon Sep 17 00:00:00 2001 From: Darin Adler Date: Thu, 10 Feb 2000 02:10:36 +0000 Subject: [PATCH] After talking to John, removed the asserts from both of these routines. * fm-directory-view-icons.c: (fm_directory_view_icons_get_full_icon_text_attribute_names): (fm_directory_view_icons_set_full_icon_text_attribute_names): After talking to John, removed the asserts from both of these routines. Later, he'll figure out whether this needs refinement, but for now we just want to avoid the abort on startup! --- ChangeLog-20000414 | 9 +++++++++ src/file-manager/fm-directory-view-icons.c | 12 ++---------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/ChangeLog-20000414 b/ChangeLog-20000414 index 82ad8ec0c..fece53acc 100644 --- a/ChangeLog-20000414 +++ b/ChangeLog-20000414 @@ -1,3 +1,12 @@ +2000-02-09 Darin Adler + + * fm-directory-view-icons.c: + (fm_directory_view_icons_get_full_icon_text_attribute_names): + (fm_directory_view_icons_set_full_icon_text_attribute_names): + After talking to John, removed the asserts from both of these + routines. Later, he'll figure out whether this needs refinement, + but for now we just want to avoid the abort on startup! + 2000-02-09 Darin Adler Reworked the canvas item class used by the icon diff --git a/src/file-manager/fm-directory-view-icons.c b/src/file-manager/fm-directory-view-icons.c index cf8cdadcd..e86624c69 100644 --- a/src/file-manager/fm-directory-view-icons.c +++ b/src/file-manager/fm-directory-view-icons.c @@ -467,11 +467,6 @@ fm_directory_view_icons_get_full_icon_text_attribute_names (FMDirectoryViewIcons * for consistency and possible future expansion. */ - /* Don't let callers get away with using a non-NULL value here since - * it probably means they're expecting something directory-specific. - */ - g_assert (view == NULL); - return g_strdup (default_icon_text_attribute_names); } @@ -496,11 +491,8 @@ fm_directory_view_icons_set_full_icon_text_attribute_names (FMDirectoryViewIcons * for consistency and possible future expansion. */ - /* Don't let callers get away with using a non-NULL value here since - * it probably means they're expecting something directory-specific. - */ - g_assert (view == NULL); - + g_return_if_fail (new_names != NULL); + if (strcmp (new_names, default_icon_text_attribute_names) == 0) return; -- GitLab