From c7c5128d07e97c3ade228b51109c9964a66cb328 Mon Sep 17 00:00:00 2001 From: Murray Cumming Date: Mon, 24 Sep 2012 21:47:03 +0200 Subject: Update the *_methods defs files. * gio/src/gio_methods.defs: * glib/src/glib_functions.defs: * glib/src/gobject_functions.defs: Updated with tools/gen_scripts/ --- ChangeLog | 8 ++++++++ gio/src/gio_methods.defs | 10 +++++++++- glib/src/glib_functions.defs | 4 ++-- glib/src/gobject_functions.defs | 5 +++++ 4 files changed, 24 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 63aaa6fa..d3edfa32 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2012-09-24 Murray Cumming + + Update the *_methods defs files. + + * gio/src/gio_methods.defs: + * glib/src/glib_functions.defs: + * glib/src/gobject_functions.defs: Updated with tools/gen_scripts/ + 2012-09-24 Murray Cumming Update the docs XML files. diff --git a/gio/src/gio_methods.defs b/gio/src/gio_methods.defs index 19db0968..9db65c71 100644 --- a/gio/src/gio_methods.defs +++ b/gio/src/gio_methods.defs @@ -3004,6 +3004,14 @@ ) ) +(define-function g_content_type_get_generic_icon_name + (c-name "g_content_type_get_generic_icon_name") + (return-type "gchar*") + (parameters + '("const-gchar*" "type") + ) +) + (define-function g_content_type_can_be_executable (c-name "g_content_type_can_be_executable") (return-type "gboolean") @@ -10531,7 +10539,7 @@ (return-type "GVariant*") (parameters '("const-gchar*" "attribute") - '("const-GVariantType*" "expected_value") + '("const-GVariantType*" "expected_type") ) ) diff --git a/glib/src/glib_functions.defs b/glib/src/glib_functions.defs index 4ff4cd53..d8a31977 100644 --- a/glib/src/glib_functions.defs +++ b/glib/src/glib_functions.defs @@ -2803,7 +2803,7 @@ (c-name "g_datalist_id_dup_data") (return-type "gpointer") (parameters - '("GData**" "data") + '("GData**" "datalist") '("GQuark" "key_id") '("GDuplicateFunc" "dup_func") '("gpointer" "user_data") @@ -2814,7 +2814,7 @@ (c-name "g_datalist_id_replace_data") (return-type "gboolean") (parameters - '("GData**" "data") + '("GData**" "datalist") '("GQuark" "key_id") '("gpointer" "oldval") '("gpointer" "newval") diff --git a/glib/src/gobject_functions.defs b/glib/src/gobject_functions.defs index 3589d89e..57fe7ab0 100644 --- a/glib/src/gobject_functions.defs +++ b/glib/src/gobject_functions.defs @@ -668,6 +668,11 @@ (return-type "GType") ) +(define-function g_time_zone_get_type + (c-name "g_time_zone_get_type") + (return-type "GType") +) + (define-function g_io_channel_get_type (c-name "g_io_channel_get_type") (return-type "GType") -- cgit v1.2.1