diff options
author | Murray Cumming <murrayc@murrayc.com> | 2014-08-22 14:44:59 +0200 |
---|---|---|
committer | Murray Cumming <murrayc@murrayc.com> | 2014-08-22 14:44:59 +0200 |
commit | c262e8beb2b81f2665eb681d3d7c1ebedf77f766 (patch) | |
tree | 45c6808642fc9a296608d84e2e44e342d67e31cf | |
parent | a7dd604908b7ee50a2eefabb30ee60026e308785 (diff) | |
download | glibmm-c262e8beb2b81f2665eb681d3d7c1ebedf77f766.tar.gz |
Regenerate *_enums.defs.
-rw-r--r-- | gio/src/gio_enums.defs | 35 | ||||
-rw-r--r-- | glib/src/glib_enums.defs | 50 | ||||
-rw-r--r-- | glib/src/gobject_enums.defs | 6 |
3 files changed, 86 insertions, 5 deletions
diff --git a/gio/src/gio_enums.defs b/gio/src/gio_enums.defs index 414d8d41..3e08b5fc 100644 --- a/gio/src/gio_enums.defs +++ b/gio/src/gio_enums.defs @@ -938,7 +938,11 @@ ;; G_DBUS_ERROR_INVALID_FILE_CONTENT, /* org.freedesktop.DBus.Error.InvalidFileContent */ ;; G_DBUS_ERROR_SELINUX_SECURITY_CONTEXT_UNKNOWN, /* org.freedesktop.DBus.Error.SELinuxSecurityContextUnknown */ ;; G_DBUS_ERROR_ADT_AUDIT_DATA_UNKNOWN, /* org.freedesktop.DBus.Error.AdtAuditDataUnknown */ -;; G_DBUS_ERROR_OBJECT_PATH_IN_USE /* org.freedesktop.DBus.Error.ObjectPathInUse */ +;; G_DBUS_ERROR_OBJECT_PATH_IN_USE, /* org.freedesktop.DBus.Error.ObjectPathInUse */ +;; G_DBUS_ERROR_UNKNOWN_OBJECT, /* org.freedesktop.DBus.Error.UnknownObject */ +;; G_DBUS_ERROR_UNKNOWN_INTERFACE, /* org.freedesktop.DBus.Error.UnknownInterface */ +;; G_DBUS_ERROR_UNKNOWN_PROPERTY, /* org.freedesktop.DBus.Error.UnknownProperty */ +;; G_DBUS_ERROR_PROPERTY_READ_ONLY /* org.freedesktop.DBus.Error.PropertyReadOnly */ ;; } GDBusError; (define-enum-extended DBusError @@ -986,6 +990,10 @@ '("selinux-security-context-unknown" "G_DBUS_ERROR_SELINUX_SECURITY_CONTEXT_UNKNOWN" "38") '("adt-audit-data-unknown" "G_DBUS_ERROR_ADT_AUDIT_DATA_UNKNOWN" "39") '("object-path-in-use" "G_DBUS_ERROR_OBJECT_PATH_IN_USE" "40") + '("unknown-object" "G_DBUS_ERROR_UNKNOWN_OBJECT" "41") + '("unknown-interface" "G_DBUS_ERROR_UNKNOWN_INTERFACE" "42") + '("unknown-property" "G_DBUS_ERROR_UNKNOWN_PROPERTY" "43") + '("property-read-only" "G_DBUS_ERROR_PROPERTY_READ_ONLY" "44") ) ) @@ -1205,6 +1213,7 @@ ;; G_CREDENTIALS_TYPE_INVALID, ;; G_CREDENTIALS_TYPE_LINUX_UCRED, ;; G_CREDENTIALS_TYPE_FREEBSD_CMSGCRED, +;; G_CREDENTIALS_TYPE_NETBSD_UNPCBID, ;; G_CREDENTIALS_TYPE_OPENBSD_SOCKPEERCRED, ;; G_CREDENTIALS_TYPE_SOLARIS_UCRED ;; } GCredentialsType; @@ -1216,8 +1225,9 @@ '("invalid" "G_CREDENTIALS_TYPE_INVALID" "0") '("linux-ucred" "G_CREDENTIALS_TYPE_LINUX_UCRED" "1") '("freebsd-cmsgcred" "G_CREDENTIALS_TYPE_FREEBSD_CMSGCRED" "2") - '("openbsd-sockpeercred" "G_CREDENTIALS_TYPE_OPENBSD_SOCKPEERCRED" "3") - '("solaris-ucred" "G_CREDENTIALS_TYPE_SOLARIS_UCRED" "4") + '("netbsd-unpcbid" "G_CREDENTIALS_TYPE_NETBSD_UNPCBID" "3") + '("openbsd-sockpeercred" "G_CREDENTIALS_TYPE_OPENBSD_SOCKPEERCRED" "4") + '("solaris-ucred" "G_CREDENTIALS_TYPE_SOLARIS_UCRED" "5") ) ) @@ -1540,6 +1550,25 @@ ) ) +;; Original typedef: +;; typedef enum { +;; G_NOTIFICATION_PRIORITY_NORMAL, +;; G_NOTIFICATION_PRIORITY_LOW, +;; G_NOTIFICATION_PRIORITY_HIGH, +;; G_NOTIFICATION_PRIORITY_URGENT +;; } GNotificationPriority; + +(define-enum-extended NotificationPriority + (in-module "G") + (c-name "GNotificationPriority") + (values + '("normal" "G_NOTIFICATION_PRIORITY_NORMAL" "0") + '("low" "G_NOTIFICATION_PRIORITY_LOW" "1") + '("high" "G_NOTIFICATION_PRIORITY_HIGH" "2") + '("urgent" "G_NOTIFICATION_PRIORITY_URGENT" "3") + ) +) + ;; From gsettings.h ;; Original typedef: diff --git a/glib/src/glib_enums.defs b/glib/src/glib_enums.defs index c48aad5d..ff845735 100644 --- a/glib/src/glib_enums.defs +++ b/glib/src/glib_enums.defs @@ -1642,7 +1642,32 @@ ;; G_UNICODE_SCRIPT_MIAO, /* Plrd */ ;; G_UNICODE_SCRIPT_SHARADA, /* Shrd */ ;; G_UNICODE_SCRIPT_SORA_SOMPENG, /* Sora */ -;; G_UNICODE_SCRIPT_TAKRI /* Takr */ +;; G_UNICODE_SCRIPT_TAKRI, /* Takr */ +;; +;; /* Unicode 7.0 additions */ +;; G_UNICODE_SCRIPT_BASSA_VAH, /* Bass */ +;; G_UNICODE_SCRIPT_CAUCASIAN_ALBANIAN, /* Aghb */ +;; G_UNICODE_SCRIPT_DUPLOYAN, /* Dupl */ +;; G_UNICODE_SCRIPT_ELBASAN, /* Elba */ +;; G_UNICODE_SCRIPT_GRANTHA, /* Gran */ +;; G_UNICODE_SCRIPT_KHOJKI, /* Khoj */ +;; G_UNICODE_SCRIPT_KHUDAWADI, /* Sind */ +;; G_UNICODE_SCRIPT_LINEAR_A, /* Lina */ +;; G_UNICODE_SCRIPT_MAHAJANI, /* Mahj */ +;; G_UNICODE_SCRIPT_MANICHAEAN, /* Manu */ +;; G_UNICODE_SCRIPT_MENDE_KIKAKUI, /* Mend */ +;; G_UNICODE_SCRIPT_MODI, /* Modi */ +;; G_UNICODE_SCRIPT_MRO, /* Mroo */ +;; G_UNICODE_SCRIPT_NABATAEAN, /* Nbat */ +;; G_UNICODE_SCRIPT_OLD_NORTH_ARABIAN, /* Narb */ +;; G_UNICODE_SCRIPT_OLD_PERMIC, /* Perm */ +;; G_UNICODE_SCRIPT_PAHAWH_HMONG, /* Hmng */ +;; G_UNICODE_SCRIPT_PALMYRENE, /* Palm */ +;; G_UNICODE_SCRIPT_PAU_CIN_HAU, /* Pauc */ +;; G_UNICODE_SCRIPT_PSALTER_PAHLAVI, /* Phlp */ +;; G_UNICODE_SCRIPT_SIDDHAM, /* Sidd */ +;; G_UNICODE_SCRIPT_TIRHUTA, /* Tirh */ +;; G_UNICODE_SCRIPT_WARANG_CITI /* Wara */ ;; } GUnicodeScript; (define-enum-extended UnicodeScript @@ -1753,6 +1778,29 @@ '("sharada" "G_UNICODE_SCRIPT_SHARADA" "100") '("sora-sompeng" "G_UNICODE_SCRIPT_SORA_SOMPENG" "101") '("takri" "G_UNICODE_SCRIPT_TAKRI" "102") + '("bassa-vah" "G_UNICODE_SCRIPT_BASSA_VAH" "103") + '("caucasian-albanian" "G_UNICODE_SCRIPT_CAUCASIAN_ALBANIAN" "104") + '("duployan" "G_UNICODE_SCRIPT_DUPLOYAN" "105") + '("elbasan" "G_UNICODE_SCRIPT_ELBASAN" "106") + '("grantha" "G_UNICODE_SCRIPT_GRANTHA" "107") + '("khojki" "G_UNICODE_SCRIPT_KHOJKI" "108") + '("khudawadi" "G_UNICODE_SCRIPT_KHUDAWADI" "109") + '("linear-a" "G_UNICODE_SCRIPT_LINEAR_A" "110") + '("mahajani" "G_UNICODE_SCRIPT_MAHAJANI" "111") + '("manichaean" "G_UNICODE_SCRIPT_MANICHAEAN" "112") + '("mende-kikakui" "G_UNICODE_SCRIPT_MENDE_KIKAKUI" "113") + '("modi" "G_UNICODE_SCRIPT_MODI" "114") + '("mro" "G_UNICODE_SCRIPT_MRO" "115") + '("nabataean" "G_UNICODE_SCRIPT_NABATAEAN" "116") + '("old-north-arabian" "G_UNICODE_SCRIPT_OLD_NORTH_ARABIAN" "117") + '("old-permic" "G_UNICODE_SCRIPT_OLD_PERMIC" "118") + '("pahawh-hmong" "G_UNICODE_SCRIPT_PAHAWH_HMONG" "119") + '("palmyrene" "G_UNICODE_SCRIPT_PALMYRENE" "120") + '("pau-cin-hau" "G_UNICODE_SCRIPT_PAU_CIN_HAU" "121") + '("psalter-pahlavi" "G_UNICODE_SCRIPT_PSALTER_PAHLAVI" "122") + '("siddham" "G_UNICODE_SCRIPT_SIDDHAM" "123") + '("tirhuta" "G_UNICODE_SCRIPT_TIRHUTA" "124") + '("warang-citi" "G_UNICODE_SCRIPT_WARANG_CITI" "125") ) ) diff --git a/glib/src/gobject_enums.defs b/glib/src/gobject_enums.defs index ed0012cd..21190773 100644 --- a/glib/src/gobject_enums.defs +++ b/glib/src/gobject_enums.defs @@ -27,6 +27,7 @@ ;; { ;; G_PARAM_READABLE = 1 << 0, ;; G_PARAM_WRITABLE = 1 << 1, +;; G_PARAM_READWRITE = (G_PARAM_READABLE | G_PARAM_WRITABLE), ;; G_PARAM_CONSTRUCT = 1 << 2, ;; G_PARAM_CONSTRUCT_ONLY = 1 << 3, ;; G_PARAM_LAX_VALIDATION = 1 << 4, @@ -36,7 +37,8 @@ ;; #endif ;; G_PARAM_STATIC_NICK = 1 << 6, ;; G_PARAM_STATIC_BLURB = 1 << 7, -;; /* User defined flags go up to 30 */ +;; /* User defined flags go here */ +;; G_PARAM_EXPLICIT_NOTIFY = 1 << 30, ;; G_PARAM_DEPRECATED = 1 << 31 ;; } GParamFlags; @@ -46,6 +48,7 @@ (values '("readable" "G_PARAM_READABLE" "1 << 0") '("writable" "G_PARAM_WRITABLE" "1 << 1") + '("readwrite" "G_PARAM_READWRITE" "0x3") '("construct" "G_PARAM_CONSTRUCT" "1 << 2") '("construct-only" "G_PARAM_CONSTRUCT_ONLY" "1 << 3") '("lax-validation" "G_PARAM_LAX_VALIDATION" "1 << 4") @@ -53,6 +56,7 @@ '("private" "G_PARAM_PRIVATE" "0x20") '("static-nick" "G_PARAM_STATIC_NICK" "1 << 6") '("static-blurb" "G_PARAM_STATIC_BLURB" "1 << 7") + '("explicit-notify" "G_PARAM_EXPLICIT_NOTIFY" "1 << 30") '("deprecated" "G_PARAM_DEPRECATED" "1 << 31") ) ) |