h2def.py: Handle deprecated functions.

	* tools/defs_gen/h2def.py: The g_application_set_action_group() and
	the g_volume_monitor_adopt_orphan_mount() functions are wrapped but
	not generated because they have been deprecated in their header files
	by using a GLIB_DEPRECATED macro before the function declaration.
	Modify this tool to strip the macro so the functions are recognized.
	* gio/src/gio_methods.defs: Regenerate so the missing method
	definitions are included.

3 files changed, 69 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 9022d0b3..38e2f2a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2012-02-16  José Alburquerque  <jaalburquerque@gmail.com>
+
+	h2def.py: Handle deprecated functions.
+
+	* tools/defs_gen/h2def.py: The g_application_set_action_group() and
+	the g_volume_monitor_adopt_orphan_mount() functions are wrapped but
+	not generated because they have been deprecated in their header files
+	by using a GLIB_DEPRECATED macro before the function declaration.
+	Modify this tool to strip the macro so the functions are recognized.
+	* gio/src/gio_methods.defs: Regenerate so the missing method
+	definitions are included.
+
 2012-02-15  José Alburquerque  <jaalburquerque@gmail.com>
 
 	giomm: Add the ActionMap interface.
diff --git a/gio/src/gio_methods.defs b/gio/src/gio_methods.defs
index 77e94024..33c07aba 100644
--- a/gio/src/gio_methods.defs
+++ b/gio/src/gio_methods.defs
@@ -2360,6 +2360,15 @@
   )
 )
 
+(define-method set_action_group
+  (of-object "GApplication")
+  (c-name "g_application_set_action_group")
+  (return-type "none")
+  (parameters
+    '("GActionGroup*" "action_group")
+  )
+)
+
 (define-method get_is_registered
   (of-object "GApplication")
   (c-name "g_application_get_is_registered")
@@ -6044,6 +6053,20 @@
   )
 )
 
+(define-function g_desktop_app_info_lookup_get_type
+  (c-name "g_desktop_app_info_lookup_get_type")
+  (return-type "GType")
+)
+
+(define-method get_default_for_uri_scheme
+  (of-object "GDesktopAppInfoLookup")
+  (c-name "g_desktop_app_info_lookup_get_default_for_uri_scheme")
+  (return-type "GAppInfo*")
+  (parameters
+    '("const-char*" "uri_scheme")
+  )
+)
+
 (define-method launch_uris_as_manager
   (of-object "GDesktopAppInfo")
   (c-name "g_desktop_app_info_launch_uris_as_manager")
@@ -14438,6 +14461,21 @@
   (return-type "GType")
 )
 
+(define-method set_use_system_certdb
+  (of-object "GTlsConnection")
+  (c-name "g_tls_connection_set_use_system_certdb")
+  (return-type "none")
+  (parameters
+    '("gboolean" "use_system_certdb")
+  )
+)
+
+(define-method get_use_system_certdb
+  (of-object "GTlsConnection")
+  (c-name "g_tls_connection_get_use_system_certdb")
+  (return-type "gboolean")
+)
+
 (define-method set_database
   (of-object "GTlsConnection")
   (c-name "g_tls_connection_set_database")
@@ -15541,6 +15579,12 @@
   (return-type "GUnixSocketAddressType")
 )
 
+(define-method get_is_abstract
+  (of-object "GUnixSocketAddress")
+  (c-name "g_unix_socket_address_get_is_abstract")
+  (return-type "gboolean")
+)
+
 (define-function g_unix_socket_address_abstract_names_supported
   (c-name "g_unix_socket_address_abstract_names_supported")
   (return-type "gboolean")
@@ -15786,6 +15830,14 @@
   )
 )
 
+(define-function g_volume_monitor_adopt_orphan_mount
+  (c-name "g_volume_monitor_adopt_orphan_mount")
+  (return-type "GVolume*")
+  (parameters
+    '("GMount*" "mount")
+  )
+)
+
 
 
 ;; From gwin32appinfo.h
diff --git a/tools/defs_gen/h2def.py b/tools/defs_gen/h2def.py
index f4983b83..9499c66b 100755
--- a/tools/defs_gen/h2def.py
+++ b/tools/defs_gen/h2def.py
@@ -303,6 +303,11 @@ def clean_func(buf):
     #strip G_GNUC_WARN_UNUSED_RESULT and G_INLINE_FUNC
     pat = re.compile(r"""G_GNUC_WARN_UNUSED_RESULT|G_INLINE_FUNC""", re.MULTILINE)
     buf = pat.sub('', buf)
+
+    #strip GLIB_DEPRECATED
+    pat = re.compile(r"""GLIB_DEPRECATED""", re.MULTILINE)
+    buf = pat.sub('', buf)
+
     #we are not stripping G_GNUC_INTERNAL
 
     #extern "C"