Merge branch 'master' into glibmm-gir-gmmprocglibmm-gir-gmmproc

1 files changed, 0 insertions, 16 deletions

diff --git a/gio/src/fileoutputstream.hg b/gio/src/fileoutputstream.hg
index 4b24272f..a31567bd 100644
--- a/gio/src/fileoutputstream.hg
+++ b/gio/src/fileoutputstream.hg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2007 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -138,20 +136,6 @@ public:
                refreturn, errthrow)
 
   _WRAP_METHOD(std::string get_etag() const, g_file_output_stream_get_etag)
-
-  //These seem to be just C convenience functions - they are already in the Seekable base class:
-  //See http://bugzilla.gnome.org/show_bug.cgi?id=509990
-  _IGNORE(g_file_output_stream_tell, g_file_output_stream_can_seek, g_file_output_stream_seek,
-          g_file_output_stream_can_truncate, g_file_output_stream_truncate)
-//  _WRAP_METHOD(goffset tell() const, g_file_output_stream_tell)
-//  _WRAP_METHOD(bool can_seek() const, g_file_output_stream_can_seek)
-//  _WRAP_METHOD(bool seek(goffset offset, Glib::SeekType type, const Glib::RefPtr<Cancellable>& cancellable),
-//               g_file_output_stream_seek,
-//               errthrow)
-//  _WRAP_METHOD(bool can_truncate() const, g_file_output_stream_can_truncate)
-//  _WRAP_METHOD(bool truncate(goffset size, const Glib::RefPtr<Cancellable>& cancellable),
-//               g_file_output_stream_truncate,
-//               errthrow)
 };
 
 } // namespace Gio