From cb3a49ca15ee36a6e5bcacac3b26418f9346ade4 Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Tue, 4 Mar 2008 14:51:34 +0000 Subject: [PATCH] Remove deprecated symbols we kept for one release. 2008-03-04 Alexander Larsson * gfile.c: Remove deprecated symbols we kept for one release. 2008-03-04 Alexander Larsson * glib/gurifuncs.c: Remove deprecated symbols we kept for one release. svn path=/trunk/; revision=6621 --- ChangeLog | 5 +++++ gio/ChangeLog | 5 +++++ gio/gfile.c | 10 ---------- glib/gurifuncs.c | 9 --------- 4 files changed, 10 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2a80d337..4299de59 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-03-04 Alexander Larsson + + * glib/gurifuncs.c: + Remove deprecated symbols we kept for one release. + 2008-03-03 Matthias Clasen * glib/gutils.h: Add a version of G_INLINE_FUNC for diff --git a/gio/ChangeLog b/gio/ChangeLog index 561b916f..9752ad33 100644 --- a/gio/ChangeLog +++ b/gio/ChangeLog @@ -1,3 +1,8 @@ +2008-03-04 Alexander Larsson + + * gfile.c: + Remove deprecated symbols we kept for one release. + 2008-03-04 Murray Cumming * ginputstream.c: diff --git a/gio/gfile.c b/gio/gfile.c index bef1037e..ddc0ce4f 100644 --- a/gio/gfile.c +++ b/gio/gfile.c @@ -669,16 +669,6 @@ g_file_get_child_for_display_name (GFile *file, return (* iface->get_child_for_display_name) (file, display_name, error); } -/* Temporary keep this symbol for one release */ -gboolean g_file_contains_file (GFile *parent, GFile *descendant); -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/glib/gurifuncs.c b/glib/gurifuncs.c index 04986855..1a9303cd 100644 --- a/glib/gurifuncs.c +++ b/glib/gurifuncs.c @@ -204,15 +204,6 @@ g_uri_parse_scheme (const char *uri) return g_strndup (uri, p - uri - 1); } -/* Temporary add a symbol to avoid crashing to many apps. - Remove after 2.15.6 release */ -char * g_uri_get_scheme (const char *uri); -char *g_uri_get_scheme (const char *uri) -{ - return g_uri_parse_scheme (uri); -} - - /** * g_uri_escape_string: * @unescaped: the unescaped input string. -- 2.34.1