X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gio%2Fgloadableicon.h;h=d164ca028fbf2cf42c5d94c5ab9350dd264c7aa3;hb=25990eb2b6da94e1d03631eab8a952ef84cb9986;hp=88f42df85b1e63ce6de6a7b3c08db43bd7947d2c;hpb=41d1650c9b6b0b8368c0648d2885b83e18020303;p=platform%2Fupstream%2Fglib.git

diff --git a/gio/gloadableicon.h b/gio/gloadableicon.h
index 88f42df..d164ca0 100644
--- a/gio/gloadableicon.h
+++ b/gio/gloadableicon.h
@@ -1,5 +1,5 @@
 /* GIO - GLib Input, Output and Streaming Library
- * 
+ *
  * Copyright (C) 2006-2007 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -13,9 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: Alexander Larsson <alexl@redhat.com>
  */
@@ -23,9 +21,11 @@
 #ifndef __G_LOADABLE_ICON_H__
 #define __G_LOADABLE_ICON_H__
 
-#include <glib-object.h>
-#include <gio/gicon.h>
-#include <gio/ginputstream.h>
+#if !defined (__GIO_GIO_H_INSIDE__) && !defined (GIO_COMPILATION)
+#error "Only <gio/gio.h> can be included directly."
+#endif
+
+#include <gio/giotypes.h>
 
 G_BEGIN_DECLS
 
@@ -36,10 +36,10 @@ G_BEGIN_DECLS
 
 /**
  * GLoadableIcon:
- * 
- * Generic interface for all kinds of icons that can be loaded as a stream to an image file.
+ *
+ * Generic type for all kinds of icons that can be loaded
+ * as a stream.
  **/
-typedef struct _GLoadableIcon         		GLoadableIcon; /* Dummy typedef */
 typedef struct _GLoadableIconIface    		GLoadableIconIface;
 
 /**
@@ -48,7 +48,8 @@ typedef struct _GLoadableIconIface    		GLoadableIconIface;
  * @load: Loads an icon.
  * @load_async: Loads an icon asynchronously.
  * @load_finish: Finishes an asynchronous icon load.
- * 
+ *
+ * Interface for icons that can be loaded as a stream.
  **/
 struct _GLoadableIconIface
 {
@@ -56,35 +57,38 @@ struct _GLoadableIconIface
 
   /* Virtual Table */
 
-  GInputStream * (*load)        (GLoadableIcon      *icon,
-				 int                 size,
-				 char              **type,
-				 GCancellable       *cancellable,
-				 GError            **error);
-  void           (*load_async)  (GLoadableIcon      *icon,
-				 int                 size,
-				 GCancellable       *cancellable,
-				 GAsyncReadyCallback callback,
-				 gpointer            user_data);
-  GInputStream * (*load_finish) (GLoadableIcon      *icon,
-				  GAsyncResult      *res,
-				  char             **type,
-				  GError           **error);
+  GInputStream * (* load)        (GLoadableIcon       *icon,
+                                  int                  size,
+                                  char               **type,
+                                  GCancellable        *cancellable,
+                                  GError             **error);
+  void           (* load_async)  (GLoadableIcon       *icon,
+                                  int                  size,
+                                  GCancellable        *cancellable,
+                                  GAsyncReadyCallback  callback,
+                                  gpointer             user_data);
+  GInputStream * (* load_finish) (GLoadableIcon       *icon,
+                                  GAsyncResult        *res,
+                                  char               **type,
+                                  GError             **error);
 };
 
-GType g_loadable_icon_get_type (void) G_GNUC_CONST;
-
+GLIB_AVAILABLE_IN_ALL
+GType         g_loadable_icon_get_type    (void) G_GNUC_CONST;
 
+GLIB_AVAILABLE_IN_ALL
 GInputStream *g_loadable_icon_load        (GLoadableIcon        *icon,
 					   int                   size,
 					   char                **type,
 					   GCancellable         *cancellable,
 					   GError              **error);
+GLIB_AVAILABLE_IN_ALL
 void          g_loadable_icon_load_async  (GLoadableIcon        *icon,
 					   int                   size,
 					   GCancellable         *cancellable,
 					   GAsyncReadyCallback   callback,
 					   gpointer              user_data);
+GLIB_AVAILABLE_IN_ALL
 GInputStream *g_loadable_icon_load_finish (GLoadableIcon        *icon,
 					   GAsyncResult         *res,
 					   char                **type,