Remove deprecated symbols we kept for one release.

2008-03-04  Alexander Larsson  <alexl@redhat.com>

        * gfile.c:
	Remove deprecated symbols we kept for one release.

2008-03-04  Alexander Larsson  <alexl@redhat.com>

        * glib/gurifuncs.c:
	Remove deprecated symbols we kept for one release.

svn path=/trunk/; revision=6621

diff --git a/ChangeLog b/ChangeLog
index 2a80d33767264e676507070c19349a1b880d1680..4299de593da0f9e9a5a73310e3dd097e6c4fc385 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-04  Alexander Larsson  <alexl@redhat.com>
+
+        * glib/gurifuncs.c:
+       Remove deprecated symbols we kept for one release.
+
 2008-03-03  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/gutils.h: Add a version of G_INLINE_FUNC for

diff --git a/gio/ChangeLog b/gio/ChangeLog
index 561b916f833025e228817d5cd4e9353a111199c0..9752ad335bd8530eabf5a468348503a19f258976 100644 (file)
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-04  Alexander Larsson  <alexl@redhat.com>
+
+        * gfile.c:
+       Remove deprecated symbols we kept for one release.
+
 2008-03-04  Murray Cumming  <murrayc@murrayc.com>
 
        * ginputstream.c:

diff --git a/gio/gfile.c b/gio/gfile.c
index bef1037eae8ce2649e07f43a665f9f681b42147d..ddc0ce4ff571790eca9b8438de8b13a20316ba34 100644 (file)
--- 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 0498685505bad2b3277e8a5c9a98714b0b72ba1b..1a9303cd63c16f511138087205dce705cfba7eff 100644 (file)
--- 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.