glibmm r782 - in trunk: . gio/src tools/extra_defs_gen

[murrayc svn gnome org]

Author: murrayc
Date: Fri Feb  6 09:56:46 2009
New Revision: 782
URL: http://svn.gnome.org/viewvc/glibmm?rev=782&view=rev

Log:
2009-02-06  Murray Cumming  <murrayc murrayc com>

* tools/extra_defs_gen/generate_defs_gio.cc: Added unix types.
* gio/src/gio_signals.defs: Regenerated.
* gio/src/bufferedinputstream.hg: Added buffer_size property.
* gio/src/bufferedoutputstream.hg: Added buffer_size and auto_grow 
properties.
* gio/src/datainputstream.hg: Added byte_order and newline_type 
properties.
* gio/src/dataoutputstream.hg: Added byte_order property.
* gio/src/filterinputstream.hg: Added close_base_ stream property.
* gio/src/filteroutputstream.hg:
* gio/src/unixinputstream.hg: Added fd and close_fd properties.
* gio/src/unixoutputstream.hg: Added fd and close_fd properties.

Modified:
   trunk/ChangeLog
   trunk/gio/src/bufferedinputstream.hg
   trunk/gio/src/bufferedoutputstream.hg
   trunk/gio/src/datainputstream.hg
   trunk/gio/src/dataoutputstream.hg
   trunk/gio/src/filterinputstream.hg
   trunk/gio/src/filteroutputstream.hg
   trunk/gio/src/gio_signals.defs
   trunk/gio/src/unixinputstream.hg
   trunk/gio/src/unixoutputstream.hg
   trunk/tools/extra_defs_gen/generate_defs_gio.cc

Modified: trunk/gio/src/bufferedinputstream.hg
==============================================================================
--- trunk/gio/src/bufferedinputstream.hg	(original)
+++ trunk/gio/src/bufferedinputstream.hg	Fri Feb  6 09:56:46 2009
@@ -99,7 +99,7 @@
 
   _WRAP_METHOD(int read_byte(const Glib::RefPtr<Cancellable>& cancellable), g_buffered_input_stream_read_byte, errthrow)
 
-  /** Non-cancellable version of read_byte.
+  /** Non-cancellable version of read_byte().
    */
 #ifdef GLIBMM_EXCEPTIONS_ENABLED
   int read_byte();
@@ -107,6 +107,8 @@
   int read_byte(std::auto_ptr<Glib::Error>& error);
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 
+  _WRAP_PROPERTY("buffer-size", guint)
+
 protected:
 #m4 _CONVERSION(`GCancellable*', `const Glib::RefPtr<Cancellable>&', `Glib::wrap($3, true)')
   //_WRAP_VFUNC(gssize fill(gssize count, const Glib::RefPtr<Cancellable>& cancellable, GError** error), "fill")

Modified: trunk/gio/src/bufferedoutputstream.hg
==============================================================================
--- trunk/gio/src/bufferedoutputstream.hg	(original)
+++ trunk/gio/src/bufferedoutputstream.hg	Fri Feb  6 09:56:46 2009
@@ -53,6 +53,9 @@
 
   _WRAP_METHOD(void set_auto_grow(bool auto_grow=true), g_buffered_output_stream_set_auto_grow)
   _WRAP_METHOD(bool get_auto_grow() const, g_buffered_output_stream_get_auto_grow)
+
+  _WRAP_PROPERTY("buffer-size", guint)
+  _WRAP_PROPERTY("auto-grow", bool)
 };
 
 } // namespace Gio

Modified: trunk/gio/src/datainputstream.hg
==============================================================================
--- trunk/gio/src/datainputstream.hg	(original)
+++ trunk/gio/src/datainputstream.hg	Fri Feb  6 09:56:46 2009
@@ -154,6 +154,8 @@
   bool read_until(std::string& data, const std::string& stop_chars, std::auto_ptr<Glib::Error>& error);
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 
+  _WRAP_PROPERTY("byte-order", DataStreamByteOrder)
+  _WRAP_PROPERTY("newline-type", DataStreamNewlineType)
 };
 
 } // namespace Gio

Modified: trunk/gio/src/dataoutputstream.hg
==============================================================================
--- trunk/gio/src/dataoutputstream.hg	(original)
+++ trunk/gio/src/dataoutputstream.hg	Fri Feb  6 09:56:46 2009
@@ -124,6 +124,7 @@
   bool put_string(std::string str, std::auto_ptr<Glib::Error>& error);
 #endif //GLIBMM_EXCEPTIONS_ENABLED
 
+  _WRAP_PROPERTY("byte-order", DataStreamByteOrder)
 };
 
 } // namespace Gio

Modified: trunk/gio/src/filterinputstream.hg
==============================================================================
--- trunk/gio/src/filterinputstream.hg	(original)
+++ trunk/gio/src/filterinputstream.hg	Fri Feb  6 09:56:46 2009
@@ -47,6 +47,7 @@
                refreturn, constversion)
 
   _WRAP_PROPERTY("base-stream", Glib::RefPtr<InputStream>)
+  _WRAP_PROPERTY("close-base-stream", bool)
 };
 
 } // namespace Gio

Modified: trunk/gio/src/filteroutputstream.hg
==============================================================================
--- trunk/gio/src/filteroutputstream.hg	(original)
+++ trunk/gio/src/filteroutputstream.hg	Fri Feb  6 09:56:46 2009
@@ -47,6 +47,7 @@
                refreturn, constversion)
 
   _WRAP_PROPERTY("base-stream", Glib::RefPtr<InputStream>)
+  _WRAP_PROPERTY("close-base-stream", bool)
 };
 
 } // namespace Gio

Modified: trunk/gio/src/gio_signals.defs
==============================================================================
--- trunk/gio/src/gio_signals.defs	(original)
+++ trunk/gio/src/gio_signals.defs	Fri Feb  6 09:56:46 2009
@@ -19,6 +19,15 @@
   (construct-only #t)
 )
 
+(define-property close-base-stream
+  (of-object "GBufferedInputStream")
+  (prop-type "GParamBoolean")
+  (docs "If the base stream be closed when the filter stream is")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
+)
+
 (define-property buffer-size
   (of-object "GBufferedInputStream")
   (prop-type "GParamUInt")
@@ -39,6 +48,15 @@
   (construct-only #t)
 )
 
+(define-property close-base-stream
+  (of-object "GBufferedOutputStream")
+  (prop-type "GParamBoolean")
+  (docs "If the base stream be closed when the filter stream is")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
+)
+
 (define-property buffer-size
   (of-object "GBufferedOutputStream")
   (prop-type "GParamUInt")
@@ -68,6 +86,15 @@
   (construct-only #t)
 )
 
+(define-property close-base-stream
+  (of-object "GDataInputStream")
+  (prop-type "GParamBoolean")
+  (docs "If the base stream be closed when the filter stream is")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
+)
+
 (define-property buffer-size
   (of-object "GDataInputStream")
   (prop-type "GParamUInt")
@@ -106,6 +133,15 @@
   (construct-only #t)
 )
 
+(define-property close-base-stream
+  (of-object "GDataOutputStream")
+  (prop-type "GParamBoolean")
+  (docs "If the base stream be closed when the filter stream is")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
+)
+
 (define-property byte-order
   (of-object "GDataOutputStream")
   (prop-type "GParamEnum")
@@ -215,6 +251,15 @@
   (construct-only #t)
 )
 
+(define-property close-base-stream
+  (of-object "GFilterInputStream")
+  (prop-type "GParamBoolean")
+  (docs "If the base stream be closed when the filter stream is")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
+)
+
 ;; From GFilterOutputStream
 
 (define-property base-stream
@@ -226,6 +271,55 @@
   (construct-only #t)
 )
 
+(define-property close-base-stream
+  (of-object "GFilterOutputStream")
+  (prop-type "GParamBoolean")
+  (docs "If the base stream be closed when the filter stream is")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
+)
+
+;; From GUnixInputStream
+
+(define-property fd
+  (of-object "GUnixInputStream")
+  (prop-type "GParamInt")
+  (docs "The file descriptor to read from")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
+)
+
+(define-property close-fd
+  (of-object "GUnixInputStream")
+  (prop-type "GParamBoolean")
+  (docs "Whether to close the file descriptor when the stream is closed")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
+;; From GUnixOutputStream
+
+(define-property fd
+  (of-object "GUnixOutputStream")
+  (prop-type "GParamInt")
+  (docs "The file descriptor to write to")
+  (readable #t)
+  (writable #t)
+  (construct-only #t)
+)
+
+(define-property close-fd
+  (of-object "GUnixOutputStream")
+  (prop-type "GParamBoolean")
+  (docs "Whether to close the file descriptor when the stream is closed")
+  (readable #t)
+  (writable #t)
+  (construct-only #f)
+)
+
 ;; From GInputStream
 
 ;; From GLoadableIcon

Modified: trunk/gio/src/unixinputstream.hg
==============================================================================
--- trunk/gio/src/unixinputstream.hg	(original)
+++ trunk/gio/src/unixinputstream.hg	Fri Feb  6 09:56:46 2009
@@ -44,6 +44,9 @@
 
 public:
   _WRAP_CREATE(int fd, bool close_fd_at_close)
+
+  _WRAP_PROPERTY("fd", int)
+  _WRAP_PROPERTY("close-fd", bool)
 };
 
 } // namespace Gio

Modified: trunk/gio/src/unixoutputstream.hg
==============================================================================
--- trunk/gio/src/unixoutputstream.hg	(original)
+++ trunk/gio/src/unixoutputstream.hg	Fri Feb  6 09:56:46 2009
@@ -43,6 +43,9 @@
 
 public:
   _WRAP_CREATE(int fd, bool close_fd_at_close)
+
+  _WRAP_PROPERTY("fd", int)
+  _WRAP_PROPERTY("close-fd", bool)
 };
 
 } // namespace Gio

Modified: trunk/tools/extra_defs_gen/generate_defs_gio.cc
==============================================================================
--- trunk/tools/extra_defs_gen/generate_defs_gio.cc	(original)
+++ trunk/tools/extra_defs_gen/generate_defs_gio.cc	Fri Feb  6 09:56:46 2009
@@ -20,6 +20,8 @@
 #include "generate_extra_defs.h"
 #include <iostream>
 #include <gio/gio.h>
+#include <gio/gunixinputstream.h>
+#include <gio/gunixoutputstream.h>
 
 int main (int argc, char** argv)
 {
@@ -45,6 +47,9 @@
             << get_defs(G_TYPE_FILTER_INPUT_STREAM)
             << get_defs(G_TYPE_FILTER_OUTPUT_STREAM)
 
+            << get_defs(G_TYPE_UNIX_INPUT_STREAM)
+            << get_defs(G_TYPE_UNIX_OUTPUT_STREAM)
+
             << get_defs(G_TYPE_INPUT_STREAM)
             << get_defs(G_TYPE_LOADABLE_ICON)
             << get_defs(G_TYPE_MEMORY_INPUT_STREAM)