X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gio%2Fgfileinputstream.c;h=41014d410237b9282d770a1a1def21e698e47854;hb=f2786908a8858ec9d063e8fae7e4b2d8d612b682;hp=cd045d2d6e0f6ab7040450bddb606e34566b100a;hpb=32747def4bb4cce7cfc4f0f8ba8560392ec9ad3d;p=platform%2Fupstream%2Fglib.git

diff --git a/gio/gfileinputstream.c b/gio/gfileinputstream.c
index cd045d2..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 <http://www.gnu.org/licenses/>.
  *
  * Author: Alexander Larsson <alexl@redhat.com>
  */
@@ -73,14 +71,15 @@ 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)
 {
@@ -101,7 +100,7 @@ g_file_input_stream_seekable_iface_init (GSeekableIface *iface)
 static void
 g_file_input_stream_init (GFileInputStream *stream)
 {
-  stream->priv = g_file_input_stream_get_private (stream);
+  stream->priv = g_file_input_stream_get_instance_private (stream);
 }
 
 /**
@@ -174,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 <link linkend="io-priority">I/O priority</link> 
- *     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