Re: api duplication



> 
> It would be good to remove it but I really think it is too late for 2.2.
> We should postpone this for 2.4..

Postpone it to 2.4 ? Would it be accepted in spite of gnome commitment
to api/abi compatibility between major release ? Is a patch like the
attached one ok for now, and will we be allowed to remove the redundant
function at the beginning of the next development cycle ?

Thanks,

Christophe
? make_uri_full.diff
? doc/xml
? doc/tmpl/gnome-vfs-unused.sgml
? doc/tmpl/gnome-vfs.sgml
? libgnomevfs/diff
? libgnomevfs/test1
? libgnomevfs/test2
? libgnomevfs/test3
? libgnomevfs/uri
? libgnomevfs/util
? test/test-resolv
? test/test-subdir
Index: libgnomevfs/gnome-vfs-utils.c
===================================================================
RCS file: /cvs/gnome/gnome-vfs/libgnomevfs/gnome-vfs-utils.c,v
retrieving revision 1.61
diff -u -r1.61 gnome-vfs-utils.c
--- libgnomevfs/gnome-vfs-utils.c	19 Dec 2002 17:57:19 -0000	1.61
+++ libgnomevfs/gnome-vfs-utils.c	29 Jan 2003 10:27:34 -0000
@@ -1817,6 +1817,7 @@
 }
 
 /**
+ *
  * gnome_vfs_make_uri_full_from_relative:
  * 
  * Returns a full URI given a full base URI, and a secondary URI which may
@@ -1825,6 +1826,9 @@
  * Return value: the URI (NULL for some bad errors).
  *
  * Since: 2.2
+ * **WARNING** THIS FUNCTION IS EXACTLY THE SAME AS 
+ * gnome_vfs_uri_make_full_from_relative FROM gnome-vfs-uri.h AND WILL BE
+ * REMOVED IN GNOME 2.4. IN SHORT, DON'T USE IT.
  **/
 
 char *
Index: libgnomevfs/gnome-vfs-utils.h
===================================================================
RCS file: /cvs/gnome/gnome-vfs/libgnomevfs/gnome-vfs-utils.h,v
retrieving revision 1.37
diff -u -r1.37 gnome-vfs-utils.h
--- libgnomevfs/gnome-vfs-utils.h	5 Dec 2002 09:42:29 -0000	1.37
+++ libgnomevfs/gnome-vfs-utils.h	29 Jan 2003 10:27:34 -0000
@@ -148,6 +148,10 @@
 gboolean gnome_vfs_uris_match (const char *uri_1, const char *uri_2);
 char * gnome_vfs_get_uri_scheme (const char *uri);
 char * gnome_vfs_make_uri_from_shell_arg (const char *uri);
+
+/* THIS FUNCTION WILL BE REMOVED FOR GNOME 2.4, PLEASE USE
+ * gnome_vfs_uri_make_full_from_relative FROM gnome-vfs-uri.h INSTEAD
+ */
 char * gnome_vfs_make_uri_full_from_relative (const char *base_uri,
 					      const char *relative_uri);
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]