summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKjell Ahlstedt <kjell.ahlstedt@bredband.net>2015-02-17 12:41:47 +0100
committerKjell Ahlstedt <kjell.ahlstedt@bredband.net>2015-02-17 12:41:47 +0100
commit3c03b071d1f5e1beff7def57c6eedbe2fd7d6316 (patch)
treef007464e9b1b133f64ba2a7702b3c59e218c5f8c
parentfe4ce8e58b523935166fdd7eb074719d2f22f829 (diff)
downloadglibmm-3c03b071d1f5e1beff7def57c6eedbe2fd7d6316.tar.gz
Regenerate methods .defs and .defs.patch files
* gio/src/gio_methods.defs: * glib/src/glib_functions.defs: * glib/src/glib_functions.defs.patch: * glib/src/gobject_functions.defs: Updated.
-rw-r--r--gio/src/gio_methods.defs15
-rw-r--r--glib/src/glib_functions.defs24
-rw-r--r--glib/src/glib_functions.defs.patch14
-rw-r--r--glib/src/gobject_functions.defs5
4 files changed, 46 insertions, 12 deletions
diff --git a/gio/src/gio_methods.defs b/gio/src/gio_methods.defs
index 00c9d82c..ed4d2449 100644
--- a/gio/src/gio_methods.defs
+++ b/gio/src/gio_methods.defs
@@ -2735,6 +2735,16 @@
)
)
+(define-method bind_busy_property
+ (of-object "GApplication")
+ (c-name "g_application_bind_busy_property")
+ (return-type "none")
+ (parameters
+ '("gpointer" "object")
+ '("const-gchar*" "property")
+ )
+)
+
;; From gapplicationimpl.h
@@ -10840,11 +10850,6 @@
;; From glistmodel.h
-(define-function g_list_model_get_type
- (c-name "g_list_model_get_type")
- (return-type "GType")
-)
-
(define-method get_item_type
(of-object "GListModel")
(c-name "g_list_model_get_item_type")
diff --git a/glib/src/glib_functions.defs b/glib/src/glib_functions.defs
index edebe47a..f58dee7a 100644
--- a/glib/src/glib_functions.defs
+++ b/glib/src/glib_functions.defs
@@ -8230,6 +8230,18 @@
(return-type "none")
)
+(define-method ref
+ (of-object "GOptionGroup")
+ (c-name "g_option_group_ref")
+ (return-type "GOptionGroup*")
+)
+
+(define-method unref
+ (of-object "GOptionGroup")
+ (c-name "g_option_group_unref")
+ (return-type "none")
+)
+
(define-method add_entries
(of-object "GOptionGroup")
(c-name "g_option_group_add_entries")
@@ -12097,6 +12109,18 @@
(return-type "guint")
)
+(define-method locker_new
+ (of-object "GMutex")
+ (c-name "g_mutex_locker_new")
+ (return-type "GMutexLocker*")
+)
+
+(define-method free
+ (of-object "GMutexLocker")
+ (c-name "g_mutex_locker_free")
+ (return-type "none")
+)
+
;; From gthreadpool.h
diff --git a/glib/src/glib_functions.defs.patch b/glib/src/glib_functions.defs.patch
index b36c05a6..c0437518 100644
--- a/glib/src/glib_functions.defs.patch
+++ b/glib/src/glib_functions.defs.patch
@@ -1,6 +1,6 @@
---- glib_functions.defs 2012-02-28 10:09:30.000000000 -0500
-+++ glib_functions.defs.new 2012-02-28 10:08:25.000000000 -0500
-@@ -2563,7 +2563,7 @@
+--- glib_functions.defs.orig 2015-02-15 16:49:21.605101660 +0100
++++ glib_functions.defs 2015-02-15 16:49:21.617101670 +0100
+@@ -2739,7 +2739,7 @@
)
)
@@ -9,7 +9,7 @@
(of-object "GIConv")
(c-name "g_iconv")
(return-type "gsize")
-@@ -12346,13 +12346,9 @@
+@@ -13320,13 +13320,9 @@
(return-type "const-gchar*-const*")
)
@@ -24,9 +24,9 @@
+;; has a function pointer parameter and that is not handled correctly by
+;; h2def.py.
- (define-function g_get_user_runtime_dir
- (c-name "g_get_user_runtime_dir")
-@@ -12440,13 +12436,8 @@
+ (define-function g_get_system_config_dirs
+ (c-name "g_get_system_config_dirs")
+@@ -13419,13 +13415,8 @@
)
)
diff --git a/glib/src/gobject_functions.defs b/glib/src/gobject_functions.defs
index b59f0cfc..c945e7a7 100644
--- a/glib/src/gobject_functions.defs
+++ b/glib/src/gobject_functions.defs
@@ -747,6 +747,11 @@
(return-type "GType")
)
+(define-function g_option_group_get_type
+ (c-name "g_option_group_get_type")
+ (return-type "GType")
+)
+
(define-function g_variant_get_gtype
(c-name "g_variant_get_gtype")
(return-type "GType")