From 5d1de3eed17308a1a45436a4c9f5c316add74745 Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Mon, 25 Feb 2008 13:19:58 +0000 Subject: [PATCH] Remove deprecated g_file_contains_file. 2008-02-25 Alexander Larsson * gfile.[ch]: Remove deprecated g_file_contains_file. svn path=/trunk/; revision=6585 --- gio/ChangeLog | 5 +++++ gio/gfile.c | 23 ----------------------- gio/gfile.h | 3 --- 3 files changed, 5 insertions(+), 26 deletions(-) diff --git a/gio/ChangeLog b/gio/ChangeLog index 2bbdd2166..1c9b16149 100644 --- a/gio/ChangeLog +++ b/gio/ChangeLog @@ -1,3 +1,8 @@ +2008-02-25 Alexander Larsson + + * gfile.[ch]: + Remove deprecated g_file_contains_file. + 2008-02-25 Alexander Larsson * gfilemonitor.c: diff --git a/gio/gfile.c b/gio/gfile.c index 10c78c65a..721da5e47 100644 --- a/gio/gfile.c +++ b/gio/gfile.c @@ -669,29 +669,6 @@ g_file_get_child_for_display_name (GFile *file, return (* iface->get_child_for_display_name) (file, display_name, error); } -#undef g_file_contains_file - -/** - * g_file_contains_file: - * @parent: input #GFile. - * @descendant: input #GFile. - * - * Deprecated version of g_file_has_prefix(). - * - * Returns: %TRUE if the @descendant's parent, grandparent, etc is @parent. %FALSE otherwise. - * - * Deprecated:2.16: The initial chosen name was unfortunate, as it - * may cause you to think this function did more than just - * filename comparisons. - */ -gboolean -g_file_contains_file (GFile *parent, - GFile *descendant) -{ - /* This function is not in the header and will not be referenced by newly built code */ - return g_file_has_prefix (descendant, parent); -} - /** * g_file_has_prefix: * @file: input #GFile. diff --git a/gio/gfile.h b/gio/gfile.h index 44776e013..a67b72eb7 100644 --- a/gio/gfile.h +++ b/gio/gfile.h @@ -580,9 +580,6 @@ GFile * g_file_get_child (GFile GFile * g_file_get_child_for_display_name (GFile *file, const char *display_name, GError **error); -#ifndef G_DISABLE_DEPRECATED -#define g_file_contains_file(_parent, _child) g_file_has_prefix (_child, _parent) -#endif gboolean g_file_has_prefix (GFile *file, GFile *prefix); char * g_file_get_relative_path (GFile *parent,