summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMurray Cumming <murrayc@murrayc.com>2014-12-03 11:11:33 +0100
committerMurray Cumming <murrayc@murrayc.com>2014-12-03 11:11:33 +0100
commitaa0525e6c7b0b519279b85aa7613a00359255b57 (patch)
treeb49a79c4328d38b0a68e426e9b7ae9c047af56a4
parentc7fd894c8d2c39e4b11a7008564b9a7ef14860fa (diff)
downloadglibmm-aa0525e6c7b0b519279b85aa7613a00359255b57.tar.gz
Regnerate glib .defs.
-rw-r--r--glib/src/glib_functions.defs24
-rw-r--r--glib/src/gobject_enums.defs6
-rw-r--r--glib/src/gobject_functions.defs7
3 files changed, 35 insertions, 2 deletions
diff --git a/glib/src/glib_functions.defs b/glib/src/glib_functions.defs
index f1ed7d8f..9d5e4c3c 100644
--- a/glib/src/glib_functions.defs
+++ b/glib/src/glib_functions.defs
@@ -8088,6 +8088,21 @@
(return-type "gboolean")
)
+(define-method set_strict_posix
+ (of-object "GOptionContext")
+ (c-name "g_option_context_set_strict_posix")
+ (return-type "none")
+ (parameters
+ '("gboolean" "strict_posix")
+ )
+)
+
+(define-method get_strict_posix
+ (of-object "GOptionContext")
+ (c-name "g_option_context_get_strict_posix")
+ (return-type "gboolean")
+)
+
(define-method add_main_entries
(of-object "GOptionContext")
(c-name "g_option_context_add_main_entries")
@@ -10958,6 +10973,15 @@
)
)
+(define-function g_strv_contains
+ (c-name "g_strv_contains")
+ (return-type "gboolean")
+ (parameters
+ '("const-gchar*-const*" "strv")
+ '("const-gchar*" "str")
+ )
+)
+
;; From gstringchunk.h
diff --git a/glib/src/gobject_enums.defs b/glib/src/gobject_enums.defs
index 21190773..7b649415 100644
--- a/glib/src/gobject_enums.defs
+++ b/glib/src/gobject_enums.defs
@@ -141,7 +141,8 @@
;; G_TYPE_DEBUG_NONE = 0,
;; G_TYPE_DEBUG_OBJECTS = 1 << 0,
;; G_TYPE_DEBUG_SIGNALS = 1 << 1,
-;; G_TYPE_DEBUG_MASK = 0x03
+;; G_TYPE_DEBUG_INSTANCE_COUNT = 1 << 2,
+;; G_TYPE_DEBUG_MASK = 0x07
;; } GTypeDebugFlags;
(define-flags-extended TypeDebugFlags
@@ -151,7 +152,8 @@
'("none" "G_TYPE_DEBUG_NONE" "0x0")
'("objects" "G_TYPE_DEBUG_OBJECTS" "1 << 0")
'("signals" "G_TYPE_DEBUG_SIGNALS" "1 << 1")
- '("mask" "G_TYPE_DEBUG_MASK" "0x03")
+ '("instance-count" "G_TYPE_DEBUG_INSTANCE_COUNT" "1 << 2")
+ '("mask" "G_TYPE_DEBUG_MASK" "0x07")
)
)
diff --git a/glib/src/gobject_functions.defs b/glib/src/gobject_functions.defs
index 31c500e2..7611a004 100644
--- a/glib/src/gobject_functions.defs
+++ b/glib/src/gobject_functions.defs
@@ -96,6 +96,7 @@
'("none" "G_TYPE_DEBUG_NONE")
'("objects" "G_TYPE_DEBUG_OBJECTS")
'("signals" "G_TYPE_DEBUG_SIGNALS")
+ '("instance-count" "G_TYPE_DEBUG_INSTANCE_COUNT")
'("mask" "G_TYPE_DEBUG_MASK")
)
)
@@ -3136,6 +3137,12 @@
)
)
+(define-method get_instance_count
+ (of-object "GType")
+ (c-name "g_type_get_instance_count")
+ (return-type "int")
+)
+
(define-method register_static
(of-object "GType")
(c-name "g_type_register_static")