cleanup

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

diff --git a/gio/gfilteroutputstream.c b/gio/gfilteroutputstream.c
index d5fa642..9089579 100644 (file)
--- a/gio/gfilteroutputstream.c
+++ b/gio/gfilteroutputstream.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> 
  */
@@ -148,7 +146,7 @@ g_filter_output_stream_get_property (GObject    *object,
   GFilterOutputStreamPrivate *priv;
 
   filter_stream = G_FILTER_OUTPUT_STREAM (object);
-  priv = g_filter_output_stream_get_private (filter_stream);
+  priv = g_filter_output_stream_get_instance_private (filter_stream);
 
   switch (prop_id)
     {
@@ -212,7 +210,7 @@ g_filter_output_stream_get_base_stream (GFilterOutputStream *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_output_stream_get_close_base_stream (GFilterOutputStream *stream)
@@ -221,7 +219,7 @@ g_filter_output_stream_get_close_base_stream (GFilterOutputStream *stream)
 
   g_return_val_if_fail (G_IS_FILTER_OUTPUT_STREAM (stream), FALSE);
 
-  priv = g_filter_output_stream_get_private (stream);
+  priv = g_filter_output_stream_get_instance_private (stream);
 
   return priv->close_base;
 }
@@ -243,7 +241,7 @@ g_filter_output_stream_set_close_base_stream (GFilterOutputStream *stream,
 
   close_base = !!close_base;
 
-  priv = g_filter_output_stream_get_private (stream);
+  priv = g_filter_output_stream_get_instance_private (stream);
 
   if (priv->close_base != close_base)
     {
@@ -296,7 +294,7 @@ g_filter_output_stream_close (GOutputStream  *stream,
                               GError        **error)
 {
   GFilterOutputStream *filter_stream = G_FILTER_OUTPUT_STREAM (stream);
-  GFilterOutputStreamPrivate *priv = g_filter_output_stream_get_private (filter_stream);
+  GFilterOutputStreamPrivate *priv = g_filter_output_stream_get_instance_private (filter_stream);
   gboolean res = TRUE;
 
   if (priv->close_base)