From c830afc68c97196022c834062eb6eefa88cb3d39 Mon Sep 17 00:00:00 2001 From: Jared Moore Date: Fri, 27 Jun 2008 03:40:28 +0000 Subject: [PATCH] Set return types as nullable for g_file_get_basename, g_file_get_parent, 2008-06-27 Jared Moore * 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 svn path=/trunk/; revision=1656 --- ChangeLog | 10 ++++++++++ vapi/gio-2.0.vapi | 10 +++++----- vapi/packages/gio-2.0/gio-2.0.metadata | 8 ++++---- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index cd4a410..f8e0716 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2008-06-27 Jared Moore + + * 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 + 2008-06-26 Jürg Billeter * configure.ac: Post-release version bump diff --git a/vapi/gio-2.0.vapi b/vapi/gio-2.0.vapi index ebd8b00..6c33e1a 100644 --- a/vapi/gio-2.0.vapi +++ b/vapi/gio-2.0.vapi @@ -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 @@ namespace GLib { 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); diff --git a/vapi/packages/gio-2.0/gio-2.0.metadata b/vapi/packages/gio-2.0/gio-2.0.metadata index b664f73..758a139 100644 --- a/vapi/packages/gio-2.0/gio-2.0.metadata +++ b/vapi/packages/gio-2.0/gio-2.0.metadata @@ -16,13 +16,13 @@ g_file_enumerator_next_file transfer_ownership="1" 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" -- 2.7.4