Remove deprecated g_file_contains_file.

2008-02-25  Alexander Larsson  <alexl@redhat.com>

        * gfile.[ch]:
	Remove deprecated g_file_contains_file.

svn path=/trunk/; revision=6585

diff --git a/gio/ChangeLog b/gio/ChangeLog
index 2bbdd21..1c9b161 100644 (file)
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,5 +1,10 @@
 2008-02-25  Alexander Larsson  <alexl@redhat.com>
 
+        * gfile.[ch]:
+       Remove deprecated g_file_contains_file.
+
+2008-02-25  Alexander Larsson  <alexl@redhat.com>
+
         * gfilemonitor.c:
        Emit actual change signals in an idle handler.
        This avoids reentrance and locking problems in

diff --git a/gio/gfile.c b/gio/gfile.c
index 10c78c6..721da5e 100644 (file)
--- 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 44776e0..a67b72e 100644 (file)
--- 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,