X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gio%2Fgfileinputstream.c;h=41014d410237b9282d770a1a1def21e698e47854;hb=ffe286e647ce9ba9bb8e1631ba3cf0194038f438;hp=73e7b78fe5ff7839c1581f2ffd4084c5e240c72f;hpb=ed5accf16c03cc3ec5d54a457163a747d580b49d;p=platform%2Fupstream%2Fglib.git
diff --git a/gio/gfileinputstream.c b/gio/gfileinputstream.c
index 73e7b78..41014d4 100644
--- a/gio/gfileinputstream.c
+++ b/gio/gfileinputstream.c
@@ -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 .
*
* Author: Alexander Larsson
*/
@@ -73,19 +71,18 @@ static GFileInfo *g_file_input_stream_real_query_info_finish (GFileInputStream
GError **error);
-G_DEFINE_TYPE_WITH_CODE (GFileInputStream, g_file_input_stream, G_TYPE_INPUT_STREAM,
- G_IMPLEMENT_INTERFACE (G_TYPE_SEEKABLE,
- g_file_input_stream_seekable_iface_init))
-
struct _GFileInputStreamPrivate {
GAsyncReadyCallback outstanding_callback;
};
+G_DEFINE_TYPE_WITH_CODE (GFileInputStream, g_file_input_stream, G_TYPE_INPUT_STREAM,
+ G_ADD_PRIVATE (GFileInputStream)
+ G_IMPLEMENT_INTERFACE (G_TYPE_SEEKABLE,
+ g_file_input_stream_seekable_iface_init))
+
static void
g_file_input_stream_class_init (GFileInputStreamClass *klass)
{
- g_type_class_add_private (klass, sizeof (GFileInputStreamPrivate));
-
klass->query_info_async = g_file_input_stream_real_query_info_async;
klass->query_info_finish = g_file_input_stream_real_query_info_finish;
}
@@ -103,9 +100,7 @@ g_file_input_stream_seekable_iface_init (GSeekableIface *iface)
static void
g_file_input_stream_init (GFileInputStream *stream)
{
- stream->priv = G_TYPE_INSTANCE_GET_PRIVATE (stream,
- G_TYPE_FILE_INPUT_STREAM,
- GFileInputStreamPrivate);
+ stream->priv = g_file_input_stream_get_instance_private (stream);
}
/**
@@ -178,8 +173,7 @@ async_ready_callback_wrapper (GObject *source_object,
* g_file_input_stream_query_info_async:
* @stream: a #GFileInputStream.
* @attributes: a file attribute query string.
- * @io_priority: the I/O priority
- * of the request.
+ * @io_priority: the [I/O priority][io-priority] of the request
* @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore.
* @callback: (scope async): callback to call when the request is satisfied
* @user_data: (closure): the data to pass to callback function