Add 2.18 gio API.

svn path=/trunk/; revision=1003

3 files changed, 238 insertions, 0 deletions

diff --git a/gio/gio-types.defs b/gio/gio-types.defs
index fe55b45..4a6d6b2 100644
--- a/gio/gio-types.defs
+++ b/gio/gio-types.defs
@@ -83,6 +83,20 @@
   (gtype-id "G_TYPE_CANCELLABLE")
 )
 
+(define-object Emblem
+  (in-module "gio")
+  (parent "GObject")
+  (c-name "GEmblem")
+  (gtype-id "G_TYPE_EMBLEM")
+)
+
+(define-object EmblemedIcon
+  (in-module "gio")
+  (parent "GObject")
+  (c-name "GEmblemedIcon")
+  (gtype-id "G_TYPE_EMBLEMED_ICON")
+)
+
 (define-object FileEnumerator
   (in-module "gio")
   (parent "GObject")
@@ -475,3 +489,15 @@
     '("close-target" "G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET")
   )
 )
+
+(define-enum EmblemOrigin
+  (in-module "gio")
+  (c-name "GEmblemOrigin")
+  (gtype-id "G_TYPE_EMBLEM_ORIGIN")
+  (values
+    '("unknown" "G_EMBLEM_ORIGIN_UNKNOWN")
+    '("device" "G_EMBLEM_ORIGIN_DEVICE")
+    '("livemetadata" "G_EMBLEM_ORIGIN_LIVEMETADATA")
+    '("tag" "G_EMBLEM_ORIGIN_TAG")
+  )
+)
diff --git a/gio/gio.defs b/gio/gio.defs
index 7aa96e4..a13776e 100644
--- a/gio/gio.defs
+++ b/gio/gio.defs
@@ -589,6 +589,14 @@
   )
 )
 
+(define-function content_type_from_mime_type
+  (c-name "g_content_type_from_mime_type")
+  (return-type "char*")
+  (parameters
+    '("const-char*" "mime_type")
+  )
+)
+
 ;;
 ;; wrapped in gio.override
 ;;
@@ -611,6 +619,14 @@
   )
 )
 
+(define-function content_type_guess_for_tree
+  (c-name "g_content_type_guess_for_tree")
+  (return-type "char**")
+  (parameters
+    '("GFile*" "root")
+  )
+)
+
 ;;
 ;; wrapped in gio.override
 ;;
@@ -1032,6 +1048,85 @@
 
 
 
+;; From gemblemedicon.h
+
+(define-function g_emblemed_icon_get_type
+  (c-name "g_emblemed_icon_get_type")
+  (return-type "GType")
+)
+
+(define-function g_emblemed_icon_new
+  (c-name "g_emblemed_icon_new")
+  (is-constructor-of "GEmblemedIcon")
+  (return-type "GIcon*")
+  (parameters
+    '("GIcon*" "icon")
+    '("GEmblem*" "emblem")
+  )
+)
+
+(define-method get_icon
+  (of-object "GEmblemedIcon")
+  (c-name "g_emblemed_icon_get_icon")
+  (return-type "GIcon*")
+)
+
+(define-method get_emblems
+  (of-object "GEmblemedIcon")
+  (c-name "g_emblemed_icon_get_emblems")
+  (return-type "GList*")
+)
+
+(define-method add_emblem
+  (of-object "GEmblemedIcon")
+  (c-name "g_emblemed_icon_add_emblem")
+  (return-type "none")
+  (parameters
+    '("GEmblem*" "emblem")
+  )
+)
+
+
+
+;; From gemblem.h
+
+(define-function g_emblem_get_type
+  (c-name "g_emblem_get_type")
+  (return-type "GType")
+)
+
+(define-function g_emblem_new
+  (c-name "g_emblem_new")
+  (is-constructor-of "GEmblem")
+  (return-type "GEmblem*")
+  (parameters
+    '("GIcon*" "icon")
+  )
+)
+
+(define-function emblem_new_with_origin
+  (c-name "g_emblem_new_with_origin")
+  (return-type "GEmblem*")
+  (parameters
+    '("GIcon*" "icon")
+    '("GEmblemOrigin" "origin")
+  )
+)
+
+(define-method get_icon
+  (of-object "GEmblem")
+  (c-name "g_emblem_get_icon")
+  (return-type "GIcon*")
+)
+
+(define-method get_origin
+  (of-object "GEmblem")
+  (c-name "g_emblem_get_origin")
+  (return-type "GEmblemOrigin")
+)
+
+
+
 ;; From gfileattribute.h
 
 (define-function file_attribute_info_list_new
@@ -1596,6 +1691,16 @@
   )
 )
 
+(define-method query_file_type
+  (of-object "GFile")
+  (c-name "g_file_query_file_type")
+  (return-type "GFileType")
+  (parameters
+    '("GFileQueryInfoFlags" "flags")
+    '("GCancellable*" "cancellable")
+  )
+)
+
 (define-method query_info
   (of-object "GFile")
   (c-name "g_file_query_info")
@@ -1987,6 +2092,16 @@
   )
 )
 
+(define-method make_directory_with_parents
+  (of-object "GFile")
+  (c-name "g_file_make_directory_with_parents")
+  (return-type "gboolean")
+  (parameters
+    '("GCancellable*" "cancellable")
+    '("GError**" "error")
+  )
+)
+
 (define-method make_symbolic_link
   (of-object "GFile")
   (c-name "g_file_make_symbolic_link")
@@ -2358,6 +2473,17 @@
   )
 )
 
+(define-method monitor
+  (of-object "GFile")
+  (c-name "g_file_monitor")
+  (return-type "GFileMonitor*")
+  (parameters
+    '("GFileMonitorFlags" "flags")
+    '("GCancellable*" "cancellable")
+    '("GError**" "error")
+  )
+)
+
 (define-method query_default_handler
   (of-object "GFile")
   (c-name "g_file_query_default_handler")
@@ -3946,6 +4072,12 @@
   (return-type "gsize")
 )
 
+(define-method get_data_size
+  (of-object "GMemoryOutputStream")
+  (c-name "g_memory_output_stream_get_data_size")
+  (return-type "gsize")
+)
+
 
 
 ;; From gmount.h
@@ -4103,6 +4235,39 @@
   )
 )
 
+(define-method guess_content_type
+  (of-object "GMount")
+  (c-name "g_mount_guess_content_type")
+  (return-type "none")
+  (parameters
+    '("gboolean" "force_rescan")
+    '("GCancellable*" "cancellable")
+    '("GAsyncReadyCallback" "callback")
+    '("gpointer" "user_data")
+  )
+)
+
+(define-method guess_content_type_finish
+  (of-object "GMount")
+  (c-name "g_mount_guess_content_type_finish")
+  (return-type "gchar**")
+  (parameters
+    '("GAsyncResult*" "result")
+    '("GError**" "error")
+  )
+)
+
+(define-method guess_content_type_sync
+  (of-object "GMount")
+  (c-name "g_mount_guess_content_type_sync")
+  (return-type "gchar**")
+  (parameters
+    '("gboolean" "force_rescan")
+    '("GCancellable*" "cancellable")
+    '("GError**" "error")
+  )
+)
+
 
 
 ;; From gmountoperation.h
@@ -4747,6 +4912,15 @@
   )
 )
 
+(define-method prepend_name
+  (of-object "GThemedIcon")
+  (c-name "g_themed_icon_prepend_name")
+  (return-type "none")
+  (parameters
+    '("const-char*" "iconname")
+  )
+)
+
 ;;
 ;; wrapped in gicon.override
 ;;
@@ -4979,6 +5153,27 @@
   )
 )
 
+(define-method get_identifier
+  (of-object "GVolume")
+  (c-name "g_volume_get_identifier")
+  (return-type "char*")
+  (parameters
+    '("const-char*" "kind")
+  )
+)
+
+(define-method enumerate_identifiers
+  (of-object "GVolume")
+  (c-name "g_volume_enumerate_identifiers")
+  (return-type "char**")
+)
+
+(define-method get_activation_root
+  (of-object "GVolume")
+  (c-name "g_volume_get_activation_root")
+  (return-type "GFile*")
+)
+
 
 
 ;; From gvolumemonitor.h
diff --git a/gio/unix.defs b/gio/unix.defs
index 2d28841..2c0891c 100644
--- a/gio/unix.defs
+++ b/gio/unix.defs
@@ -17,6 +17,14 @@
   )
 )
 
+(define-function g_desktop_app_info_new_from_keyfile
+  (c-name "g_desktop_app_info_new_from_keyfile")
+  (return-type "GDesktopAppInfo*")
+  (parameters
+    '("GKeyFile*" "key_file")
+  )
+)
+
 (define-function desktop_app_info_new
   (c-name "g_desktop_app_info_new")
   (is-constructor-of "GDesktopAppInfo")
@@ -256,6 +264,15 @@
   (return-type "GUnixMountMonitor*")
 )
 
+(define-method set_rate_limit
+  (of-object "GUnixMountMonitor")
+  (c-name "g_unix_mount_monitor_set_rate_limit")
+  (return-type "none")
+  (parameters
+    '("int" "limit_msec")
+  )
+)
+
 (define-function unix_is_mount_path_system_internal
   (c-name "g_unix_is_mount_path_system_internal")
   (return-type "gboolean")