[kdbus] KDBUS_ITEM_PAYLOAD_OFF items are (once again) relative to msg header

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

diff --git a/gio/gfilterinputstream.c b/gio/gfilterinputstream.c
index 2839b24..1c69560 100644 (file)
--- a/gio/gfilterinputstream.c
+++ b/gio/gfilterinputstream.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: Christian Kellner <gicmo@gnome.org> 
  */
@@ -149,7 +147,7 @@ g_filter_input_stream_get_property (GObject    *object,
   GFilterInputStreamPrivate *priv;
 
   filter_stream = G_FILTER_INPUT_STREAM (object);
-  priv = g_filter_input_stream_get_private (filter_stream);
+  priv = g_filter_input_stream_get_instance_private (filter_stream);
 
   switch (prop_id)
     {
@@ -208,7 +206,7 @@ g_filter_input_stream_get_base_stream (GFilterInputStream *stream)
  * Returns whether the base stream will be closed when @stream is
  * closed.
  *
- * Return value: %TRUE if the base stream will be closed.
+ * Returns: %TRUE if the base stream will be closed.
  **/
 gboolean
 g_filter_input_stream_get_close_base_stream (GFilterInputStream *stream)
@@ -217,7 +215,7 @@ g_filter_input_stream_get_close_base_stream (GFilterInputStream *stream)
 
   g_return_val_if_fail (G_IS_FILTER_INPUT_STREAM (stream), FALSE);
 
-  priv = g_filter_input_stream_get_private (stream);
+  priv = g_filter_input_stream_get_instance_private (stream);
 
   return priv->close_base;
 }
@@ -239,7 +237,7 @@ g_filter_input_stream_set_close_base_stream (GFilterInputStream *stream,
 
   close_base = !!close_base;
  
-  priv = g_filter_input_stream_get_private (stream);
+  priv = g_filter_input_stream_get_instance_private (stream);
 
   if (priv->close_base != close_base)
     {
@@ -297,7 +295,7 @@ g_filter_input_stream_close (GInputStream  *stream,
                              GError       **error)
 {
   GFilterInputStream *filter_stream = G_FILTER_INPUT_STREAM (stream);
-  GFilterInputStreamPrivate *priv = g_filter_input_stream_get_private (filter_stream);
+  GFilterInputStreamPrivate *priv = g_filter_input_stream_get_instance_private (filter_stream);
   gboolean res = TRUE;
 
   if (priv->close_base)