glibmm r622 - in trunk: . gio/src

[wbolster svn gnome org]

Author: wbolster
Date: Mon Feb 25 16:25:12 2008
New Revision: 622
URL: http://svn.gnome.org/viewvc/glibmm?rev=622&view=rev

Log:
2008-02-25  Wouter Bolsterlee  <wbolster svn gnome org>

	* gio/src/file.hg:
	* gio/src/gio_docs.xml:
	* gio/src/gio_methods.defs:
	* gio/src/gio_vfuncs.defs:

	Initial work for another API change:
	g_file_contains_file() has been renamed to
	g_file_has_prefix() (with the parameter order swapped!)


Modified:
   trunk/ChangeLog
   trunk/gio/src/file.hg
   trunk/gio/src/gio_docs.xml
   trunk/gio/src/gio_methods.defs
   trunk/gio/src/gio_vfuncs.defs

Modified: trunk/gio/src/file.hg
==============================================================================
--- trunk/gio/src/file.hg	(original)
+++ trunk/gio/src/file.hg	Mon Feb 25 16:25:12 2008
@@ -157,8 +157,8 @@
                g_file_get_child_for_display_name,
                errthrow)
 
-  _WRAP_METHOD(bool contains_file(const Glib::RefPtr<const File>& descendant) const,
-               g_file_contains_file)
+  _WRAP_METHOD(bool has_prefix(const Glib::RefPtr<const File>& prefix) const,
+               g_file_has_prefix)
   _WRAP_METHOD(std::string get_relative_path(const Glib::RefPtr<const File>& descendant) const,
                g_file_get_relative_path)
   _WRAP_METHOD(Glib::RefPtr<File> resolve_relative_path(const std::string& relative_path) const,
@@ -1928,7 +1928,7 @@
 
 #m4 _CONVERSION(`GFile*',`const Glib::RefPtr<const File>&',`Glib::wrap($3, true)')
 
-  //_WRAP_VFUNC(bool contains_file(const Glib::RefPtr<const File>& descendant) const, "contains_file")
+  //_WRAP_VFUNC(bool has_prefix(const Glib::RefPtr<const File>& prefix) const, "has_prefix")
 
   //_WRAP_VFUNC(std::string get_relative_path(const Glib::RefPtr<const File>& descendant) const, "get_relative_path")
 

Modified: trunk/gio/src/gio_docs.xml
==============================================================================
--- trunk/gio/src/gio_docs.xml	(original)
+++ trunk/gio/src/gio_docs.xml	Mon Feb 25 16:25:12 2008
@@ -1394,9 +1394,9 @@
 
 <function name="g_file_contains_file">
 <description>
-Checks whether @parent (recursively) contains the specified @descendent.
+Checks whether @file has the prefix specified by @prefix.
 
-This call does no blocking i/o.
+This call does no i/o, as it works purely on names.
 
 
 </description>

Modified: trunk/gio/src/gio_methods.defs
==============================================================================
--- trunk/gio/src/gio_methods.defs	(original)
+++ trunk/gio/src/gio_methods.defs	Mon Feb 25 16:25:12 2008
@@ -1753,12 +1753,12 @@
   )
 )
 
-(define-method contains_file
+(define-method has_prefix
   (of-object "GFile")
-  (c-name "g_file_contains_file")
+  (c-name "g_file_has_prefix")
   (return-type "gboolean")
   (parameters
-    '("GFile*" "descendant")
+    '("GFile*" "prefix")
   )
 )
 

Modified: trunk/gio/src/gio_vfuncs.defs
==============================================================================
--- trunk/gio/src/gio_vfuncs.defs	(original)
+++ trunk/gio/src/gio_vfuncs.defs	Mon Feb 25 16:25:12 2008
@@ -56,11 +56,11 @@
   )
 )
 
-(define-vfunc contains_file
+(define-vfunc has_prefix
   (of-object "GFile")
   (return-type "gboolean")
   (parameters
-   '("GFile*" "descendant")
+   '("GFile*" "prefix")
   )
 )