Tizen 2.1 base

[platform/upstream/glib2.0.git] / gio / gfileicon.c

diff --git a/gio/gfileicon.c b/gio/gfileicon.c
index 4842fb6..b537847 100644 (file)
--- a/gio/gfileicon.c
+++ b/gio/gfileicon.c
@@ -31,7 +31,6 @@
 #include "gsimpleasyncresult.h"
 #include "gioerror.h"
 
-#include "gioalias.h"
 
 /**
  * SECTION:gfileicon
@@ -159,7 +158,8 @@ g_file_icon_init (GFileIcon *file)
  * 
  * Creates a new icon for a file.
  * 
- * Returns: a #GIcon for the given @file, or %NULL on error.
+ * Returns: (transfer full) (type GFileIcon): a #GIcon for the given
+ *   @file, or %NULL on error.
  **/
 GIcon *
 g_file_icon_new (GFile *file)
@@ -175,7 +175,7 @@ g_file_icon_new (GFile *file)
  * 
  * Gets the #GFile associated with the given @icon.
  * 
- * Returns: a #GFile, or %NULL.
+ * Returns: (transfer none): a #GFile, or %NULL.
  **/
 GFile *
 g_file_icon_get_file (GFileIcon *icon)
@@ -310,11 +310,10 @@ load_async_callback (GObject      *source_object,
   
   if (stream == NULL)
     {
-      simple = g_simple_async_result_new_from_error (G_OBJECT (data->icon),
+      simple = g_simple_async_result_new_take_error (G_OBJECT (data->icon),
                                                     data->callback,
                                                     data->user_data,
                                                     error);
-      g_error_free (error);
     }
   else
     {
@@ -332,6 +331,7 @@ load_async_callback (GObject      *source_object,
   g_simple_async_result_complete (simple);
   
   load_data_free (data);
+  g_object_unref (simple);
 }
 
 static void
@@ -383,6 +383,3 @@ g_file_icon_loadable_icon_iface_init (GLoadableIconIface *iface)
   iface->load_async = g_file_icon_load_async;
   iface->load_finish = g_file_icon_load_finish;
 }
-
-#define __G_FILE_ICON_C__
-#include "gioaliasdef.c"