GNOME.org
 

[glibmm] Regenereated the -enums.defs files.

commit f52dad338c148967938ce5b255ca2483ea86109b
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Mar 19 10:52:45 2013 +0100

    Regenereated the -enums.defs files.
    
        * gio/src/gio_enums.xml:
        * glib/src/glib_enums.xml: Regenerated using
        tools/gen_scripts/gio_generate_enums.sh and
        tools/gen_scripts/glib_generate_enums.sh.

 ChangeLog                |   16 +++++++--
 gio/src/gio_enums.defs   |   12 ++++--
 glib/src/glib_enums.defs |   81 ++++++++++++++++++++++++----------------------
 3 files changed, 63 insertions(+), 46 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index fb751b8..5ab7772 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,21 @@
 2013-03-19  Murray Cumming  <murrayc murrayc com>
 
-       Regenereated teh -docs.xml files.
+       Regenereated the -enums.defs files.
+
+       * gio/src/gio_enums.xml:
+       * glib/src/glib_enums.xml: Regenerated using
+       tools/gen_scripts/gio_generate_enums.sh and
+       tools/gen_scripts/glib_generate_enums.sh.
+
+
+2013-03-19  Murray Cumming  <murrayc murrayc com>
+
+       Regenereated the -docs.xml files.
 
        * gio/src/gio_docs.xml:
        * glib/src/glib_docs.xml: Regenerated using
-       tools/defs_gen/docextract_to_xml.py
-
+       tools/gen_scripts/gio_generate_docs.sh and
+       tools/gen_scripts/glib_generate_docs.sh.
 2.35.9:
 
 2013-03-13  José Alburquerque  <jaalburquerque gmail com>
diff --git a/gio/src/gio_enums.defs b/gio/src/gio_enums.defs
index 405db2d..3b93b62 100644
--- a/gio/src/gio_enums.defs
+++ b/gio/src/gio_enums.defs
@@ -300,9 +300,10 @@
 
 ;; Original typedef:
 ;; typedef enum {
-;;   G_FILE_MONITOR_NONE         = 0,
-;;   G_FILE_MONITOR_WATCH_MOUNTS = (1 << 0),
-;;   G_FILE_MONITOR_SEND_MOVED   = (1 << 1)
+;;   G_FILE_MONITOR_NONE             = 0,
+;;   G_FILE_MONITOR_WATCH_MOUNTS     = (1 << 0),
+;;   G_FILE_MONITOR_SEND_MOVED       = (1 << 1),
+;;   G_FILE_MONITOR_WATCH_HARD_LINKS = (1 << 2)
 ;; } GFileMonitorFlags;
 
 (define-flags-extended FileMonitorFlags
@@ -312,6 +313,7 @@
     '("none" "G_FILE_MONITOR_NONE" "0x0")
     '("watch-mounts" "G_FILE_MONITOR_WATCH_MOUNTS" "(1 << 0)")
     '("send-moved" "G_FILE_MONITOR_SEND_MOVED" "(1 << 1)")
+    '("watch-hard-links" "G_FILE_MONITOR_WATCH_HARD_LINKS" "(1 << 2)")
   )
 )
 
@@ -429,7 +431,8 @@
 ;;   G_IO_ERROR_PROXY_FAILED,
 ;;   G_IO_ERROR_PROXY_AUTH_FAILED,
 ;;   G_IO_ERROR_PROXY_NEED_AUTH,
-;;   G_IO_ERROR_PROXY_NOT_ALLOWED
+;;   G_IO_ERROR_PROXY_NOT_ALLOWED,
+;;   G_IO_ERROR_BROKEN_PIPE
 ;; } GIOErrorEnum;
 
 (define-enum-extended IOErrorEnum
@@ -481,6 +484,7 @@
     '("proxy-auth-failed" "G_IO_ERROR_PROXY_AUTH_FAILED" "41")
     '("proxy-need-auth" "G_IO_ERROR_PROXY_NEED_AUTH" "42")
     '("proxy-not-allowed" "G_IO_ERROR_PROXY_NOT_ALLOWED" "43")
+    '("broken-pipe" "G_IO_ERROR_BROKEN_PIPE" "44")
   )
 )
 
diff --git a/glib/src/glib_enums.defs b/glib/src/glib_enums.defs
index dfb3365..d62c9a7 100644
--- a/glib/src/glib_enums.defs
+++ b/glib/src/glib_enums.defs
@@ -52,7 +52,8 @@
 ;; typedef enum {
 ;;   G_CHECKSUM_MD5,
 ;;   G_CHECKSUM_SHA1,
-;;   G_CHECKSUM_SHA256
+;;   G_CHECKSUM_SHA256,
+;;   G_CHECKSUM_SHA512
 ;; } GChecksumType;
 
 (define-enum-extended ChecksumType
@@ -62,6 +63,7 @@
     '("md5" "G_CHECKSUM_MD5" "0")
     '("sha1" "G_CHECKSUM_SHA1" "1")
     '("sha256" "G_CHECKSUM_SHA256" "2")
+    '("sha512" "G_CHECKSUM_SHA512" "3")
   )
 )
 
@@ -376,53 +378,18 @@
 )
 
 ;; Original typedef:
-;; typedef enum /*< flags >*/
-;; {
-;;   G_IO_IN   GLIB_SYSDEF_POLLIN,
-;;   G_IO_OUT  GLIB_SYSDEF_POLLOUT,
-;;   G_IO_PRI  GLIB_SYSDEF_POLLPRI,
-;;   G_IO_ERR  GLIB_SYSDEF_POLLERR,
-;;   G_IO_HUP  GLIB_SYSDEF_POLLHUP,
-;;   G_IO_NVAL GLIB_SYSDEF_POLLNVAL
-;; } GIOCondition;
-
-;; We hand-edit these to use the actual enum values,
-;; because the values are actually defines that contain a =,
-;; which is very bizarre.
-;; We would need to include the header anyway,
-;; because we can't just use numeric values.
-;; If you regenerate this .defs file and forget to make this change
-;; then you will see compiler errors like this:
-;; ../glibmm/iochannel.h:154:12: error: expected primary-expression before '=' token
-(define-flags-extended IOCondition
-  (in-module "G")
-  (c-name "GIOCondition")
-  (values
-    '("in" "G_IO_IN" "G_IO_IN")
-    '("out" "G_IO_OUT" "G_IO_OUT")
-    '("pri" "G_IO_PRI" "G_IO_PRI")
-    '("err" "G_IO_ERR" "G_IO_ERR")
-    '("hup" "G_IO_HUP" "G_IO_HUP")
-    '("nval" "G_IO_NVAL" "G_IO_NVAL")
-  )
-)
-
-;; Original typedef:
 ;; typedef enum
 ;; {
 ;;   G_IO_FLAG_APPEND = 1 << 0,
 ;;   G_IO_FLAG_NONBLOCK = 1 << 1,
 ;;   G_IO_FLAG_IS_READABLE = 1 << 2,   /* Read only flag */
 ;;   G_IO_FLAG_IS_WRITABLE = 1 << 3,   /* Read only flag */
+;;   G_IO_FLAG_IS_WRITEABLE = 1 << 3,      /* Misspelling in 2.29.10 and earlier */
 ;;   G_IO_FLAG_IS_SEEKABLE = 1 << 4,   /* Read only flag */
 ;;   G_IO_FLAG_MASK = (1 << 5) - 1,
 ;;   G_IO_FLAG_GET_MASK = G_IO_FLAG_MASK,
 ;;   G_IO_FLAG_SET_MASK = G_IO_FLAG_APPEND | G_IO_FLAG_NONBLOCK
 ;; } GIOFlags;
-;; Note that we add is-writeable in glibmm to preserve API.
-;; They do that with a #define in glib, though an enum would have been OK:
-;; See http://git.gnome.org/browse/glib/commit/glib/giochannel.h?id=0d1a2eb4bfcd733e0c015c76fb0ca0308b8a61f0
-;; and https://bugzilla.gnome.org/show_bug.cgi?id=657045#c6
 
 (define-flags-extended IOFlags
   (in-module "G")
@@ -431,8 +398,8 @@
     '("append" "G_IO_FLAG_APPEND" "1 << 0")
     '("nonblock" "G_IO_FLAG_NONBLOCK" "1 << 1")
     '("is-readable" "G_IO_FLAG_IS_READABLE" "1 << 2")
-    '("is-writeable" "G_IO_FLAG_IS_WRITEABLE" "1 << 3")
     '("is-writable" "G_IO_FLAG_IS_WRITABLE" "1 << 3")
+    '("is-writeable" "G_IO_FLAG_IS_WRITEABLE" "1 << 3")
     '("is-seekable" "G_IO_FLAG_IS_SEEKABLE" "1 << 4")
     '("mask" "G_IO_FLAG_MASK" "(1 << 5) - 1")
     '("get-mask" "G_IO_FLAG_GET_MASK" "0x1F")
@@ -484,6 +451,40 @@
   )
 )
 
+;; From gmain.h
+
+;; Original typedef:
+;; typedef enum /*< flags >*/
+;; {
+;;   G_IO_IN   GLIB_SYSDEF_POLLIN,
+;;   G_IO_OUT  GLIB_SYSDEF_POLLOUT,
+;;   G_IO_PRI  GLIB_SYSDEF_POLLPRI,
+;;   G_IO_ERR  GLIB_SYSDEF_POLLERR,
+;;   G_IO_HUP  GLIB_SYSDEF_POLLHUP,
+;;   G_IO_NVAL GLIB_SYSDEF_POLLNVAL
+;; } GIOCondition;
+
+;; We hand-edit these to use the actual enum values,
+;; because the values are actually defines that contain a =,
+;; which is very bizarre.
+;; We would need to include the header anyway,
+;; because we can't just use numeric values.
+;; If you regenerate this .defs file and forget to make this change
+;; then you will see compiler errors like this:
+;; ../glibmm/iochannel.h:154:12: error: expected primary-expression before '=' token
+(define-flags-extended IOCondition
+  (in-module "G")
+  (c-name "GIOCondition")
+  (values
+    '("in" "G_IO_IN" "G_IO_IN")
+    '("out" "G_IO_OUT" "G_IO_OUT")
+    '("pri" "G_IO_PRI" "G_IO_PRI")
+    '("err" "G_IO_ERR" "G_IO_ERR")
+    '("hup" "G_IO_HUP" "G_IO_HUP")
+    '("nval" "G_IO_NVAL" "G_IO_NVAL")
+  )
+)
+
 ;; From gmarkup.h
 
 ;; Original typedef:
@@ -1425,7 +1426,8 @@
 ;;   G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE,
 ;;   G_UNICODE_BREAK_CLOSE_PARANTHESIS,
 ;;   G_UNICODE_BREAK_CONDITIONAL_JAPANESE_STARTER,
-;;   G_UNICODE_BREAK_HEBREW_LETTER
+;;   G_UNICODE_BREAK_HEBREW_LETTER,
+;;   G_UNICODE_BREAK_REGIONAL_INDICATOR
 ;; } GUnicodeBreakType;
 
 (define-enum-extended UnicodeBreakType
@@ -1471,6 +1473,7 @@
     '("close-paranthesis" "G_UNICODE_BREAK_CLOSE_PARANTHESIS" "36")
     '("conditional-japanese-starter" "G_UNICODE_BREAK_CONDITIONAL_JAPANESE_STARTER" "37")
     '("hebrew-letter" "G_UNICODE_BREAK_HEBREW_LETTER" "38")
+    '("regional-indicator" "G_UNICODE_BREAK_REGIONAL_INDICATOR" "39")
   )
 )
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]