glib r6585 - trunk/gio
- From: alexl svn gnome org
- To: svn-commits-list gnome org
- Subject: glib r6585 - trunk/gio
- Date: Mon, 25 Feb 2008 13:19:58 +0000 (GMT)
Author: alexl
Date: Mon Feb 25 13:19:58 2008
New Revision: 6585
URL: http://svn.gnome.org/viewvc/glib?rev=6585&view=rev
Log:
2008-02-25 Alexander Larsson <alexl redhat com>
* gfile.[ch]:
Remove deprecated g_file_contains_file.
Modified:
trunk/gio/ChangeLog
trunk/gio/gfile.c
trunk/gio/gfile.h
Modified: trunk/gio/gfile.c
==============================================================================
--- trunk/gio/gfile.c (original)
+++ trunk/gio/gfile.c Mon Feb 25 13:19:58 2008
@@ -669,29 +669,6 @@
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.
Modified: trunk/gio/gfile.h
==============================================================================
--- trunk/gio/gfile.h (original)
+++ trunk/gio/gfile.h Mon Feb 25 13:19:58 2008
@@ -580,9 +580,6 @@
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,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]