vala r1656 - in trunk: . vapi vapi/packages/gio-2.0

[jaredm svn gnome org]

Author: jaredm
Date: Fri Jun 27 03:40:28 2008
New Revision: 1656
URL: http://svn.gnome.org/viewvc/vala?rev=1656&view=rev

Log:
2008-06-27  Jared Moore  <jaredm gmx com>

	* vapi/packages/gio-2.0/gio-2.0.metadata:

	Set return types as nullable for g_file_get_basename,
	g_file_get_parent, g_file_get_path, and g_file_get_relative_path,
	fixes bug 540335.

	* vapi/gio-2.0.vapi: Regenerated


Modified:
   trunk/   (props changed)
   trunk/ChangeLog
   trunk/vapi/gio-2.0.vapi
   trunk/vapi/packages/gio-2.0/gio-2.0.metadata

Modified: trunk/vapi/gio-2.0.vapi
==============================================================================
--- trunk/vapi/gio-2.0.vapi	(original)
+++ trunk/vapi/gio-2.0.vapi	Fri Jun 27 03:40:28 2008
@@ -1,4 +1,4 @@
-/* gio-2.0.vapi generated by lt-vapigen, do not modify. */
+/* gio-2.0.vapi generated by vapigen, do not modify. */
 
 [CCode (cprefix = "G", lower_case_cprefix = "g_")]
 namespace GLib {
@@ -729,12 +729,12 @@
 		public abstract GLib.Mount find_enclosing_mount (GLib.Cancellable? cancellable) throws GLib.Error;
 		public abstract void find_enclosing_mount_async (int io_priority, GLib.Cancellable? cancellable, GLib.AsyncReadyCallback callback);
 		public abstract GLib.Mount find_enclosing_mount_finish (GLib.AsyncResult res) throws GLib.Error;
-		public abstract string get_basename ();
+		public abstract string? get_basename ();
 		public abstract GLib.File get_child_for_display_name (string display_name) throws GLib.Error;
-		public abstract GLib.File get_parent ();
+		public abstract GLib.File? get_parent ();
 		public abstract string get_parse_name ();
-		public abstract string get_path ();
-		public abstract string get_relative_path (GLib.File descendant);
+		public abstract string? get_path ();
+		public abstract string? get_relative_path (GLib.File descendant);
 		public abstract string get_uri ();
 		public abstract string get_uri_scheme ();
 		public abstract bool has_uri_scheme (string uri_scheme);

Modified: trunk/vapi/packages/gio-2.0/gio-2.0.metadata
==============================================================================
--- trunk/vapi/packages/gio-2.0/gio-2.0.metadata	(original)
+++ trunk/vapi/packages/gio-2.0/gio-2.0.metadata	Fri Jun 27 03:40:28 2008
@@ -16,13 +16,13 @@
 g_file_enumerator_next_files_finish type_arguments="FileInfo" transfer_ownership="1"
 g_file_find_enclosing_mount transfer_ownership="1"
 g_file_find_enclosing_mount_finish transfer_ownership="1"
-g_file_get_basename transfer_ownership="1"
+g_file_get_basename transfer_ownership="1" nullable="1"
 g_file_get_child transfer_ownership="1"
 g_file_get_child_for_display_name transfer_ownership="1"
-g_file_get_parent transfer_ownership="1"
+g_file_get_parent transfer_ownership="1" nullable="1"
 g_file_get_parse_name transfer_ownership="1"
-g_file_get_path transfer_ownership="1"
-g_file_get_relative_path transfer_ownership="1"
+g_file_get_path transfer_ownership="1" nullable="1"
+g_file_get_relative_path transfer_ownership="1" nullable="1"
 g_file_get_uri transfer_ownership="1"
 g_file_get_uri_scheme transfer_ownership="1"
 g_file_load_contents.length is_out="1"