[glibmm] Regenerated more .defs.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glibmm] Regenerated more .defs.
- Date: Mon, 8 Mar 2010 14:43:34 +0000 (UTC)
commit c579749fa8af27cb5b26d0c172148ac4ea575296
Author: Murray Cumming <murrayc murrayc com>
Date: Mon Mar 8 15:43:16 2010 +0100
Regenerated more .defs.
* gio/src/gio_enums.defs:
* glib/src/glib_enums.defs: Regenerated with enums.pl
* gio/src/gio_methods.defs: Regenerated with h2defs.py
ChangeLog | 8 +++++
gio/src/gio_enums.defs | 49 +++++++++++++++++++++++++++++++-
gio/src/gio_methods.defs | 48 +++++++++++++++----------------
glib/src/glib_enums.defs | 69 ++++++++++++++++++++++++++++++---------------
4 files changed, 124 insertions(+), 50 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 177ec1e..a1069ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2010-03-08 Murray Cumming <murrayc murrayc com>
+ Regenerated more .defs.
+
+ * gio/src/gio_enums.defs:
+ * glib/src/glib_enums.defs: Regenerated with enums.pl
+ * gio/src/gio_methods.defs: Regenerated with h2defs.py
+
+2010-03-08 Murray Cumming <murrayc murrayc com>
+
* glib/src/glib_functions.defs: Regenerated with h2defs.py.
2010-03-08 Debarshi Ray <debarshi ray gmail com>
diff --git a/gio/src/gio_enums.defs b/gio/src/gio_enums.defs
index f29e921..e6c5d92 100644
--- a/gio/src/gio_enums.defs
+++ b/gio/src/gio_enums.defs
@@ -1,4 +1,4 @@
-;; From /home/jonathon/.jhbuild-prefix/include/glib-2.0/gio/gioenums.h
+;; From gioenums.h
(define-flags-extended AppInfoCreateFlags
(in-module "G")
@@ -10,6 +10,27 @@
)
)
+(define-flags-extended ConverterFlags
+ (in-module "G")
+ (c-name "GConverterFlags")
+ (values
+ '("no-flags" "G_CONVERTER_NO_FLAGS" "0")
+ '("input-at-end" "G_CONVERTER_INPUT_AT_END" "1 << 0")
+ '("flush" "G_CONVERTER_FLUSH" "1 << 1")
+ )
+)
+
+(define-enum-extended ConverterResult
+ (in-module "G")
+ (c-name "GConverterResult")
+ (values
+ '("error" "G_CONVERTER_ERROR" "0")
+ '("converted" "G_CONVERTER_CONVERTED" "1")
+ '("finished" "G_CONVERTER_FINISHED" "2")
+ '("flushed" "G_CONVERTER_FLUSHED" "3")
+ )
+)
+
(define-enum-extended DataStreamByteOrder
(in-module "G")
(c-name "GDataStreamByteOrder")
@@ -144,6 +165,7 @@
(values
'("none" "G_FILE_MONITOR_NONE" "0")
'("watch-mounts" "G_FILE_MONITOR_WATCH_MOUNTS" "1 << 0")
+ '("send-moved" "G_FILE_MONITOR_SEND_MOVED" "1 << 1")
)
)
@@ -182,6 +204,7 @@
'("attribute-changed" "G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED" "4")
'("pre-unmount" "G_FILE_MONITOR_EVENT_PRE_UNMOUNT" "5")
'("unmounted" "G_FILE_MONITOR_EVENT_UNMOUNTED" "6")
+ '("moved" "G_FILE_MONITOR_EVENT_MOVED" "7")
)
)
@@ -218,12 +241,13 @@
'("busy" "G_IO_ERROR_BUSY" "26")
'("would-block" "G_IO_ERROR_WOULD_BLOCK" "27")
'("host-not-found" "G_IO_ERROR_HOST_NOT_FOUND" "28")
- '("host-was-not-found" "G_IO_ERROR_HOST_WAS_NOT_FOUND" "28")
'("would-merge" "G_IO_ERROR_WOULD_MERGE" "29")
'("failed-handled" "G_IO_ERROR_FAILED_HANDLED" "30")
'("too-many-open-files" "G_IO_ERROR_TOO_MANY_OPEN_FILES" "31")
'("not-initialized" "G_IO_ERROR_NOT_INITIALIZED" "32")
'("address-in-use" "G_IO_ERROR_ADDRESS_IN_USE" "33")
+ '("partial-input" "G_IO_ERROR_PARTIAL_INPUT" "34")
+ '("invalid-data" "G_IO_ERROR_INVALID_DATA" "35")
)
)
@@ -310,6 +334,17 @@
)
)
+(define-enum-extended SocketMsgFlags
+ (in-module "G")
+ (c-name "GSocketMsgFlags")
+ (values
+ '("none" "G_SOCKET_MSG_NONE" "0")
+ '("oob" "G_SOCKET_MSG_OOB" "#error")
+ '("peek" "G_SOCKET_MSG_PEEK" "#error")
+ '("dontroute" "G_SOCKET_MSG_DONTROUTE" "#error")
+ )
+)
+
(define-enum-extended SocketProtocol
(in-module "G")
(c-name "GSocketProtocol")
@@ -322,3 +357,13 @@
)
)
+(define-enum-extended ZlibCompressorFormat
+ (in-module "G")
+ (c-name "GZlibCompressorFormat")
+ (values
+ '("zlib" "G_ZLIB_COMPRESSOR_FORMAT_ZLIB" "0")
+ '("gzip" "G_ZLIB_COMPRESSOR_FORMAT_GZIP" "1")
+ '("raw" "G_ZLIB_COMPRESSOR_FORMAT_RAW" "2")
+ )
+)
+
diff --git a/gio/src/gio_methods.defs b/gio/src/gio_methods.defs
index 61fb232..18dd505 100644
--- a/gio/src/gio_methods.defs
+++ b/gio/src/gio_methods.defs
@@ -56,6 +56,12 @@
(gtype-id "G_TYPE_FILE")
)
+(define-object DescriptorBased
+ (in-module "GFile")
+ (c-name "GFileDescriptorBased")
+ (gtype-id "G_TYPE_FILE_DESCRIPTOR_BASED")
+)
+
(define-object Enumerator
(in-module "GFile")
(parent "GObject")
@@ -435,13 +441,6 @@
(gtype-id "G_TYPE_UNIX_SOCKET_ADDRESS")
)
-(define-object 8InputStream
- (in-module "GUtf")
- (parent "GFilterInputStream")
- (c-name "GUtf8InputStream")
- (gtype-id "G_TYPE_UTF8_INPUT_STREAM")
-)
-
(define-object s
(in-module "GVf")
(parent "GObject")
@@ -659,6 +658,7 @@
(values
'("none" "G_FILE_MONITOR_NONE")
'("watch-mounts" "G_FILE_MONITOR_WATCH_MOUNTS")
+ '("send-moved" "G_FILE_MONITOR_SEND_MOVED")
)
)
@@ -700,6 +700,7 @@
'("attribute-changed" "G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED")
'("pre-unmount" "G_FILE_MONITOR_EVENT_PRE_UNMOUNT")
'("unmounted" "G_FILE_MONITOR_EVENT_UNMOUNTED")
+ '("moved" "G_FILE_MONITOR_EVENT_MOVED")
)
)
@@ -2461,6 +2462,21 @@
+;; From gfiledescriptorbased.h
+
+(define-function g_file_descriptor_based_get_type
+ (c-name "g_file_descriptor_based_get_type")
+ (return-type "GType")
+)
+
+(define-method get_fd
+ (of-object "GFileDescriptorBased")
+ (c-name "g_file_descriptor_based_get_fd")
+ (return-type "int")
+)
+
+
+
;; From gfileenumerator.h
(define-function g_file_enumerator_get_type
@@ -8303,24 +8319,6 @@
-;; From gutf8inputstream.h
-
-(define-function g_utf8_input_stream_get_type
- (c-name "g_utf8_input_stream_get_type")
- (return-type "GType")
-)
-
-(define-function g_utf8_input_stream_new
- (c-name "g_utf8_input_stream_new")
- (is-constructor-of "GUtf8InputStream")
- (return-type "GInputStream*")
- (parameters
- '("GInputStream*" "base_stream")
- )
-)
-
-
-
;; From gvfs.h
(define-function g_vfs_get_type
diff --git a/glib/src/glib_enums.defs b/glib/src/glib_enums.defs
index e4da8e9..8a27cbe 100644
--- a/glib/src/glib_enums.defs
+++ b/glib/src/glib_enums.defs
@@ -1,4 +1,4 @@
-;; From /opt/gnome2/include/glib-2.0/glib/gbookmarkfile.h
+;; From gbookmarkfile.h
(define-enum-extended BookmarkFileError
(in-module "G")
@@ -15,7 +15,18 @@
)
)
-;; From /opt/gnome2/include/glib-2.0/glib/gchecksum.h
+;; From gbsearcharray.h
+
+(define-flags-extended BSearchArrayFlags
+ (in-module "G")
+ (c-name "GBSearchArrayFlags")
+ (values
+ '("align-power2" "G_BSEARCH_ARRAY_ALIGN_POWER2" "1 << 0")
+ '("auto-shrink" "G_BSEARCH_ARRAY_AUTO_SHRINK" "1 << 1")
+ )
+)
+
+;; From gchecksum.h
(define-enum-extended ChecksumType
(in-module "G")
@@ -27,7 +38,7 @@
)
)
-;; From /opt/gnome2/include/glib-2.0/glib/gconvert.h
+;; From gconvert.h
(define-enum-extended ConvertError
(in-module "G")
@@ -42,7 +53,7 @@
)
)
-;; From /opt/gnome2/include/glib-2.0/glib/gdate.h
+;; From gdate.h
(define-enum-extended DateDMY
(in-module "G")
@@ -89,7 +100,18 @@
)
)
-;; From /opt/gnome2/include/glib-2.0/glib/gfileutils.h
+;; From gdebug.h
+
+(define-flags-extended DebugFlag
+ (in-module "G")
+ (c-name "GDebugFlag")
+ (values
+ '("warnings" "G_DEBUG_FATAL_WARNINGS" "1 << 0")
+ '("criticals" "G_DEBUG_FATAL_CRITICALS" "1 << 1")
+ )
+)
+
+;; From gfileutils.h
(define-enum-extended FileError
(in-module "G")
@@ -135,7 +157,7 @@
)
)
-;; From /opt/gnome2/include/glib-2.0/glib/ghook.h
+;; From ghook.h
(define-flags-extended HookFlagMask
(in-module "G")
@@ -147,7 +169,7 @@
)
)
-;; From /opt/gnome2/include/glib-2.0/glib/giochannel.h
+;; From giochannel.h
(define-enum-extended IOError
(in-module "G")
@@ -218,7 +240,7 @@
)
)
-;; From /opt/gnome2/include/glib-2.0/glib/gkeyfile.h
+;; From gkeyfile.h
(define-enum-extended KeyFileError
(in-module "G")
@@ -243,7 +265,7 @@
)
)
-;; From /opt/gnome2/include/glib-2.0/glib/gmarkup.h
+;; From gmarkup.h
(define-enum-extended MarkupError
(in-module "G")
@@ -282,7 +304,7 @@
)
)
-;; From /opt/gnome2/include/glib-2.0/glib/gmessages.h
+;; From gmessages.h
(define-flags-extended LogLevelFlags
(in-module "G")
@@ -300,7 +322,7 @@
)
)
-;; From /opt/gnome2/include/glib-2.0/glib/gnode.h
+;; From gnode.h
(define-flags-extended TraverseFlags
(in-module "G")
@@ -326,7 +348,7 @@
)
)
-;; From /opt/gnome2/include/glib-2.0/glib/goption.h
+;; From goption.h
(define-flags-extended OptionFlags
(in-module "G")
@@ -368,7 +390,7 @@
)
)
-;; From /opt/gnome2/include/glib-2.0/glib/gregex.h
+;; From gregex.h
(define-enum-extended RegexError
(in-module "G")
@@ -456,7 +478,7 @@
)
)
-;; From /opt/gnome2/include/glib-2.0/glib/gscanner.h
+;; From gscanner.h
(define-enum-extended ErrorType
(in-module "G")
@@ -473,7 +495,7 @@
)
)
-;; From /opt/gnome2/include/glib-2.0/glib/gshell.h
+;; From gshell.h
(define-enum-extended ShellError
(in-module "G")
@@ -485,7 +507,7 @@
)
)
-;; From /opt/gnome2/include/glib-2.0/glib/gslice.h
+;; From gslice.h
(define-enum-extended SliceConfig
(in-module "G")
@@ -500,7 +522,7 @@
)
)
-;; From /opt/gnome2/include/glib-2.0/glib/gspawn.h
+;; From gspawn.h
(define-enum-extended SpawnError
(in-module "G")
@@ -542,7 +564,7 @@
)
)
-;; From /opt/gnome2/include/glib-2.0/glib/gstrfuncs.h
+;; From gstrfuncs.h
(define-flags-extended AsciiType
(in-module "G")
@@ -562,7 +584,7 @@
)
)
-;; From /opt/gnome2/include/glib-2.0/glib/gtestutils.h
+;; From gtestutils.h
(define-flags-extended TestTrapFlags
(in-module "G")
@@ -591,7 +613,7 @@
)
)
-;; From /opt/gnome2/include/glib-2.0/glib/gthread.h
+;; From gthread.h
(define-enum-extended ThreadError
(in-module "G")
@@ -622,7 +644,7 @@
)
)
-;; From /opt/gnome2/include/glib-2.0/glib/gunicode.h
+;; From gunicode.h
(define-enum-extended UnicodeType
(in-module "G")
@@ -795,7 +817,7 @@
(c-name "GNormalizeMode")
(values
'("default" "G_NORMALIZE_DEFAULT" "0")
- '("nfd" "G_NORMALIZE_NFD" "0")
+ '("nfd" "G_NORMALIZE_NFD" "#error")
'("default-compose" "G_NORMALIZE_DEFAULT_COMPOSE" "1")
'("nfc" "G_NORMALIZE_NFC" "1")
'("all" "G_NORMALIZE_ALL" "2")
@@ -805,7 +827,7 @@
)
)
-;; From /opt/gnome2/include/glib-2.0/glib/gutils.h
+;; From gutils.h
(define-enum-extended UserDirectory
(in-module "G")
@@ -823,3 +845,4 @@
)
)
+;; From gvariant.h
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]