http://mail.gnome.org/archives/gtk-devel-list/2007-October/msg00089.html

[platform/upstream/glib.git] / gio / gloadableicon.c

diff --git a/gio/gloadableicon.c b/gio/gloadableicon.c
index 9e7a5c9..bcddde3 100644 (file)
--- a/gio/gloadableicon.c
+++ b/gio/gloadableicon.c
@@ -32,8 +32,7 @@
  * @short_description: Loadable Icons
  * @see_also: #GIcon, #GThemedIcon
  * 
- * Implements #GIcon and adds the ability to load icons.
- *
+ * Extends the #GIcon interface and adds the ability to load icons.
  **/
 
 static void          g_loadable_icon_real_load_async  (GLoadableIcon        *icon,
@@ -98,7 +97,7 @@ g_loadable_icon_base_init (gpointer g_class)
  * g_loadable_icon_load:
  * @icon: a #GLoadableIcon.
  * @size: an integer.
- * @type: 
+ * @type:  a location to store the type of the loaded icon, %NULL to ignore.
  * @cancellable: optional #GCancellable object, %NULL to ignore. 
  * @error: a #GError location to store the error occuring, or %NULL to 
  * ignore.
@@ -122,7 +121,6 @@ g_loadable_icon_load (GLoadableIcon  *icon,
   iface = G_LOADABLE_ICON_GET_IFACE (icon);
 
   return (* iface->load) (icon, size, type, cancellable, error);
-  
 }
 
 /**
@@ -136,7 +134,6 @@ g_loadable_icon_load (GLoadableIcon  *icon,
  * Loads an icon asynchronously. To finish this function, see 
  * g_loadable_icon_load_finish(). For the synchronous, blocking 
  * version of this function, see g_loadable_icon_load().
- * 
  **/
 void
 g_loadable_icon_load_async (GLoadableIcon       *icon,
@@ -152,14 +149,13 @@ g_loadable_icon_load_async (GLoadableIcon       *icon,
   iface = G_LOADABLE_ICON_GET_IFACE (icon);
 
   (* iface->load_async) (icon, size, cancellable, callback, user_data);
-  
 }
 
 /**
  * g_loadable_icon_load_finish:
  * @icon: a #GLoadableIcon.
  * @res: a #GAsyncResult.
- * @type:
+ * @type: a location to store the type of the loaded icon, %NULL to ignore.
  * @error: a #GError location to store the error occuring, or %NULL to 
  * ignore.
  * 
@@ -188,7 +184,6 @@ g_loadable_icon_load_finish (GLoadableIcon  *icon,
   iface = G_LOADABLE_ICON_GET_IFACE (icon);
 
   return (* iface->load_finish) (icon, res, type, error);
-  
 }
 
 /********************************************
@@ -266,7 +261,7 @@ g_loadable_icon_real_load_finish (GLoadableIcon        *icon,
   GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (res);
   LoadData *data;
 
-  g_assert (g_simple_async_result_get_source_tag (simple) == g_loadable_icon_real_load_async);
+  g_warn_if_fail (g_simple_async_result_get_source_tag (simple) == g_loadable_icon_real_load_async);
 
   data = g_simple_async_result_get_op_res_gpointer (simple);