Merge remote branch 'gvdb/master'

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

diff --git a/gio/gloadableicon.h b/gio/gloadableicon.h
index 3973f74..754090f 100644 (file)
--- 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
@@ -27,9 +27,7 @@
 #ifndef __G_LOADABLE_ICON_H__
 #define __G_LOADABLE_ICON_H__
 
-#include <glib-object.h>
-#include <gio/gicon.h>
-#include <gio/ginputstream.h>
+#include <gio/giotypes.h>
 
 G_BEGIN_DECLS
 
@@ -40,11 +38,10 @@ G_BEGIN_DECLS
 
 /**
  * GLoadableIcon:
- * 
- * Generic type for all kinds of icons that can be loaded 
+ *
+ * Generic type for all kinds of icons that can be loaded
  * as a stream.
  **/
-typedef struct _GLoadableIcon                  GLoadableIcon; /* Dummy typedef */
 typedef struct _GLoadableIconIface             GLoadableIconIface;
 
 /**
@@ -53,7 +50,7 @@ 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
@@ -62,24 +59,23 @@ 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;
-
+GType         g_loadable_icon_get_type    (void) G_GNUC_CONST;
 
 GInputStream *g_loadable_icon_load        (GLoadableIcon        *icon,
                                           int                   size,