readd support for void UnresolvedType, still required for vapigen
authorJuerg Billeter <j@bitron.ch>
Wed, 12 Dec 2007 19:44:26 +0000 (19:44 +0000)
committerJürg Billeter <juergbi@src.gnome.org>
Wed, 12 Dec 2007 19:44:26 +0000 (19:44 +0000)
2007-12-12  Juerg Billeter  <j@bitron.ch>

* vala/valasymbolresolver.vala: readd support for void UnresolvedType,
  still required for vapigen

* gobject-introspection/gidl.vapi: add IdlNodeUnion

* vapigen/valagidlparser.vala: add support for unions

* vapi/packages/libgnome-2.0/, vapi/packages/libgnomeui-2.0/: remove
  bindings for deprecated functions

* vapi/gconf-2.0.vapi, vapi/gio-2.0.vapi, vapi/gnome-vfs-2.0.vapi,
  vapi/gstreamer-0.10.vapi, vapi/libgnome-2.0.vapi,
  vapi/libgnomeui-2.0.vapi, vapi/libnotify.vapi, vapi/libsoup-2.2.vapi,
  vapi/poppler-glib.vapi: regenerated

svn path=/trunk/; revision=766

19 files changed:
ChangeLog
gobject-introspection/gidl.vapi
vala/valasymbolresolver.vala
vapi/gconf-2.0.vapi
vapi/gio-2.0.vapi
vapi/gnome-vfs-2.0.vapi
vapi/gstreamer-0.10.vapi
vapi/libgnome-2.0.vapi
vapi/libgnomeui-2.0.vapi
vapi/libnotify.vapi
vapi/libsoup-2.2.vapi
vapi/packages/libgnome-2.0/libgnome-2.0.defines [new file with mode: 0644]
vapi/packages/libgnome-2.0/libgnome-2.0.gi
vapi/packages/libgnomeui-2.0/libgnomeui-2.0.defines [new file with mode: 0644]
vapi/packages/libgnomeui-2.0/libgnomeui-2.0.gi
vapi/packages/libsoup-2.2/libsoup-2.2-custom.vala [deleted file]
vapi/packages/libsoup-2.2/libsoup-2.2.gi
vapi/poppler-glib.vapi
vapigen/valagidlparser.vala

index 79cf1d4..641586a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,22 @@
 2007-12-12  Jürg Billeter  <j@bitron.ch>
 
+       * vala/valasymbolresolver.vala: readd support for void UnresolvedType,
+         still required for vapigen
+
+       * gobject-introspection/gidl.vapi: add IdlNodeUnion
+
+       * vapigen/valagidlparser.vala: add support for unions
+
+       * vapi/packages/libgnome-2.0/, vapi/packages/libgnomeui-2.0/: remove
+         bindings for deprecated functions
+
+       * vapi/gconf-2.0.vapi, vapi/gio-2.0.vapi, vapi/gnome-vfs-2.0.vapi,
+         vapi/gstreamer-0.10.vapi, vapi/libgnome-2.0.vapi,
+         vapi/libgnomeui-2.0.vapi, vapi/libnotify.vapi, vapi/libsoup-2.2.vapi,
+         vapi/poppler-glib.vapi: regenerated
+
+2007-12-12  Jürg Billeter  <j@bitron.ch>
+
        * vala/valasemanticanalyzer.vala: support assignment of lambda
          expressions to local variables
 
index 0d2181a..28498a0 100644 (file)
@@ -190,6 +190,13 @@ namespace GLib {
        }
        
        [CCode (free_function = "g_idl_node_free", cheader_filename = "gidlnode.h")]
+       public class IdlNodeUnion {
+               public bool deprecated;
+               
+               public List<IdlNode> members;
+       }
+       
+       [CCode (free_function = "g_idl_node_free", cheader_filename = "gidlnode.h")]
        public class IdlNodeType {
                public bool is_pointer;
                public bool is_basic;
index bb715da..40b8c27 100644 (file)
@@ -192,6 +192,11 @@ public class Vala.SymbolResolver : CodeVisitor {
                        type.add_type_argument (type_arg);
                }
 
+               // still required for vapigen
+               if (unresolved_type.type_name == "void") {
+                       return type;
+               }
+
                if (unresolved_type.namespace_name == null) {
                        Symbol sym = null;
                        Scope scope = current_scope;
index 8339a14..d70d619 100644 (file)
@@ -198,7 +198,7 @@ namespace GConf {
        }
        [CCode (ref_function = "gconf_change_set_ref", unref_function = "gconf_change_set_unref", cheader_filename = "gconf/gconf.h")]
        public class ChangeSet : GLib.Boxed {
-               public bool check_value (string key, out GConf.Value value_retloc);
+               public bool check_value (string key, out weak GConf.Value value_retloc);
                public void clear ();
                public void @foreach (GConf.ChangeSetForeachFunc func, pointer user_data);
                public pointer get_user_data ();
@@ -290,7 +290,7 @@ namespace GConf {
        public static weak string enum_to_string (GConf.EnumStringPair[] lookup_table, int enum_value);
        public static GLib.Quark error_quark ();
        public static weak string escape_key (string arbitrary_text, int len);
-       public static bool init (int argc, out string argv) throws GLib.Error;
+       public static bool init (int argc, out weak string argv) throws GLib.Error;
        public static bool is_initialized ();
        public static bool key_is_below (string above, string below);
        [NoArrayLength]
index 3eb2561..7860a44 100644 (file)
@@ -629,11 +629,11 @@ namespace GLib {
                public abstract bool has_uri_scheme (string uri_scheme);
                public static uint hash (pointer file);
                public abstract bool is_native ();
-               public bool load_contents (GLib.Cancellable cancellable, out string contents, ulong length, out string etag_out) throws GLib.Error;
+               public bool load_contents (GLib.Cancellable cancellable, out weak string contents, ulong length, out weak string etag_out) throws GLib.Error;
                public void load_contents_async (GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
-               public bool load_contents_finish (GLib.AsyncResult res, out string contents, ulong length, out string etag_out) throws GLib.Error;
+               public bool load_contents_finish (GLib.AsyncResult res, out weak string contents, ulong length, out weak string etag_out) throws GLib.Error;
                public void load_partial_contents_async (GLib.Cancellable cancellable, GLib.FileReadMoreCallback read_more_callback, GLib.AsyncReadyCallback callback, pointer user_data);
-               public bool load_partial_contents_finish (GLib.AsyncResult res, out string contents, ulong length, out string etag_out) throws GLib.Error;
+               public bool load_partial_contents_finish (GLib.AsyncResult res, out weak string contents, ulong length, out weak string etag_out) throws GLib.Error;
                public abstract bool make_directory (GLib.Cancellable cancellable) throws GLib.Error;
                public abstract bool make_symbolic_link (string symlink_value, GLib.Cancellable cancellable) throws GLib.Error;
                public abstract void mount_mountable (GLib.MountOperation mount_operation, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
@@ -654,9 +654,9 @@ namespace GLib {
                public abstract weak GLib.FileInputStream read_finish (GLib.AsyncResult res) throws GLib.Error;
                public abstract weak GLib.FileOutputStream replace (string etag, bool make_backup, GLib.FileCreateFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
                public abstract void replace_async (string etag, bool make_backup, GLib.FileCreateFlags flags, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
-               public bool replace_contents (string contents, ulong length, string etag, bool make_backup, GLib.FileCreateFlags flags, out string new_etag, GLib.Cancellable cancellable) throws GLib.Error;
+               public bool replace_contents (string contents, ulong length, string etag, bool make_backup, GLib.FileCreateFlags flags, out weak string new_etag, GLib.Cancellable cancellable) throws GLib.Error;
                public void replace_contents_async (string contents, ulong length, string etag, bool make_backup, GLib.FileCreateFlags flags, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
-               public bool replace_contents_finish (GLib.AsyncResult res, out string new_etag) throws GLib.Error;
+               public bool replace_contents_finish (GLib.AsyncResult res, out weak string new_etag) throws GLib.Error;
                public abstract weak GLib.FileOutputStream replace_finish (GLib.AsyncResult res) throws GLib.Error;
                public abstract weak GLib.File resolve_relative_path (string relative_path);
                public abstract bool set_attribute (string attribute, GLib.FileAttributeValue value, GLib.FileQueryInfoFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
@@ -667,7 +667,7 @@ namespace GLib {
                public bool set_attribute_uint32 (string attribute, uint value, GLib.FileQueryInfoFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
                public bool set_attribute_uint64 (string attribute, uint64 value, GLib.FileQueryInfoFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
                public abstract void set_attributes_async (GLib.FileInfo info, GLib.FileQueryInfoFlags flags, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
-               public abstract bool set_attributes_finish (GLib.AsyncResult result, out GLib.FileInfo info) throws GLib.Error;
+               public abstract bool set_attributes_finish (GLib.AsyncResult result, out weak GLib.FileInfo info) throws GLib.Error;
                public abstract bool set_attributes_from_info (GLib.FileInfo info, GLib.FileQueryInfoFlags flags, GLib.Cancellable cancellable) throws GLib.Error;
                public abstract weak GLib.File set_display_name (string display_name, GLib.Cancellable cancellable) throws GLib.Error;
                public abstract void set_display_name_async (string display_name, int io_priority, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
@@ -683,9 +683,9 @@ namespace GLib {
        }
        [CCode (cheader_filename = "gio/gvfs.h")]
        public interface LoadableIcon : GLib.Icon, GLib.Object {
-               public abstract weak GLib.InputStream load (int size, out string type, GLib.Cancellable cancellable) throws GLib.Error;
+               public abstract weak GLib.InputStream load (int size, out weak string type, GLib.Cancellable cancellable) throws GLib.Error;
                public abstract void load_async (int size, GLib.Cancellable cancellable, GLib.AsyncReadyCallback callback, pointer user_data);
-               public abstract weak GLib.InputStream load_finish (GLib.AsyncResult res, out string type) throws GLib.Error;
+               public abstract weak GLib.InputStream load_finish (GLib.AsyncResult res, out weak string type) throws GLib.Error;
        }
        [CCode (cheader_filename = "gio/gseekable.h")]
        public interface Seekable : GLib.Object {
index 5b2607b..2430341 100644 (file)
@@ -427,7 +427,7 @@ namespace GnomeVFS {
                public pointer action;
                public pointer reserved1;
                public GnomeVFS.Result launch (GLib.List uris);
-               public GnomeVFS.Result launch_with_env (GLib.List uris, out string envp);
+               public GnomeVFS.Result launch_with_env (GLib.List uris, out weak string envp);
        }
        [CCode (copy_function = "gnome_vfs_mime_application_copy", cheader_filename = "libgnomevfs/gnome-vfs.h")]
        public class MimeApplication {
@@ -449,7 +449,7 @@ namespace GnomeVFS {
                public weak string get_name ();
                public weak string get_startup_wm_class ();
                public GnomeVFS.Result launch (GLib.List uris);
-               public GnomeVFS.Result launch_with_env (GLib.List uris, out string envp);
+               public GnomeVFS.Result launch_with_env (GLib.List uris, out weak string envp);
                public static void list_free (GLib.List list);
                public MimeApplication.from_desktop_id (string id);
                public MimeApplication.from_id (string id);
@@ -928,52 +928,52 @@ namespace GnomeVFS {
        public static void application_registry_unset_key (string app_id, string key);
        public static void async_cancel (GnomeVFS.AsyncHandle handle);
        public static void async_close (GnomeVFS.AsyncHandle handle, GnomeVFS.AsyncCloseCallback callback, pointer callback_data);
-       public static void async_create (out GnomeVFS.AsyncHandle handle_return, string text_uri, GnomeVFS.OpenMode open_mode, bool exclusive, uint perm, int priority, GnomeVFS.AsyncOpenCallback callback, pointer callback_data);
-       public static void async_create_as_channel (out GnomeVFS.AsyncHandle handle_return, string text_uri, GnomeVFS.OpenMode open_mode, bool exclusive, uint perm, int priority, GnomeVFS.AsyncCreateAsChannelCallback callback, pointer callback_data);
-       public static void async_create_symbolic_link (out GnomeVFS.AsyncHandle handle_return, GnomeVFS.URI uri, string uri_reference, int priority, GnomeVFS.AsyncOpenCallback callback, pointer callback_data);
-       public static void async_create_uri (out GnomeVFS.AsyncHandle handle_return, GnomeVFS.URI uri, GnomeVFS.OpenMode open_mode, bool exclusive, uint perm, int priority, GnomeVFS.AsyncOpenCallback callback, pointer callback_data);
-       public static void async_create_uri_as_channel (out GnomeVFS.AsyncHandle handle_return, GnomeVFS.URI uri, GnomeVFS.OpenMode open_mode, bool exclusive, uint perm, int priority, GnomeVFS.AsyncCreateAsChannelCallback callback, pointer callback_data);
+       public static void async_create (out weak GnomeVFS.AsyncHandle handle_return, string text_uri, GnomeVFS.OpenMode open_mode, bool exclusive, uint perm, int priority, GnomeVFS.AsyncOpenCallback callback, pointer callback_data);
+       public static void async_create_as_channel (out weak GnomeVFS.AsyncHandle handle_return, string text_uri, GnomeVFS.OpenMode open_mode, bool exclusive, uint perm, int priority, GnomeVFS.AsyncCreateAsChannelCallback callback, pointer callback_data);
+       public static void async_create_symbolic_link (out weak GnomeVFS.AsyncHandle handle_return, GnomeVFS.URI uri, string uri_reference, int priority, GnomeVFS.AsyncOpenCallback callback, pointer callback_data);
+       public static void async_create_uri (out weak GnomeVFS.AsyncHandle handle_return, GnomeVFS.URI uri, GnomeVFS.OpenMode open_mode, bool exclusive, uint perm, int priority, GnomeVFS.AsyncOpenCallback callback, pointer callback_data);
+       public static void async_create_uri_as_channel (out weak GnomeVFS.AsyncHandle handle_return, GnomeVFS.URI uri, GnomeVFS.OpenMode open_mode, bool exclusive, uint perm, int priority, GnomeVFS.AsyncCreateAsChannelCallback callback, pointer callback_data);
        public static void async_file_control (GnomeVFS.AsyncHandle handle, string operation, pointer operation_data, GLib.DestroyNotify operation_data_destroy_func, GnomeVFS.AsyncFileControlCallback callback, pointer callback_data);
-       public static void async_find_directory (out GnomeVFS.AsyncHandle handle_return, GLib.List near_uri_list, GnomeVFS.FindDirectoryKind kind, bool create_if_needed, bool find_if_needed, uint permissions, int priority, GnomeVFS.AsyncFindDirectoryCallback callback, pointer user_data);
-       public static void async_get_file_info (out GnomeVFS.AsyncHandle handle_return, GLib.List uri_list, GnomeVFS.FileInfoOptions options, int priority, GnomeVFS.AsyncGetFileInfoCallback callback, pointer callback_data);
+       public static void async_find_directory (out weak GnomeVFS.AsyncHandle handle_return, GLib.List near_uri_list, GnomeVFS.FindDirectoryKind kind, bool create_if_needed, bool find_if_needed, uint permissions, int priority, GnomeVFS.AsyncFindDirectoryCallback callback, pointer user_data);
+       public static void async_get_file_info (out weak GnomeVFS.AsyncHandle handle_return, GLib.List uri_list, GnomeVFS.FileInfoOptions options, int priority, GnomeVFS.AsyncGetFileInfoCallback callback, pointer callback_data);
        public static int async_get_job_limit ();
-       public static void async_load_directory (out GnomeVFS.AsyncHandle handle_return, string text_uri, GnomeVFS.FileInfoOptions options, uint items_per_notification, int priority, GnomeVFS.AsyncDirectoryLoadCallback callback, pointer callback_data);
-       public static void async_load_directory_uri (out GnomeVFS.AsyncHandle handle_return, GnomeVFS.URI uri, GnomeVFS.FileInfoOptions options, uint items_per_notification, int priority, GnomeVFS.AsyncDirectoryLoadCallback callback, pointer callback_data);
+       public static void async_load_directory (out weak GnomeVFS.AsyncHandle handle_return, string text_uri, GnomeVFS.FileInfoOptions options, uint items_per_notification, int priority, GnomeVFS.AsyncDirectoryLoadCallback callback, pointer callback_data);
+       public static void async_load_directory_uri (out weak GnomeVFS.AsyncHandle handle_return, GnomeVFS.URI uri, GnomeVFS.FileInfoOptions options, uint items_per_notification, int priority, GnomeVFS.AsyncDirectoryLoadCallback callback, pointer callback_data);
        public static void async_module_callback_pop (string callback_name);
        public static void async_module_callback_push (string callback_name, GnomeVFS.AsyncModuleCallback callback, pointer callback_data, GLib.DestroyNotify destroy_notify);
        public static void async_module_callback_set_default (string callback_name, GnomeVFS.AsyncModuleCallback callback, pointer callback_data, GLib.DestroyNotify destroy_notify);
-       public static void async_open (out GnomeVFS.AsyncHandle handle_return, string text_uri, GnomeVFS.OpenMode open_mode, int priority, GnomeVFS.AsyncOpenCallback callback, pointer callback_data);
-       public static void async_open_as_channel (out GnomeVFS.AsyncHandle handle_return, string text_uri, GnomeVFS.OpenMode open_mode, uint advised_block_size, int priority, GnomeVFS.AsyncOpenAsChannelCallback callback, pointer callback_data);
-       public static void async_open_uri (out GnomeVFS.AsyncHandle handle_return, GnomeVFS.URI uri, GnomeVFS.OpenMode open_mode, int priority, GnomeVFS.AsyncOpenCallback callback, pointer callback_data);
-       public static void async_open_uri_as_channel (out GnomeVFS.AsyncHandle handle_return, GnomeVFS.URI uri, GnomeVFS.OpenMode open_mode, uint advised_block_size, int priority, GnomeVFS.AsyncOpenAsChannelCallback callback, pointer callback_data);
+       public static void async_open (out weak GnomeVFS.AsyncHandle handle_return, string text_uri, GnomeVFS.OpenMode open_mode, int priority, GnomeVFS.AsyncOpenCallback callback, pointer callback_data);
+       public static void async_open_as_channel (out weak GnomeVFS.AsyncHandle handle_return, string text_uri, GnomeVFS.OpenMode open_mode, uint advised_block_size, int priority, GnomeVFS.AsyncOpenAsChannelCallback callback, pointer callback_data);
+       public static void async_open_uri (out weak GnomeVFS.AsyncHandle handle_return, GnomeVFS.URI uri, GnomeVFS.OpenMode open_mode, int priority, GnomeVFS.AsyncOpenCallback callback, pointer callback_data);
+       public static void async_open_uri_as_channel (out weak GnomeVFS.AsyncHandle handle_return, GnomeVFS.URI uri, GnomeVFS.OpenMode open_mode, uint advised_block_size, int priority, GnomeVFS.AsyncOpenAsChannelCallback callback, pointer callback_data);
        public static void async_read (GnomeVFS.AsyncHandle handle, pointer buffer, uint bytes, GnomeVFS.AsyncReadCallback callback, pointer callback_data);
        public static void async_seek (GnomeVFS.AsyncHandle handle, GnomeVFS.SeekPosition whence, GnomeVFS.FileOffset offset, GnomeVFS.AsyncSeekCallback callback, pointer callback_data);
-       public static void async_set_file_info (out GnomeVFS.AsyncHandle handle_return, GnomeVFS.URI uri, GnomeVFS.FileInfo info, GnomeVFS.SetFileInfoMask mask, GnomeVFS.FileInfoOptions options, int priority, GnomeVFS.AsyncSetFileInfoCallback callback, pointer callback_data);
+       public static void async_set_file_info (out weak GnomeVFS.AsyncHandle handle_return, GnomeVFS.URI uri, GnomeVFS.FileInfo info, GnomeVFS.SetFileInfoMask mask, GnomeVFS.FileInfoOptions options, int priority, GnomeVFS.AsyncSetFileInfoCallback callback, pointer callback_data);
        public static void async_set_job_limit (int limit);
        public static void async_write (GnomeVFS.AsyncHandle handle, pointer buffer, uint bytes, GnomeVFS.AsyncWriteCallback callback, pointer callback_data);
-       public static GnomeVFS.Result async_xfer (out GnomeVFS.AsyncHandle handle_return, GLib.List source_uri_list, GLib.List target_uri_list, GnomeVFS.XferOptions xfer_options, GnomeVFS.XferErrorMode error_mode, GnomeVFS.XferOverwriteMode overwrite_mode, int priority, GnomeVFS.AsyncXferProgressCallback progress_update_callback, pointer update_callback_data, GnomeVFS.XferProgressCallback progress_sync_callback, pointer sync_callback_data);
+       public static GnomeVFS.Result async_xfer (out weak GnomeVFS.AsyncHandle handle_return, GLib.List source_uri_list, GLib.List target_uri_list, GnomeVFS.XferOptions xfer_options, GnomeVFS.XferErrorMode error_mode, GnomeVFS.XferOverwriteMode overwrite_mode, int priority, GnomeVFS.AsyncXferProgressCallback progress_update_callback, pointer update_callback_data, GnomeVFS.XferProgressCallback progress_sync_callback, pointer sync_callback_data);
        public static GnomeVFS.Result check_same_fs (string source, string target, bool same_fs_return);
        public static GnomeVFS.Result check_same_fs_uris (GnomeVFS.URI source_uri, GnomeVFS.URI target_uri, bool same_fs_return);
        public static GnomeVFS.Result close (GnomeVFS.Handle handle);
        public static void connect_to_server (string uri, string display_name, string icon);
-       public static GnomeVFS.Result create (out GnomeVFS.Handle handle, string text_uri, GnomeVFS.OpenMode open_mode, bool exclusive, uint perm);
+       public static GnomeVFS.Result create (out weak GnomeVFS.Handle handle, string text_uri, GnomeVFS.OpenMode open_mode, bool exclusive, uint perm);
        public static GnomeVFS.Result create_symbolic_link (GnomeVFS.URI uri, string target_reference);
-       public static GnomeVFS.Result create_uri (out GnomeVFS.Handle handle, GnomeVFS.URI uri, GnomeVFS.OpenMode open_mode, bool exclusive, uint perm);
+       public static GnomeVFS.Result create_uri (out weak GnomeVFS.Handle handle, GnomeVFS.URI uri, GnomeVFS.OpenMode open_mode, bool exclusive, uint perm);
        public static GnomeVFS.Result directory_close (GnomeVFS.DirectoryHandle handle);
        public static GnomeVFS.Result directory_list_load (GLib.List list, string text_uri, GnomeVFS.FileInfoOptions options);
-       public static GnomeVFS.Result directory_open (out GnomeVFS.DirectoryHandle handle, string text_uri, GnomeVFS.FileInfoOptions options);
-       public static GnomeVFS.Result directory_open_from_uri (out GnomeVFS.DirectoryHandle handle, GnomeVFS.URI uri, GnomeVFS.FileInfoOptions options);
+       public static GnomeVFS.Result directory_open (out weak GnomeVFS.DirectoryHandle handle, string text_uri, GnomeVFS.FileInfoOptions options);
+       public static GnomeVFS.Result directory_open_from_uri (out weak GnomeVFS.DirectoryHandle handle, GnomeVFS.URI uri, GnomeVFS.FileInfoOptions options);
        public static GnomeVFS.Result directory_read_next (GnomeVFS.DirectoryHandle handle, GnomeVFS.FileInfo file_info);
        public static GnomeVFS.Result directory_visit (string text_uri, GnomeVFS.FileInfoOptions info_options, GnomeVFS.DirectoryVisitOptions visit_options, GnomeVFS.DirectoryVisitFunc callback, pointer data);
        public static GnomeVFS.Result directory_visit_files (string text_uri, GLib.List file_list, GnomeVFS.FileInfoOptions info_options, GnomeVFS.DirectoryVisitOptions visit_options, GnomeVFS.DirectoryVisitFunc callback, pointer data);
        public static GnomeVFS.Result directory_visit_files_at_uri (GnomeVFS.URI uri, GLib.List file_list, GnomeVFS.FileInfoOptions info_options, GnomeVFS.DirectoryVisitOptions visit_options, GnomeVFS.DirectoryVisitFunc callback, pointer data);
        public static GnomeVFS.Result directory_visit_uri (GnomeVFS.URI uri, GnomeVFS.FileInfoOptions info_options, GnomeVFS.DirectoryVisitOptions visit_options, GnomeVFS.DirectoryVisitFunc callback, pointer data);
-       public static GnomeVFS.Result dns_sd_browse (out GnomeVFS.DNSSDBrowseHandle handle, string domain, string type, GnomeVFS.DNSSDBrowseCallback callback, pointer callback_data, GLib.DestroyNotify callback_data_destroy_func);
-       public static GnomeVFS.Result dns_sd_browse_sync (string domain, string type, int timeout_msec, int n_services, out GnomeVFS.DNSSDService services);
+       public static GnomeVFS.Result dns_sd_browse (out weak GnomeVFS.DNSSDBrowseHandle handle, string domain, string type, GnomeVFS.DNSSDBrowseCallback callback, pointer callback_data, GLib.DestroyNotify callback_data_destroy_func);
+       public static GnomeVFS.Result dns_sd_browse_sync (string domain, string type, int timeout_msec, int n_services, out weak GnomeVFS.DNSSDService services);
        public static GnomeVFS.Result dns_sd_cancel_resolve (GnomeVFS.DNSSDResolveHandle handle);
        public static GnomeVFS.Result dns_sd_list_browse_domains_sync (string domain, int timeout_msec, GLib.List domains);
-       public static GnomeVFS.Result dns_sd_resolve (out GnomeVFS.DNSSDResolveHandle handle, string name, string type, string domain, int timeout, GnomeVFS.DNSSDResolveCallback callback, pointer callback_data, GLib.DestroyNotify callback_data_destroy_func);
-       public static GnomeVFS.Result dns_sd_resolve_sync (string name, string type, string domain, int timeout_msec, out string host, int port, GLib.HashTable text, int text_raw_len_out, out string text_raw_out);
+       public static GnomeVFS.Result dns_sd_resolve (out weak GnomeVFS.DNSSDResolveHandle handle, string name, string type, string domain, int timeout, GnomeVFS.DNSSDResolveCallback callback, pointer callback_data, GLib.DestroyNotify callback_data_destroy_func);
+       public static GnomeVFS.Result dns_sd_resolve_sync (string name, string type, string domain, int timeout_msec, out weak string host, int port, GLib.HashTable text, int text_raw_len_out, out weak string text_raw_out);
        public static GnomeVFS.Result dns_sd_stop_browse (GnomeVFS.DNSSDBrowseHandle handle);
        public static weak string escape_host_and_path_string (string path);
        public static weak string escape_path_string (string path);
@@ -982,7 +982,7 @@ namespace GnomeVFS {
        public static weak string escape_string (string string);
        public static weak string expand_initial_tilde (string path);
        public static GnomeVFS.Result file_control (GnomeVFS.Handle handle, string operation, pointer operation_data);
-       public static GnomeVFS.Result find_directory (GnomeVFS.URI near_uri, GnomeVFS.FindDirectoryKind kind, out GnomeVFS.URI result, bool create_if_needed, bool find_if_needed, uint permissions);
+       public static GnomeVFS.Result find_directory (GnomeVFS.URI near_uri, GnomeVFS.FindDirectoryKind kind, out weak GnomeVFS.URI result, bool create_if_needed, bool find_if_needed, uint permissions);
        public static GnomeVFS.Result forget_cache (GnomeVFS.Handle handle, GnomeVFS.FileOffset offset, GnomeVFS.FileSize size);
        public static weak string format_file_size_for_display (GnomeVFS.FileSize size);
        public static weak string format_uri_for_display (string uri);
@@ -1072,22 +1072,22 @@ namespace GnomeVFS {
        public static void module_callback_pop (string callback_name);
        public static void module_callback_push (string callback_name, GnomeVFS.ModuleCallback callback, pointer callback_data, GLib.DestroyNotify destroy_notify);
        public static void module_callback_set_default (string callback_name, GnomeVFS.ModuleCallback callback, pointer callback_data, GLib.DestroyNotify destroy_notify);
-       public static GnomeVFS.Result monitor_add (out GnomeVFS.MonitorHandle handle, string text_uri, GnomeVFS.MonitorType monitor_type, GnomeVFS.MonitorCallback callback, pointer user_data);
+       public static GnomeVFS.Result monitor_add (out weak GnomeVFS.MonitorHandle handle, string text_uri, GnomeVFS.MonitorType monitor_type, GnomeVFS.MonitorCallback callback, pointer user_data);
        public static GnomeVFS.Result monitor_cancel (GnomeVFS.MonitorHandle handle);
        public static GnomeVFS.Result move (string old_text_uri, string new_text_uri, bool force_replace);
        public static GnomeVFS.Result move_uri (GnomeVFS.URI old_uri, GnomeVFS.URI new_uri, bool force_replace);
-       public static GnomeVFS.Result open (out GnomeVFS.Handle handle, string text_uri, GnomeVFS.OpenMode open_mode);
-       public static GnomeVFS.Result open_fd (out GnomeVFS.Handle handle, int filedes);
-       public static GnomeVFS.Result open_uri (out GnomeVFS.Handle handle, GnomeVFS.URI uri, GnomeVFS.OpenMode open_mode);
+       public static GnomeVFS.Result open (out weak GnomeVFS.Handle handle, string text_uri, GnomeVFS.OpenMode open_mode);
+       public static GnomeVFS.Result open_fd (out weak GnomeVFS.Handle handle, int filedes);
+       public static GnomeVFS.Result open_uri (out weak GnomeVFS.Handle handle, GnomeVFS.URI uri, GnomeVFS.OpenMode open_mode);
        public static void postinit (pointer app, pointer modinfo);
        public static void preinit (pointer app, pointer modinfo);
        public static GnomeVFS.Result read (GnomeVFS.Handle handle, pointer buffer, GnomeVFS.FileSize bytes, GnomeVFS.FileSize bytes_read);
-       public static GnomeVFS.Result read_entire_file (string uri, int file_size, out string file_contents);
+       public static GnomeVFS.Result read_entire_file (string uri, int file_size, out weak string file_contents);
        public static GnomeVFS.Result remove_directory (string text_uri);
        public static GnomeVFS.Result remove_directory_from_uri (GnomeVFS.URI uri);
-       public static GnomeVFS.Result resolve (string hostname, out GnomeVFS.ResolveHandle handle);
+       public static GnomeVFS.Result resolve (string hostname, out weak GnomeVFS.ResolveHandle handle);
        public static void resolve_free (GnomeVFS.ResolveHandle handle);
-       public static bool resolve_next_address (GnomeVFS.ResolveHandle handle, out GnomeVFS.Address address);
+       public static bool resolve_next_address (GnomeVFS.ResolveHandle handle, out weak GnomeVFS.Address address);
        public static void resolve_reset_to_beginning (GnomeVFS.ResolveHandle handle);
        public static GnomeVFS.Result result_from_errno ();
        public static GnomeVFS.Result result_from_errno_code (int errno_code);
@@ -1108,7 +1108,7 @@ namespace GnomeVFS {
        public static GnomeVFS.Result unlink_from_uri (GnomeVFS.URI uri);
        public static bool uris_match (string uri_1, string uri_2);
        public static GnomeVFS.Result url_show (string url);
-       public static GnomeVFS.Result url_show_with_env (string url, out string envp);
+       public static GnomeVFS.Result url_show_with_env (string url, out weak string envp);
        public static GnomeVFS.Result write (GnomeVFS.Handle handle, pointer buffer, GnomeVFS.FileSize bytes, GnomeVFS.FileSize bytes_written);
        public static GnomeVFS.Result xfer_delete_list (GLib.List source_uri_list, GnomeVFS.XferErrorMode error_mode, GnomeVFS.XferOptions xfer_options, GnomeVFS.XferProgressCallback progress_callback, pointer data);
        public static GnomeVFS.Result xfer_uri (GnomeVFS.URI source_uri, GnomeVFS.URI target_uri, GnomeVFS.XferOptions xfer_options, GnomeVFS.XferErrorMode error_mode, GnomeVFS.XferOverwriteMode overwrite_mode, GnomeVFS.XferProgressCallback progress_callback, pointer data);
index 65b3761..603a175 100644 (file)
@@ -647,7 +647,7 @@ namespace Gst {
                public void parse_new_segment_full (bool update, double rate, double applied_rate, Gst.Format format, int64 start, int64 stop, int64 position);
                public void parse_qos (double proportion, int64 diff, uint64 timestamp);
                public void parse_seek (double rate, Gst.Format format, Gst.SeekFlags flags, Gst.SeekType start_type, int64 start, Gst.SeekType stop_type, int64 stop);
-               public void parse_tag (out Gst.TagList taglist);
+               public void parse_tag (out weak Gst.TagList taglist);
                public static Gst.EventTypeFlags type_get_flags (Gst.EventType type);
                public static weak string type_get_name (Gst.EventType type);
                public static GLib.Quark type_to_quark (Gst.EventType type);
@@ -729,16 +729,16 @@ namespace Gst {
                public Message.warning (Gst.Object src, string debug) throws GLib.Error;
                public void parse_async_start (bool new_base_time);
                public void parse_buffering (int percent);
-               public void parse_clock_lost (out Gst.Clock clock);
-               public void parse_clock_provide (out Gst.Clock clock, bool ready);
+               public void parse_clock_lost (out weak Gst.Clock clock);
+               public void parse_clock_provide (out weak Gst.Clock clock, bool ready);
                public void parse_duration (Gst.Format format, int64 duration);
                public void parse_error (string debug) throws GLib.Error;
                public void parse_info (string debug) throws GLib.Error;
-               public void parse_new_clock (out Gst.Clock clock);
+               public void parse_new_clock (out weak Gst.Clock clock);
                public void parse_segment_done (Gst.Format format, int64 position);
                public void parse_segment_start (Gst.Format format, int64 position);
                public void parse_state_changed (Gst.State oldstate, Gst.State newstate, Gst.State pending);
-               public void parse_tag (out Gst.TagList tag_list);
+               public void parse_tag (out weak Gst.TagList tag_list);
                public void parse_warning (string debug) throws GLib.Error;
                public static weak string type_get_name (Gst.MessageType type);
                public static GLib.Quark type_to_quark (Gst.MessageType type);
@@ -871,8 +871,8 @@ namespace Gst {
                public bool get_boolean_index (string tag, uint index, bool value);
                public bool get_char (string tag, string value);
                public bool get_char_index (string tag, uint index, string value);
-               public bool get_date (string tag, out GLib.Date value);
-               public bool get_date_index (string tag, uint index, out GLib.Date value);
+               public bool get_date (string tag, out weak GLib.Date value);
+               public bool get_date_index (string tag, uint index, out weak GLib.Date value);
                public bool get_double (string tag, double value);
                public bool get_double_index (string tag, uint index, double value);
                public bool get_float (string tag, float value);
@@ -929,12 +929,19 @@ namespace Gst {
        public class TypeFind {
                public pointer data;
                public weak pointer[] _gst_reserved;
+               [CCode (cname = "gst_type_find_get_length")]
                public uint64 get_length ();
+               [CCode (cname = "gst_type_find_helper")]
                public static weak Gst.Caps helper (Gst.Pad src, uint64 size);
+               [CCode (cname = "gst_type_find_helper_for_buffer")]
                public static weak Gst.Caps helper_for_buffer (Gst.Object obj, Gst.Buffer buf, Gst.TypeFindProbability prob);
+               [CCode (cname = "gst_type_find_helper_get_range")]
                public static weak Gst.Caps helper_get_range (Gst.Object obj, Gst.TypeFindHelperGetRangeFunction func, uint64 size, Gst.TypeFindProbability prob);
+               [CCode (cname = "gst_type_find_peek")]
                public uchar peek (int64 offset, uint size);
+               [CCode (cname = "gst_type_find_register")]
                public static bool register (Gst.Plugin plugin, string name, uint rank, Gst.TypeFindFunction func, string extensions, Gst.Caps possible_caps, pointer data, GLib.DestroyNotify data_notify);
+               [CCode (cname = "gst_type_find_suggest")]
                public void suggest (uint probability, Gst.Caps caps);
        }
        [CCode (cheader_filename = "gst/gst.h")]
@@ -1049,7 +1056,7 @@ namespace Gst {
                public static weak Gst.Structure from_string (string string, string end);
                public bool get_boolean (string fieldname, bool value);
                public bool get_clock_time (string fieldname, uint64 value);
-               public bool get_date (string fieldname, out GLib.Date value);
+               public bool get_date (string fieldname, out weak GLib.Date value);
                public bool get_double (string fieldname, double value);
                public bool get_enum (string fieldname, GLib.Type enumtype, int value);
                public GLib.Type get_field_type (string fieldname);
@@ -1362,7 +1369,7 @@ namespace Gst {
                public bool is_full ();
                public void limits_changed ();
                public DataQueue (Gst.DataQueueCheckFullFunction checkfull, pointer checkdata);
-               public bool pop (out Gst.DataQueueItem item);
+               public bool pop (out weak Gst.DataQueueItem item);
                public bool push (Gst.DataQueueItem item);
                public void set_flushing (bool flushing);
                [NoAccessorMethod]
@@ -1602,8 +1609,8 @@ namespace Gst {
                public ulong add_buffer_probe (GLib.Callback handler, pointer data);
                public ulong add_data_probe (GLib.Callback handler, pointer data);
                public ulong add_event_probe (GLib.Callback handler, pointer data);
-               public Gst.FlowReturn alloc_buffer (uint64 offset, int size, Gst.Caps caps, out Gst.Buffer buf);
-               public Gst.FlowReturn alloc_buffer_and_set_caps (uint64 offset, int size, Gst.Caps caps, out Gst.Buffer buf);
+               public Gst.FlowReturn alloc_buffer (uint64 offset, int size, Gst.Caps caps, out weak Gst.Buffer buf);
+               public Gst.FlowReturn alloc_buffer_and_set_caps (uint64 offset, int size, Gst.Caps caps, out weak Gst.Buffer buf);
                public bool can_link (Gst.Pad sinkpad);
                public Gst.FlowReturn chain (Gst.Buffer buffer);
                public bool check_pull_range ();
@@ -1624,7 +1631,7 @@ namespace Gst {
                public weak Gst.Pad get_peer ();
                public Gst.QueryType get_query_types ();
                public Gst.QueryType get_query_types_default ();
-               public Gst.FlowReturn get_range (uint64 offset, uint size, out Gst.Buffer buffer);
+               public Gst.FlowReturn get_range (uint64 offset, uint size, out weak Gst.Buffer buffer);
                public bool is_active ();
                public bool is_blocked ();
                public bool is_blocking ();
@@ -1640,7 +1647,7 @@ namespace Gst {
                public bool peer_query (Gst.Query query);
                public weak Gst.Caps proxy_getcaps ();
                public bool proxy_setcaps (Gst.Caps caps);
-               public Gst.FlowReturn pull_range (uint64 offset, uint size, out Gst.Buffer buffer);
+               public Gst.FlowReturn pull_range (uint64 offset, uint size, out weak Gst.Buffer buffer);
                public Gst.FlowReturn push (Gst.Buffer buffer);
                public bool push_event (Gst.Event event);
                public bool query (Gst.Query query);
@@ -1828,9 +1835,13 @@ namespace Gst {
                public weak Gst.Caps caps;
                public pointer user_data;
                public GLib.DestroyNotify user_data_notify;
+               [CCode (cname = "gst_type_find_factory_call_function")]
                public void call_function (Gst.TypeFind find);
+               [CCode (cname = "gst_type_find_factory_get_caps")]
                public weak Gst.Caps get_caps ();
+               [CCode (cname = "gst_type_find_factory_get_extensions")]
                public weak string get_extensions ();
+               [CCode (cname = "gst_type_find_factory_get_list")]
                public static weak GLib.List get_list ();
        }
        [CCode (cheader_filename = "gst/gst.h")]
@@ -1860,7 +1871,7 @@ namespace Gst {
                public abstract uint get_children_count ();
                public static void get_property (Gst.Object object, string name, GLib.Value value);
                public static void get_valist (Gst.Object object, string first_property_name, pointer var_args);
-               public static bool lookup (Gst.Object object, string name, out Gst.Object target, out GLib.ParamSpec pspec);
+               public static bool lookup (Gst.Object object, string name, out weak Gst.Object target, out weak GLib.ParamSpec pspec);
                public static void set (Gst.Object object, ...);
                public static void set_property (Gst.Object object, string name, GLib.Value value);
                public static void set_valist (Gst.Object object, string first_property_name, pointer var_args);
@@ -1906,14 +1917,14 @@ namespace Gst {
        public static delegate bool PadActivateFunction (Gst.Pad pad);
        public static delegate bool PadActivateModeFunction (Gst.Pad pad, bool active);
        public static delegate void PadBlockCallback (Gst.Pad pad, bool blocked, pointer user_data);
-       public static delegate Gst.FlowReturn PadBufferAllocFunction (Gst.Pad pad, uint64 offset, uint size, Gst.Caps caps, out Gst.Buffer buf);
+       public static delegate Gst.FlowReturn PadBufferAllocFunction (Gst.Pad pad, uint64 offset, uint size, Gst.Caps caps, out weak Gst.Buffer buf);
        public static delegate Gst.FlowReturn PadChainFunction (Gst.Pad pad, Gst.Buffer buffer);
        public static delegate bool PadCheckGetRangeFunction (Gst.Pad pad);
        public static delegate bool PadDispatcherFunction (Gst.Pad pad, pointer data);
        public static delegate bool PadEventFunction (Gst.Pad pad, Gst.Event event);
        public static delegate void PadFixateCapsFunction (Gst.Pad pad, Gst.Caps caps);
        public static delegate weak Gst.Caps PadGetCapsFunction (Gst.Pad pad);
-       public static delegate Gst.FlowReturn PadGetRangeFunction (Gst.Pad pad, uint64 offset, uint length, out Gst.Buffer buffer);
+       public static delegate Gst.FlowReturn PadGetRangeFunction (Gst.Pad pad, uint64 offset, uint length, out weak Gst.Buffer buffer);
        public static delegate weak GLib.List PadIntLinkFunction (Gst.Pad pad);
        public static delegate Gst.PadLinkReturn PadLinkFunction (Gst.Pad pad, Gst.Pad peer);
        public static delegate bool PadQueryFunction (Gst.Pad pad, Gst.Query query);
@@ -1929,7 +1940,7 @@ namespace Gst {
        public static delegate void TagMergeFunc (GLib.Value dest, GLib.Value src);
        public static delegate void TaskFunction (pointer data);
        public static delegate void TypeFindFunction (Gst.TypeFind find, pointer data);
-       public static delegate Gst.FlowReturn TypeFindHelperGetRangeFunction (Gst.Object obj, uint64 offset, uint length, out Gst.Buffer buffer);
+       public static delegate Gst.FlowReturn TypeFindHelperGetRangeFunction (Gst.Object obj, uint64 offset, uint length, out weak Gst.Buffer buffer);
        public static delegate int ValueCompareFunc (GLib.Value value1, GLib.Value value2);
        public static delegate bool ValueDeserializeFunc (GLib.Value dest, string s);
        public static delegate bool ValueIntersectFunc (GLib.Value dest, GLib.Value value1, GLib.Value value2);
index 1e9f585..f097fc3 100644 (file)
@@ -60,6 +60,7 @@ namespace Gnome {
                public Gnome.ModuleHook instance_init;
                public Gnome.ModuleHook pre_args_parse;
                public Gnome.ModuleHook post_args_parse;
+               public pointer _options;
                public Gnome.ModuleInitHook init_pass;
                public Gnome.ModuleClassInitHook class_init;
                public weak string opt_prefix;
@@ -82,8 +83,6 @@ namespace Gnome {
                public static weak Gnome.ModuleInfo module_load (string mod_name);
                public static void module_register (Gnome.ModuleInfo module_info);
                public static bool module_registered (Gnome.ModuleInfo module_info);
-               public void parse_args ();
-               public void postinit ();
                [NoAccessorMethod]
                public weak string app_datadir { get; set; }
                public weak string app_id { get; }
@@ -150,37 +149,6 @@ namespace Gnome {
        public static weak Gnome.ModuleInfo bonobo_module_info_get ();
        public static void clearenv ();
        [NoArrayLength]
-       public static weak string config_assemble_vector (int argc, string[] argv);
-       public static void config_clean_file_ (string path, bool priv);
-       public static void config_clean_key_ (string path, bool priv);
-       public static void config_clean_section_ (string path, bool priv);
-       public static void config_drop_all ();
-       public static void config_drop_file_ (string path, bool priv);
-       public static bool config_get_bool_with_default_ (string path, bool def, bool priv);
-       public static double config_get_float_with_default_ (string path, bool def, bool priv);
-       public static int config_get_int_with_default_ (string path, bool def, bool priv);
-       public static weak string config_get_string_with_default_ (string path, bool def, bool priv);
-       public static weak string config_get_translated_string_with_default_ (string path, bool def, bool priv);
-       public static void config_get_vector_with_default_ (string path, int argcp, out string argvp, bool def, bool priv);
-       public static bool config_has_section_ (string path, bool priv);
-       public static pointer config_init_iterator_ (string path, bool priv);
-       public static pointer config_init_iterator_sections_ (string path, bool priv);
-       public static pointer config_iterator_next (pointer iterator_handle, out string key, out string value);
-       public static void config_make_vector (string string, int argcp, out string argvp);
-       public static void config_pop_prefix ();
-       public static void config_push_prefix (string path);
-       public static void config_set_bool_ (string path, bool value, bool priv);
-       public static void config_set_float_ (string path, double value, bool priv);
-       public static void config_set_int_ (string path, int value, bool priv);
-       public static void config_set_set_handler (GLib.Callback func, pointer data);
-       public static void config_set_string_ (string path, string value, bool priv);
-       public static void config_set_sync_handler (GLib.Callback func, pointer data);
-       public static void config_set_translated_string_ (string path, string value, bool priv);
-       [NoArrayLength]
-       public static void config_set_vector_ (string path, int argc, string[] argv, bool priv);
-       public static bool config_sync ();
-       public static bool config_sync_file_ (string path, bool priv);
-       [NoArrayLength]
        public static int execute_async (string dir, int argc, string[] argv);
        [NoArrayLength]
        public static int execute_async_fds (string dir, int argc, string[] argv, bool close_fds);
@@ -198,21 +166,15 @@ namespace Gnome {
        public static weak string gconf_get_gnome_libs_settings_relative (string subkey);
        public static bool help_display (string file_name, string link_id) throws GLib.Error;
        public static bool help_display_desktop (Gnome.Program program, string doc_id, string file_name, string link_id) throws GLib.Error;
-       public static bool help_display_desktop_with_env (Gnome.Program program, string doc_id, string file_name, string link_id, out string envp) throws GLib.Error;
+       public static bool help_display_desktop_with_env (Gnome.Program program, string doc_id, string file_name, string link_id, out weak string envp) throws GLib.Error;
        public static bool help_display_uri (string help_uri) throws GLib.Error;
-       public static bool help_display_uri_with_env (string help_uri, out string envp) throws GLib.Error;
+       public static bool help_display_uri_with_env (string help_uri, out weak string envp) throws GLib.Error;
        public static bool help_display_with_doc_id (Gnome.Program program, string doc_id, string file_name, string link_id) throws GLib.Error;
-       public static bool help_display_with_doc_id_and_env (Gnome.Program program, string doc_id, string file_name, string link_id, out string envp) throws GLib.Error;
+       public static bool help_display_with_doc_id_and_env (Gnome.Program program, string doc_id, string file_name, string link_id, out weak string envp) throws GLib.Error;
        public static GLib.Quark help_error_quark ();
-       public static weak GLib.List i18n_get_language_list (string category_name);
-       public static void i18n_pop_c_numeric_locale ();
-       public static void i18n_push_c_numeric_locale ();
        [CCode (cname = "libgnome_module_info_get")]
        public static weak Gnome.ModuleInfo libgnome_module_info_get ();
-       public static void prepend_terminal_to_vector (int argc, out string argv);
-       public static int score_get_notable (string gamename, string level, string names, float scores, ulong scoretimes);
-       public static int score_init (string gamename);
-       public static int score_log (float score, string level, bool higher_to_lower_score_order);
+       public static void prepend_terminal_to_vector (int argc, out weak string argv);
        public static int setenv (string name, string value, bool overwrite);
        public static int sound_connection_get ();
        public static void sound_init (string hostname);
@@ -228,7 +190,7 @@ namespace Gnome {
        public static void unsetenv (string name);
        public static GLib.Quark url_error_quark ();
        public static bool url_show (string url) throws GLib.Error;
-       public static bool url_show_with_env (string url, out string envp) throws GLib.Error;
+       public static bool url_show_with_env (string url, out weak string envp) throws GLib.Error;
        public static weak string user_accels_dir_get ();
        public static weak string user_dir_get ();
        public static weak string user_private_dir_get ();
index 2357809..b0c34f2 100644 (file)
@@ -75,12 +75,6 @@ namespace Gnome {
                LOCAL,
                BOTH,
        }
-       [CCode (cprefix = "GNOME_THEME_FILE_PARSE_ERROR_INVALID_", cheader_filename = "libgnomeui/libgnomeui.h")]
-       public enum ThemeFileParseError {
-               SYNTAX,
-               ESCAPES,
-               CHARS,
-       }
        [CCode (cprefix = "GNOME_THUMBNAIL_SIZE_", cheader_filename = "libgnomeui/libgnomeui.h")]
        public enum ThumbnailSize {
                NORMAL,
@@ -174,65 +168,12 @@ namespace Gnome {
        public class AppBarMsg {
        }
        [CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
-       public class AppProgressKey {
-       }
-       [CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
        public class GdkPixbufAsyncHandle {
        }
        [CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
-       public class IconData {
-               public bool has_embedded_rect;
-               public int x0;
-               public int y0;
-               public int x1;
-               public int y1;
-               public weak Gnome.IconDataPoint attach_points;
-               public int n_attach_points;
-               public weak string display_name;
-               public weak Gnome.IconData dup ();
-       }
-       [CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
-       public class IconDataPoint {
-               public int x;
-               public int y;
-       }
-       [CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
-       public class IconTheme : GLib.Object {
-               public void append_search_path (string path);
-               public bool get_allow_svg ();
-               public weak string get_example_icon_name ();
-               public void get_search_path (string path, int n_elements);
-               public bool has_icon (string icon_name);
-               public weak GLib.List list_icons (string context);
-               public weak string lookup_icon (string icon_name, int size, out Gnome.IconData icon_data, int base_size);
-               public IconTheme ();
-               public void prepend_search_path (string path);
-               public bool rescan_if_needed ();
-               public void set_allow_svg (bool allow_svg);
-               public void set_custom_theme (string theme_name);
-               [NoArrayLength]
-               public void set_search_path (string[] path, int n_elements);
-               public signal void changed ();
-       }
-       [CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
-       public class MessageBoxButton {
-       }
-       [CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
        public class PasswordDialogDetails {
        }
        [CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
-       public class ThemeFile {
-               public void foreach_key (string section, bool include_localized, Gnome.ThemeFileLineFunc func, pointer user_data);
-               public void foreach_section (Gnome.ThemeFileSectionFunc func, pointer user_data);
-               public bool get_integer (string section, string keyname, int val);
-               public bool get_locale_string (string section, string keyname, out string val);
-               public bool get_raw (string section, string keyname, string locale, out string val);
-               public bool get_string (string section, string keyname, out string val);
-               public ThemeFile.from_string (string data) throws GLib.Error;
-               public static GLib.Quark parse_error_quark ();
-               public weak string to_string ();
-       }
-       [CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
        public class UIBuilderData {
                public Gnome.UISignalConnectFunc connect_func;
                public pointer data;
@@ -255,27 +196,6 @@ namespace Gnome {
                public weak Gtk.Widget widget;
        }
        [CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
-       public class About : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
-               public void @construct (string name, string version, string copyright, string comments, string authors, string documenters, string translator_credits, Gdk.Pixbuf logo_pixbuf);
-               public About (string name, string version, string copyright, string comments, string authors, string documenters, string translator_credits, Gdk.Pixbuf logo_pixbuf);
-               [NoAccessorMethod]
-               public weak GLib.ValueArray authors { set; }
-               [NoAccessorMethod]
-               public weak string comments { get; set; }
-               [NoAccessorMethod]
-               public weak string copyright { get; set; }
-               [NoAccessorMethod]
-               public weak GLib.ValueArray documenters { set; }
-               [NoAccessorMethod]
-               public weak Gdk.Pixbuf logo { set; }
-               [NoAccessorMethod]
-               public weak string name { get; set; }
-               [NoAccessorMethod]
-               public weak string translator_credits { get; set; }
-               [NoAccessorMethod]
-               public weak string version { get; set; }
-       }
-       [CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
        public class App : Gtk.Window, Atk.Implementor, Gtk.Buildable {
                public weak string name;
                public weak string prefix;
@@ -295,7 +215,6 @@ namespace Gnome {
                public void create_toolbar_interp (Gnome.UIInfo uiinfo, Gtk.CallbackMarshal relay_func, pointer data, Gtk.DestroyNotify destroy_func);
                public void create_toolbar_with_data (Gnome.UIInfo uiinfo, pointer user_data);
                public void enable_layout_config (bool enable);
-               public weak Gtk.Widget error (string error);
                public static void fill_menu (Gtk.MenuShell menu_shell, Gnome.UIInfo uiinfo, Gtk.AccelGroup accel_group, bool uline_accels, int pos);
                public static void fill_menu_custom (Gtk.MenuShell menu_shell, Gnome.UIInfo uiinfo, Gnome.UIBuilderData uibdata, Gtk.AccelGroup accel_group, bool uline_accels, int pos);
                public static void fill_menu_with_data (Gtk.MenuShell menu_shell, Gnome.UIInfo uiinfo, Gtk.AccelGroup accel_group, bool uline_accels, int pos, pointer user_data);
@@ -303,7 +222,6 @@ namespace Gnome {
                public static void fill_toolbar_custom (Gtk.Toolbar toolbar, Gnome.UIInfo uiinfo, Gnome.UIBuilderData uibdata, Gtk.AccelGroup accel_group);
                public static void fill_toolbar_with_data (Gtk.Toolbar toolbar, Gnome.UIInfo uiinfo, Gtk.AccelGroup accel_group, pointer user_data);
                public static weak Gtk.Widget find_menu_pos (Gtk.Widget parent, string path, int pos);
-               public void flash (string flash);
                public static weak string helper_gettext (string string);
                public void insert_menus (string path, Gnome.UIInfo menuinfo);
                public void insert_menus_custom (string path, Gnome.UIInfo uiinfo, Gnome.UIBuilderData uibdata);
@@ -312,27 +230,15 @@ namespace Gnome {
                public static void install_appbar_menu_hints (Gnome.AppBar appbar, Gnome.UIInfo uiinfo);
                public void install_menu_hints (Gnome.UIInfo uiinfo);
                public static void install_statusbar_menu_hints (Gtk.Statusbar bar, Gnome.UIInfo uiinfo);
-               public weak Gtk.Widget message (string message);
                public App (string appname, string title);
-               public weak Gtk.Widget ok_cancel (string message, Gnome.ReplyCallback callback, pointer data);
-               public weak Gtk.Widget ok_cancel_modal (string message, Gnome.ReplyCallback callback, pointer data);
-               public static void progress_done (Gnome.AppProgressKey key);
-               public weak Gnome.AppProgressKey progress_manual (string description, Gnome.AppProgressCancelFunc cancel_cb, pointer data);
-               public weak Gnome.AppProgressKey progress_timeout (string description, uint interval, Gnome.AppProgressFunc percentage_cb, Gnome.AppProgressCancelFunc cancel_cb, pointer data);
-               public weak Gtk.Widget question (string question, Gnome.ReplyCallback callback, pointer data);
-               public weak Gtk.Widget question_modal (string question, Gnome.ReplyCallback callback, pointer data);
                public void remove_menu_range (string path, int start, int items);
                public void remove_menus (string path, int items);
-               public weak Gtk.Widget request_password (string prompt, Gnome.StringCallback callback, pointer data);
-               public weak Gtk.Widget request_string (string prompt, Gnome.StringCallback callback, pointer data);
                public void set_contents (Gtk.Widget contents);
                public void set_menus (Gtk.MenuBar menubar);
-               public static void set_progress (Gnome.AppProgressKey key, double percent);
                public void set_statusbar (Gtk.Widget statusbar);
                public void set_statusbar_custom (Gtk.Widget container, Gtk.Widget statusbar);
                public void set_toolbar (Gtk.Toolbar toolbar);
                public static void ui_configure_configurable (Gnome.UIInfo uiinfo);
-               public weak Gtk.Widget warning (string warning);
                [NoAccessorMethod]
                public weak string app_id { get; set construct; }
        }
@@ -403,7 +309,6 @@ namespace Gnome {
                public uint save_yourself_emitted;
                public pointer reserved;
                public void add_static_arg ();
-               public static void disable_master_connection ();
                public void flush ();
                public weak string get_config_prefix ();
                public weak string get_desktop_id ();
@@ -449,37 +354,8 @@ namespace Gnome {
                public signal void shutdown_cancelled ();
        }
        [CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
-       public class ColorPicker : Gtk.Button, Atk.Implementor, Gtk.Buildable {
-               public void get_d (double r, double g, double b, double a);
-               public bool get_dither ();
-               public void get_i16 (ushort r, ushort g, ushort b, ushort a);
-               public void get_i8 (uchar r, uchar g, uchar b, uchar a);
-               public weak string get_title ();
-               public bool get_use_alpha ();
-               public ColorPicker ();
-               public void set_d (double r, double g, double b, double a);
-               public void set_dither (bool dither);
-               public void set_i16 (ushort r, ushort g, ushort b, ushort a);
-               public void set_i8 (uchar r, uchar g, uchar b, uchar a);
-               public void set_title (string title);
-               public void set_use_alpha (bool use_alpha);
-               [NoAccessorMethod]
-               public weak uint alpha { get; set; }
-               [NoAccessorMethod]
-               public weak uint blue { get; set; }
-               public weak bool dither { get; set; }
-               [NoAccessorMethod]
-               public weak uint green { get; set; }
-               [NoAccessorMethod]
-               public weak uint red { get; set; }
-               public weak string title { get; set; }
-               public weak bool use_alpha { get; set; }
-               public signal void color_set (uint r, uint g, uint b, uint a);
-       }
-       [CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
        public class DateEdit : Gtk.HBox, Atk.Implementor, Gtk.Buildable {
                public void @construct (ulong the_time, Gnome.DateEditFlags flags);
-               public ulong get_date ();
                public int get_flags ();
                public ulong get_initial_time ();
                public ulong get_time ();
@@ -501,235 +377,6 @@ namespace Gnome {
                public signal void time_changed ();
        }
        [CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
-       public class Dialog : Gtk.Window, Atk.Implementor, Gtk.Buildable {
-               public weak Gtk.Widget vbox;
-               public weak GLib.List buttons;
-               public weak Gtk.Widget action_area;
-               public weak Gtk.AccelGroup accelerators;
-               public uint click_closes;
-               public uint just_hide;
-               public void append_button (string button_name);
-               public void append_button_with_pixmap (string button_name, string pixmap_name);
-               public void append_buttons (string first);
-               public void append_buttons_with_pixmaps (string names, string pixmaps);
-               public void append_buttonsv (string buttons);
-               public void button_connect (int button, GLib.Callback callback, pointer data);
-               public void button_connect_object (int button, GLib.Callback callback, Gtk.Object obj);
-               public void close_hides (bool just_hide);
-               public void @construct (string title, pointer ap);
-               public void constructv (string title, string buttons);
-               public void editable_enters (Gtk.Editable editable);
-               public void grab_focus (int button);
-               public Dialog (string title);
-               [CCode (cname = "gnome_dialog_newv")]
-               public Dialog.newv (string title, string buttons);
-               public int run ();
-               public int run_and_close ();
-               public void set_accelerator (int button, uchar accelerator_key, uchar accelerator_mods);
-               public void set_close (bool click_closes);
-               public void set_default (int button);
-               public void set_parent (Gtk.Window parent);
-               public void set_sensitive (int button, bool setting);
-               public signal void clicked (int button_number);
-               [HasEmitter]
-               public signal bool close ();
-       }
-       [CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
-       public class Druid : Gtk.Container, Atk.Implementor, Gtk.Buildable {
-               public weak Gtk.Widget help;
-               public weak Gtk.Widget back;
-               public weak Gtk.Widget next;
-               public weak Gtk.Widget cancel;
-               public weak Gtk.Widget finish;
-               public void append_page (Gnome.DruidPage page);
-               public void construct_with_window (string title, Gtk.Window parent, bool close_on_cancel, out Gtk.Widget window);
-               public void insert_page (Gnome.DruidPage back_page, Gnome.DruidPage page);
-               public Druid ();
-               public Druid.with_window (string title, Gtk.Window parent, bool close_on_cancel, out Gtk.Widget window);
-               public void prepend_page (Gnome.DruidPage page);
-               public void set_buttons_sensitive (bool back_sensitive, bool next_sensitive, bool cancel_sensitive, bool help_sensitive);
-               public void set_page (Gnome.DruidPage page);
-               public void set_show_finish (bool show_finish);
-               public void set_show_help (bool show_help);
-               [NoAccessorMethod]
-               public weak bool show_finish { get; set; }
-               [NoAccessorMethod]
-               public weak bool show_help { get; set; }
-       }
-       [CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
-       public class DruidPage : Gtk.Bin, Atk.Implementor, Gtk.Buildable {
-               public DruidPage ();
-               [HasEmitter]
-               public signal bool back (Gtk.Widget druid);
-               [HasEmitter]
-               public signal bool cancel (Gtk.Widget druid);
-               [HasEmitter]
-               public signal void finish (Gtk.Widget druid);
-               [HasEmitter]
-               public signal bool next (Gtk.Widget druid);
-               [HasEmitter]
-               public signal void prepare (Gtk.Widget druid);
-       }
-       [CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
-       public class DruidPageEdge : Gnome.DruidPage, Atk.Implementor, Gtk.Buildable {
-               public weak string title;
-               public weak string text;
-               public weak Gdk.Pixbuf logo_image;
-               public weak Gdk.Pixbuf watermark_image;
-               public weak Gdk.Pixbuf top_watermark_image;
-               public Gdk.Color background_color;
-               public Gdk.Color textbox_color;
-               public Gdk.Color logo_background_color;
-               public Gdk.Color title_color;
-               public Gdk.Color text_color;
-               public uint position;
-               public void @construct (Gnome.EdgePosition position, bool antialiased, string title, string text, Gdk.Pixbuf logo, Gdk.Pixbuf watermark, Gdk.Pixbuf top_watermark);
-               public DruidPageEdge (Gnome.EdgePosition position);
-               public DruidPageEdge.aa (Gnome.EdgePosition position);
-               public DruidPageEdge.with_vals (Gnome.EdgePosition position, bool antialiased, string title, string text, Gdk.Pixbuf logo, Gdk.Pixbuf watermark, Gdk.Pixbuf top_watermark);
-               public void set_bg_color (out Gdk.Color color);
-               public void set_logo (Gdk.Pixbuf logo_image);
-               public void set_logo_bg_color (out Gdk.Color color);
-               public void set_text (string text);
-               public void set_text_color (out Gdk.Color color);
-               public void set_textbox_color (out Gdk.Color color);
-               public void set_title (string title);
-               public void set_title_color (out Gdk.Color color);
-               public void set_top_watermark (Gdk.Pixbuf top_watermark_image);
-               public void set_watermark (Gdk.Pixbuf watermark);
-       }
-       [CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
-       public class DruidPageStandard : Gnome.DruidPage, Atk.Implementor, Gtk.Buildable {
-               public weak Gtk.Widget vbox;
-               public void append_item (string question, Gtk.Widget item, string additional_info);
-               public DruidPageStandard ();
-               public DruidPageStandard.with_vals (string title, Gdk.Pixbuf logo, Gdk.Pixbuf top_watermark);
-               public void set_background (out Gdk.Color color);
-               public void set_contents_background (out Gdk.Color color);
-               public void set_logo (Gdk.Pixbuf logo_image);
-               public void set_logo_background (out Gdk.Color color);
-               public void set_title (string title);
-               public void set_title_foreground (out Gdk.Color color);
-               public void set_top_watermark (Gdk.Pixbuf top_watermark_image);
-               public weak string background { set; }
-               [NoAccessorMethod]
-               public weak Gdk.Color background_gdk { get; set; }
-               [NoAccessorMethod]
-               public weak bool background_set { get; set; }
-               public weak string contents_background { set; }
-               [NoAccessorMethod]
-               public weak Gdk.Color contents_background_gdk { get; set; }
-               [NoAccessorMethod]
-               public weak bool contents_background_set { get; set; }
-               [NoAccessorMethod]
-               public weak Gdk.Pixbuf logo { get; set; }
-               public weak string logo_background { set; }
-               [NoAccessorMethod]
-               public weak Gdk.Color logo_background_gdk { get; set; }
-               [NoAccessorMethod]
-               public weak bool logo_background_set { get; set; }
-               [NoAccessorMethod]
-               public weak string title { get; set; }
-               public weak string title_foreground { set; }
-               [NoAccessorMethod]
-               public weak Gdk.Color title_foreground_gdk { get; set; }
-               [NoAccessorMethod]
-               public weak bool title_foreground_set { get; set; }
-               [NoAccessorMethod]
-               public weak Gdk.Pixbuf top_watermark { get; set; }
-       }
-       [CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
-       public class Entry : Gtk.Combo, Atk.Implementor, Gtk.Buildable, Gtk.Editable {
-               public void append_history (bool save, string text);
-               public void clear_history ();
-               public weak string get_history_id ();
-               public uint get_max_saved ();
-               public Entry (string history_id);
-               public void prepend_history (bool save, string text);
-               public void set_history_id (string history_id);
-               public void set_max_saved (uint max_saved);
-               [NoAccessorMethod]
-               public weak Gtk.Entry gtk_entry { get; }
-               public weak string history_id { get; set; }
-               public signal void activate ();
-       }
-       [CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
-       public class FileEntry : Gtk.VBox, Atk.Implementor, Gtk.Buildable, Gtk.Editable {
-               public weak Gtk.Widget fsw;
-               public void @construct (string history_id, string browse_dialog_title);
-               public bool get_directory_entry ();
-               public weak string get_full_path (bool file_must_exist);
-               public bool get_modal ();
-               public FileEntry (string history_id, string browse_dialog_title);
-               public void set_default_path (string path);
-               public void set_directory (bool directory_entry);
-               public void set_directory_entry (bool directory_entry);
-               public void set_filename (string filename);
-               public void set_modal (bool is_modal);
-               public void set_title (string browse_dialog_title);
-               [NoAccessorMethod]
-               public weak string browse_dialog_title { get; set; }
-               [NoAccessorMethod]
-               public weak string default_path { get; set; }
-               public weak bool directory_entry { get; set; }
-               [NoAccessorMethod]
-               public weak Gtk.FileChooserAction filechooser_action { get; set; }
-               [NoAccessorMethod]
-               public weak string filename { get; set; }
-               [NoAccessorMethod]
-               public weak Gnome.Entry gnome_entry { get; }
-               [NoAccessorMethod]
-               public weak Gtk.Entry gtk_entry { get; }
-               [NoAccessorMethod]
-               public weak string history_id { get; set; }
-               public weak bool modal { get; set; }
-               [NoAccessorMethod]
-               public weak bool use_filechooser { get; set; }
-               public signal void activate ();
-               public signal void browse_clicked ();
-       }
-       [CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
-       public class FontPicker : Gtk.Button, Atk.Implementor, Gtk.Buildable {
-               public void fi_set_show_size (bool show_size);
-               public void fi_set_use_font_in_label (bool use_font_in_label, int size);
-               public weak Gdk.Font get_font ();
-               public weak string get_font_name ();
-               public Gnome.FontPickerMode get_mode ();
-               public weak string get_preview_text ();
-               public weak string get_title ();
-               public FontPicker ();
-               public bool set_font_name (string fontname);
-               public void set_mode (Gnome.FontPickerMode mode);
-               public void set_preview_text (string text);
-               public void set_title (string title);
-               public weak Gtk.Widget uw_get_widget ();
-               public void uw_set_widget (Gtk.Widget widget);
-               public weak pointer font { get; }
-               public weak string font_name { get; set; }
-               [NoAccessorMethod]
-               public weak int label_font_size { get; set; }
-               public weak Gnome.FontPickerMode mode { get; set; }
-               public weak string preview_text { get; set; }
-               [NoAccessorMethod]
-               public weak bool show_size { get; set; }
-               public weak string title { get; set; }
-               [NoAccessorMethod]
-               public weak bool use_font_in_label { get; set; }
-               public signal void font_set (string font_name);
-       }
-       [CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
-       public class HRef : Gtk.Button, Atk.Implementor, Gtk.Buildable {
-               public weak string get_label ();
-               public weak string get_text ();
-               public weak string get_url ();
-               public HRef (string url, string text);
-               public void set_label (string label);
-               public void set_text (string text);
-               public void set_url (string url);
-               public weak string text { get; set; }
-               public weak string url { get; set; }
-       }
-       [CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
        public class IconEntry : Gtk.VBox, Atk.Implementor, Gtk.Buildable {
                public void @construct (string history_id, string browse_dialog_title);
                public weak string get_filename ();
@@ -771,110 +418,6 @@ namespace Gnome {
                public void stop_loading ();
        }
        [CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
-       public class MDI : Gtk.Object {
-               public Gnome.MDIMode mode;
-               public Gtk.PositionType tab_pos;
-               public uint signal_id;
-               public uint in_drag;
-               public weak string appname;
-               public weak string title;
-               public weak Gnome.UIInfo menu_template;
-               public weak Gnome.UIInfo toolbar_template;
-               public weak Gnome.MDIChild active_child;
-               public weak Gtk.Widget active_view;
-               public weak Gnome.App active_window;
-               public weak GLib.List windows;
-               public weak GLib.List children;
-               public weak GLib.SList registered;
-               public weak string child_menu_path;
-               public weak string child_list_path;
-               public pointer reserved;
-               public int add_toplevel_view (Gnome.MDIChild child);
-               public weak Gnome.MDIChild find_child (string name);
-               public weak Gnome.MDIChild get_active_child ();
-               public weak Gtk.Widget get_active_view ();
-               public weak Gnome.App get_active_window ();
-               public static weak Gnome.App get_app_from_view (Gtk.Widget view);
-               public static weak Gnome.MDIChild get_child_from_view (Gtk.Widget view);
-               public static weak Gnome.UIInfo get_child_menu_info (Gnome.App app);
-               public static weak Gnome.UIInfo get_menubar_info (Gnome.App app);
-               public static weak Gnome.UIInfo get_toolbar_info (Gnome.App app);
-               public weak Gtk.Widget get_view_from_window (Gnome.App app);
-               public MDI (string appname, string title);
-               public void open_toplevel ();
-               public void register (Gtk.Object object);
-               public int remove_all (int force);
-               public bool restore_state (string section, Gnome.MDIChildCreator create_child_func);
-               public void save_state (string section);
-               public void set_active_view (Gtk.Widget view);
-               public void set_child_list_path (string path);
-               public void set_child_menu_path (string path);
-               public void set_menubar_template (Gnome.UIInfo menu_tmpl);
-               public void set_mode (Gnome.MDIMode mode);
-               public void set_toolbar_template (Gnome.UIInfo tbar_tmpl);
-               public void unregister (Gtk.Object object);
-               public void update_child (Gnome.MDIChild child);
-               [HasEmitter]
-               public signal bool add_child (Gnome.MDIChild p0);
-               [HasEmitter]
-               public signal bool add_view (Gtk.Widget p0);
-               public signal void app_created (Gnome.App p0);
-               public signal void child_changed (Gnome.MDIChild p0);
-               [HasEmitter]
-               public signal bool remove_child (Gnome.MDIChild p0);
-               [HasEmitter]
-               public signal bool remove_view (Gtk.Widget p0);
-               public signal void view_changed (Gtk.Widget p0);
-       }
-       [CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
-       public class MDIChild : Gtk.Object {
-               public weak Gtk.Object parent;
-               public weak string name;
-               public weak GLib.List views;
-               public weak Gnome.UIInfo menu_template;
-               public pointer reserved;
-               public weak Gtk.Widget add_view ();
-               public void remove_view (Gtk.Widget view);
-               public void set_menu_template (Gnome.UIInfo menu_tmpl);
-               public void set_name (string name);
-       }
-       [CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
-       public class MDIGenericChild : Gnome.MDIChild {
-               public Gnome.MDIChildViewCreator create_view;
-               public Gnome.MDIChildMenuCreator create_menus;
-               public Gnome.MDIChildConfigFunc get_config_string;
-               public Gnome.MDIChildLabelFunc set_label;
-               public Gtk.CallbackMarshal create_view_cbm;
-               public Gtk.CallbackMarshal create_menus_cbm;
-               public Gtk.CallbackMarshal get_config_string_cbm;
-               public Gtk.CallbackMarshal set_label_cbm;
-               public Gtk.DestroyNotify create_view_dn;
-               public Gtk.DestroyNotify create_menus_dn;
-               public Gtk.DestroyNotify get_config_string_dn;
-               public Gtk.DestroyNotify set_label_dn;
-               public pointer create_view_data;
-               public pointer create_menus_data;
-               public pointer get_config_string_data;
-               public pointer set_label_data;
-               public pointer reserved;
-               public MDIGenericChild (string name);
-               public void set_config_func (Gnome.MDIChildConfigFunc func, pointer data);
-               public void set_config_func_full (Gnome.MDIChildConfigFunc func, Gtk.CallbackMarshal marshal, pointer data, Gtk.DestroyNotify notify);
-               public void set_label_func (Gnome.MDIChildLabelFunc func, pointer data);
-               public void set_label_func_full (Gnome.MDIChildLabelFunc func, Gtk.CallbackMarshal marshal, pointer data, Gtk.DestroyNotify notify);
-               public void set_menu_creator (Gnome.MDIChildMenuCreator func, pointer data);
-               public void set_menu_creator_full (Gnome.MDIChildMenuCreator func, Gtk.CallbackMarshal marshal, pointer data, Gtk.DestroyNotify notify);
-               public void set_view_creator (Gnome.MDIChildViewCreator func, pointer data);
-               public void set_view_creator_full (Gnome.MDIChildViewCreator func, Gtk.CallbackMarshal marshal, pointer data, Gtk.DestroyNotify notify);
-       }
-       [CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
-       public class MessageBox : Gnome.Dialog, Atk.Implementor, Gtk.Buildable {
-               public void @construct (string message, string message_box_type, string buttons);
-               public MessageBox (string message, string message_box_type);
-               [CCode (cname = "gnome_message_box_newv")]
-               public MessageBox.newv (string message, string message_box_type, string buttons);
-       }
-       [CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
        public class PasswordDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
                public weak Gnome.PasswordDialogDetails details;
                public bool anon_selected ();
@@ -932,65 +475,6 @@ namespace Gnome {
                public weak string username { get; set; }
        }
        [CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
-       public class Pixmap : Gtk.Image, Atk.Implementor, Gtk.Buildable {
-               public void load_file (string filename);
-               public void load_file_at_size (string filename, int width, int height);
-               public void load_xpm_d (out string xpm_data);
-               public void load_xpm_d_at_size (out string xpm_data, int width, int height);
-               public Pixmap.from_file (string filename);
-               public Pixmap.from_file_at_size (string filename, int width, int height);
-               public Pixmap.from_gnome_pixmap (Gnome.Pixmap gpixmap);
-               public Pixmap.from_xpm_d (string xpm_data);
-               public Pixmap.from_xpm_d_at_size (string xpm_data, int width, int height);
-       }
-       [CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
-       public class PixmapEntry : Gnome.FileEntry, Atk.Implementor, Gtk.Buildable, Gtk.Editable {
-               public void @construct (string history_id, string browse_dialog_title, bool do_preview);
-               public weak string get_filename ();
-               public weak Gtk.Widget gnome_entry ();
-               public weak Gtk.Widget gnome_file_entry ();
-               public weak Gtk.Widget gtk_entry ();
-               public PixmapEntry (string history_id, string browse_dialog_title, bool do_preview);
-               public weak Gtk.Widget preview_widget ();
-               public weak Gtk.Widget scrolled_window ();
-               public void set_pixmap_subdir (string subdir);
-               public void set_preview (bool do_preview);
-               public void set_preview_size (int preview_w, int preview_h);
-               [NoAccessorMethod]
-               public weak bool do_preview { get; set; }
-       }
-       [CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
-       public class PropertyBox : Gnome.Dialog, Atk.Implementor, Gtk.Buildable {
-               public weak Gtk.Widget notebook;
-               public weak Gtk.Widget ok_button;
-               public weak Gtk.Widget apply_button;
-               public weak Gtk.Widget cancel_button;
-               public weak Gtk.Widget help_button;
-               public pointer reserved;
-               public int append_page (Gtk.Widget child, Gtk.Widget tab_label);
-               public void changed ();
-               public PropertyBox ();
-               public void set_modified (bool state);
-               public void set_state (bool state);
-               public signal void apply (int page_num);
-               public signal void help (int page_num);
-       }
-       [CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
-       public class Scores : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
-               public void @construct (uint n_scores, string names, float scores, ulong times, bool clear);
-               public static weak Gtk.Widget display (string title, string app_name, string level, int pos);
-               public static weak Gtk.Widget display_with_pixmap (string pixmap_logo, string app_name, string level, int pos);
-               public Scores (uint n_scores, string names, float scores, ulong times, bool clear);
-               public void set_color (uint n, out Gdk.Color col);
-               public void set_colors (out Gdk.Color col);
-               public void set_current_player (int i);
-               public void set_def_color (out Gdk.Color col);
-               public void set_logo_label (string txt, string font, out Gdk.Color col);
-               public void set_logo_label_title (string txt);
-               public void set_logo_pixmap (string pix_name);
-               public void set_logo_widget (Gtk.Widget w);
-       }
-       [CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
        public class ThumbnailFactory : GLib.Object {
                public bool can_thumbnail (string uri, string mime_type, ulong mtime);
                public void create_failed_thumbnail (string uri, ulong mtime);
@@ -1000,21 +484,12 @@ namespace Gnome {
                public ThumbnailFactory (Gnome.ThumbnailSize size);
                public void save_thumbnail (Gdk.Pixbuf thumbnail, string uri, ulong original_mtime);
        }
-       public static delegate void AppProgressCancelFunc (pointer data);
-       public static delegate double AppProgressFunc (pointer data);
        public static delegate void GdkPixbufDoneCallback (Gnome.GdkPixbufAsyncHandle handle, pointer cb_data);
        public static delegate void GdkPixbufLoadCallback (Gnome.GdkPixbufAsyncHandle handle, GnomeVFS.Result error, Gdk.Pixbuf pixbuf, pointer cb_data);
        public static delegate void InteractFunction (Gnome.Client client, int key, Gnome.DialogType dialog_type, pointer data);
-       public static delegate weak string MDIChildConfigFunc (Gnome.MDIChild p1, pointer p2);
-       public static delegate weak Gnome.MDIChild MDIChildCreator (string p1);
-       public static delegate weak Gtk.Widget MDIChildLabelFunc (Gnome.MDIChild p1, Gtk.Widget p2, pointer p3);
-       public static delegate weak GLib.List MDIChildMenuCreator (Gnome.MDIChild p1, Gtk.Widget p2, pointer p3);
-       public static delegate weak Gtk.Widget MDIChildViewCreator (Gnome.MDIChild p1, pointer p2);
        public static delegate double PasswordDialogQualityFunc (Gnome.PasswordDialog password_dialog, string password, pointer user_data);
        public static delegate void ReplyCallback (int reply, pointer data);
        public static delegate void StringCallback (string string, pointer data);
-       public static delegate void ThemeFileLineFunc (Gnome.ThemeFile df, string key, string locale, string value, pointer data);
-       public static delegate void ThemeFileSectionFunc (Gnome.ThemeFile df, string name, pointer data);
        public static delegate void UISignalConnectFunc (Gnome.UIInfo uiinfo, string signal_name, Gnome.UIBuilderData uibdata);
        public const string GNOMEUIINFO_KEY_UIBDATA;
        public const string GNOMEUIINFO_KEY_UIDATA;
@@ -1086,14 +561,11 @@ namespace Gnome {
        public static void accelerators_sync ();
        public static bool authentication_manager_dialog_is_visible ();
        public static void authentication_manager_init ();
-       public static weak Gtk.Widget error_dialog (string error);
-       public static weak Gtk.Widget error_dialog_parented (string error, Gtk.Window parent);
        public static weak Gdk.Pixbuf gdk_pixbuf_new_from_uri (string uri);
        public static weak Gnome.GdkPixbufAsyncHandle gdk_pixbuf_new_from_uri_async (string uri, Gnome.GdkPixbufLoadCallback load_callback, Gnome.GdkPixbufDoneCallback done_callback, pointer callback_data);
        public static weak Gdk.Pixbuf gdk_pixbuf_new_from_uri_at_scale (string uri, int width, int height, bool preserve_aspect_ratio);
        public static void gdk_pixbuf_new_from_uri_cancel (Gnome.GdkPixbufAsyncHandle handle);
        public static weak Gnome.ModuleInfo gtk_module_info_get ();
-       public static void gtk_widget_add_popup_items (Gtk.Widget widget, Gnome.UIInfo uiinfo, pointer user_data);
        public static bool help_display_desktop_on_screen (Gnome.Program program, string doc_id, string file_name, string link_id, Gdk.Screen screen) throws GLib.Error;
        public static bool help_display_on_screen (string file_name, string link_id, Gdk.Screen screen) throws GLib.Error;
        public static bool help_display_uri_on_screen (string help_uri, Gdk.Screen screen) throws GLib.Error;
@@ -1105,41 +577,10 @@ namespace Gnome {
        [CCode (cname = "libgnomeui_module_info_get")]
        public static weak Gnome.ModuleInfo libgnomeui_module_info_get ();
        public static weak Gnome.Client master_client ();
-       public static weak Gtk.Widget ok_cancel_dialog (string message, Gnome.ReplyCallback callback, pointer data);
-       public static weak Gtk.Widget ok_cancel_dialog_modal (string message, Gnome.ReplyCallback callback, pointer data);
-       public static weak Gtk.Widget ok_cancel_dialog_modal_parented (string message, Gnome.ReplyCallback callback, pointer data, Gtk.Window parent);
-       public static weak Gtk.Widget ok_cancel_dialog_parented (string message, Gnome.ReplyCallback callback, pointer data, Gtk.Window parent);
-       public static weak Gtk.Widget ok_dialog (string message);
-       public static weak Gtk.Widget ok_dialog_parented (string message, Gtk.Window parent);
-       public static void popup_menu_append (Gtk.Widget popup, Gnome.UIInfo uiinfo);
-       public static void popup_menu_attach (Gtk.Widget popup, Gtk.Widget widget, pointer user_data);
-       public static void popup_menu_do_popup (Gtk.Widget popup, Gtk.MenuPositionFunc pos_func, pointer pos_data, Gdk.EventButton event, pointer user_data, Gtk.Widget for_widget);
-       public static int popup_menu_do_popup_modal (Gtk.Widget popup, Gtk.MenuPositionFunc pos_func, pointer pos_data, Gdk.EventButton event, pointer user_data, Gtk.Widget for_widget);
-       public static weak Gtk.AccelGroup popup_menu_get_accel_group (Gtk.Menu menu);
-       public static weak Gtk.Widget popup_menu_new (Gnome.UIInfo uiinfo);
-       public static weak Gtk.Widget popup_menu_new_with_accelgroup (Gnome.UIInfo uiinfo, Gtk.AccelGroup accelgroup);
-       public static weak Gtk.Widget question_dialog (string question, Gnome.ReplyCallback callback, pointer data);
-       public static weak Gtk.Widget question_dialog_modal (string question, Gnome.ReplyCallback callback, pointer data);
-       public static weak Gtk.Widget question_dialog_modal_parented (string question, Gnome.ReplyCallback callback, pointer data, Gtk.Window parent);
-       public static weak Gtk.Widget question_dialog_parented (string question, Gnome.ReplyCallback callback, pointer data, Gtk.Window parent);
-       public static weak Gtk.Widget request_dialog (bool password, string prompt, string default_text, ushort max_length, Gnome.StringCallback callback, pointer data, Gtk.Window parent);
-       public static weak Gtk.Widget request_password_dialog (string prompt, Gnome.StringCallback callback, pointer data);
-       public static weak Gtk.Widget request_password_dialog_parented (string prompt, Gnome.StringCallback callback, pointer data, Gtk.Window parent);
-       public static weak Gtk.Widget request_string_dialog (string prompt, Gnome.StringCallback callback, pointer data);
-       public static weak Gtk.Widget request_string_dialog_parented (string prompt, Gnome.StringCallback callback, pointer data, Gtk.Window parent);
        public static bool thumbnail_has_uri (Gdk.Pixbuf pixbuf, string uri);
        public static bool thumbnail_is_valid (Gdk.Pixbuf pixbuf, string uri, ulong mtime);
        public static weak string thumbnail_md5 (string uri);
        public static weak string thumbnail_path_for_uri (string uri, Gnome.ThumbnailSize size);
        public static weak Gdk.Pixbuf thumbnail_scale_down_pixbuf (Gdk.Pixbuf pixbuf, int dest_width, int dest_height);
        public static bool url_show_on_screen (string url, Gdk.Screen screen) throws GLib.Error;
-       public static weak Gtk.Widget warning_dialog (string warning);
-       public static weak Gtk.Widget warning_dialog_parented (string warning, Gtk.Window parent);
-       public static void window_icon_init ();
-       public static void window_icon_set_default_from_file (string filename);
-       public static void window_icon_set_default_from_file_list (out string filenames);
-       public static void window_icon_set_from_default (Gtk.Window w);
-       public static void window_icon_set_from_file (Gtk.Window w, string filename);
-       public static void window_icon_set_from_file_list (Gtk.Window w, out string filenames);
-       public static void window_toplevel_set_title (Gtk.Window window, string doc_name, string app_name, string extension);
 }
index 94455f0..7934d77 100644 (file)
@@ -48,7 +48,7 @@ namespace Notify {
        public const int EXPIRES_NEVER;
        public static weak string get_app_name ();
        public static weak GLib.List get_server_caps ();
-       public static bool get_server_info (out string ret_name, out string ret_vendor, out string ret_version, out string ret_spec_version);
+       public static bool get_server_info (out weak string ret_name, out weak string ret_vendor, out weak string ret_version, out weak string ret_spec_version);
        public static bool init (string app_name);
        public static bool is_initted ();
        public static void uninit ();
index 58e2eb3..e0a9cd5 100644 (file)
@@ -171,12 +171,6 @@ namespace Soup {
                ARRAY,
        }
        [CCode (cheader_filename = "libsoup/soup.h")]
-       public class ServerAuth {
-               public ServerAuth (Soup.ServerAuthContext auth_ctx, GLib.SList auth_hdrs, Soup.Message msg);
-               public weak string get_user ();
-               public bool check_passwd (string passwd);
-       }
-       [CCode (cheader_filename = "libsoup/soup.h")]
        public class DataBuffer {
                public Soup.Ownership owner;
                public weak string body;
@@ -283,19 +277,19 @@ namespace Soup {
        }
        [CCode (cheader_filename = "libsoup/soup.h")]
        public class XmlrpcValue {
-               public bool array_get_iterator (out Soup.XmlrpcValueArrayIterator iter);
+               public bool array_get_iterator (out weak Soup.XmlrpcValueArrayIterator iter);
                public void dump ();
-               public bool get_base64 (out GLib.ByteArray data);
+               public bool get_base64 (out weak GLib.ByteArray data);
                public bool get_boolean (bool b);
                public bool get_datetime (ulong timeval);
                public bool get_double (double b);
                public bool get_int (long i);
-               public bool get_string (out string str);
+               public bool get_string (out weak string str);
                public bool get_struct (GLib.HashTable table);
        }
        [CCode (cheader_filename = "libsoup/soup.h")]
        public class XmlrpcValueArrayIterator {
-               public bool get_value (out Soup.XmlrpcValue value);
+               public bool get_value (out weak Soup.XmlrpcValue value);
                public weak Soup.XmlrpcValueArrayIterator next ();
                public weak Soup.XmlrpcValueArrayIterator prev ();
        }
@@ -410,6 +404,7 @@ namespace Soup {
        [CCode (cheader_filename = "libsoup/soup.h")]
        public class Server : GLib.Object {
                public void add_handler (string path, Soup.ServerAuthContext auth_ctx, Soup.ServerCallbackFn callback, Soup.ServerUnregisterFn unreg, pointer data);
+               public weak GLib.MainContext get_async_context ();
                public weak Soup.ServerHandler get_handler (string path);
                public weak Soup.Socket get_listener ();
                public uint get_port ();
@@ -448,6 +443,7 @@ namespace Soup {
                public void abort ();
                public void add_filter (Soup.MessageFilter filter);
                public virtual void cancel_message (Soup.Message msg);
+               public weak GLib.MainContext get_async_context ();
                public weak Soup.Connection get_connection (Soup.Message msg, bool try_pruning, bool is_new);
                public virtual void queue_message (Soup.Message msg, Soup.MessageCallbackFn callback, pointer user_data);
                public void remove_filter (Soup.MessageFilter filter);
@@ -521,6 +517,15 @@ namespace Soup {
                public signal void writable ();
        }
        [CCode (cheader_filename = "libsoup/soup.h")]
+       public class ServerAuth {
+               public Soup.AuthType type;
+               public weak Soup.ServerAuthBasic basic;
+               public weak Soup.ServerAuthDigest digest;
+               public bool check_passwd (string passwd);
+               public weak string get_user ();
+               public ServerAuth (Soup.ServerAuthContext auth_ctx, GLib.SList auth_hdrs, Soup.Message msg);
+       }
+       [CCode (cheader_filename = "libsoup/soup.h")]
        public interface MessageFilter {
                public abstract void setup_message (Soup.Message msg);
        }
@@ -610,12 +615,12 @@ namespace Soup {
        public static ulong date_parse (string timestamp);
        public static void gmtime (ulong when, pointer tm);
        public static weak string header_param_copy_token (GLib.HashTable tokens, string t);
-       public static weak string header_param_decode_token (out string @in);
+       public static weak string header_param_decode_token (out weak string @in);
        public static void header_param_destroy_hash (GLib.HashTable table);
        public static weak GLib.HashTable header_param_parse_list (string header);
-       public static bool headers_parse_request (string str, int len, GLib.HashTable dest, out string req_method, out string req_path, Soup.HttpVersion ver);
-       public static bool headers_parse_response (string str, int len, GLib.HashTable dest, Soup.HttpVersion ver, uint status_code, out string reason_phrase);
-       public static bool headers_parse_status_line (string status_line, Soup.HttpVersion ver, uint status_code, out string reason_phrase);
+       public static bool headers_parse_request (string str, int len, GLib.HashTable dest, out weak string req_method, out weak string req_path, Soup.HttpVersion ver);
+       public static bool headers_parse_response (string str, int len, GLib.HashTable dest, Soup.HttpVersion ver, uint status_code, out weak string reason_phrase);
+       public static bool headers_parse_status_line (string status_line, Soup.HttpVersion ver, uint status_code, out weak string reason_phrase);
        public static Soup.MethodId method_get_id (string method);
        public static uint signal_connect_once (pointer instance, string detailed_signal, GLib.Callback c_handler, pointer data);
        public static weak string status_get_phrase (uint status_code);
diff --git a/vapi/packages/libgnome-2.0/libgnome-2.0.defines b/vapi/packages/libgnome-2.0/libgnome-2.0.defines
new file mode 100644 (file)
index 0000000..56dabc3
--- /dev/null
@@ -0,0 +1 @@
+-DGNOME_DISABLE_DEPRECATED
index 10c2729..8f4db36 100644 (file)
@@ -7,213 +7,6 @@
                <function name="clearenv" symbol="gnome_clearenv">
                        <return-type type="void"/>
                </function>
-               <function name="config_assemble_vector" symbol="gnome_config_assemble_vector">
-                       <return-type type="char*"/>
-                       <parameters>
-                               <parameter name="argc" type="int"/>
-                               <parameter name="argv" type="char*[]"/>
-                       </parameters>
-               </function>
-               <function name="config_clean_file_" symbol="gnome_config_clean_file_">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="path" type="char*"/>
-                               <parameter name="priv" type="gboolean"/>
-                       </parameters>
-               </function>
-               <function name="config_clean_key_" symbol="gnome_config_clean_key_">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="path" type="char*"/>
-                               <parameter name="priv" type="gboolean"/>
-                       </parameters>
-               </function>
-               <function name="config_clean_section_" symbol="gnome_config_clean_section_">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="path" type="char*"/>
-                               <parameter name="priv" type="gboolean"/>
-                       </parameters>
-               </function>
-               <function name="config_drop_all" symbol="gnome_config_drop_all">
-                       <return-type type="void"/>
-               </function>
-               <function name="config_drop_file_" symbol="gnome_config_drop_file_">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="path" type="char*"/>
-                               <parameter name="priv" type="gboolean"/>
-                       </parameters>
-               </function>
-               <function name="config_get_bool_with_default_" symbol="gnome_config_get_bool_with_default_">
-                       <return-type type="gboolean"/>
-                       <parameters>
-                               <parameter name="path" type="char*"/>
-                               <parameter name="def" type="gboolean*"/>
-                               <parameter name="priv" type="gboolean"/>
-                       </parameters>
-               </function>
-               <function name="config_get_float_with_default_" symbol="gnome_config_get_float_with_default_">
-                       <return-type type="gdouble"/>
-                       <parameters>
-                               <parameter name="path" type="char*"/>
-                               <parameter name="def" type="gboolean*"/>
-                               <parameter name="priv" type="gboolean"/>
-                       </parameters>
-               </function>
-               <function name="config_get_int_with_default_" symbol="gnome_config_get_int_with_default_">
-                       <return-type type="gint"/>
-                       <parameters>
-                               <parameter name="path" type="char*"/>
-                               <parameter name="def" type="gboolean*"/>
-                               <parameter name="priv" type="gboolean"/>
-                       </parameters>
-               </function>
-               <function name="config_get_string_with_default_" symbol="gnome_config_get_string_with_default_">
-                       <return-type type="char*"/>
-                       <parameters>
-                               <parameter name="path" type="char*"/>
-                               <parameter name="def" type="gboolean*"/>
-                               <parameter name="priv" type="gboolean"/>
-                       </parameters>
-               </function>
-               <function name="config_get_translated_string_with_default_" symbol="gnome_config_get_translated_string_with_default_">
-                       <return-type type="char*"/>
-                       <parameters>
-                               <parameter name="path" type="char*"/>
-                               <parameter name="def" type="gboolean*"/>
-                               <parameter name="priv" type="gboolean"/>
-                       </parameters>
-               </function>
-               <function name="config_get_vector_with_default_" symbol="gnome_config_get_vector_with_default_">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="path" type="char*"/>
-                               <parameter name="argcp" type="gint*"/>
-                               <parameter name="argvp" type="char***"/>
-                               <parameter name="def" type="gboolean*"/>
-                               <parameter name="priv" type="gboolean"/>
-                       </parameters>
-               </function>
-               <function name="config_has_section_" symbol="gnome_config_has_section_">
-                       <return-type type="gboolean"/>
-                       <parameters>
-                               <parameter name="path" type="char*"/>
-                               <parameter name="priv" type="gboolean"/>
-                       </parameters>
-               </function>
-               <function name="config_init_iterator_" symbol="gnome_config_init_iterator_">
-                       <return-type type="void*"/>
-                       <parameters>
-                               <parameter name="path" type="char*"/>
-                               <parameter name="priv" type="gboolean"/>
-                       </parameters>
-               </function>
-               <function name="config_init_iterator_sections_" symbol="gnome_config_init_iterator_sections_">
-                       <return-type type="void*"/>
-                       <parameters>
-                               <parameter name="path" type="char*"/>
-                               <parameter name="priv" type="gboolean"/>
-                       </parameters>
-               </function>
-               <function name="config_iterator_next" symbol="gnome_config_iterator_next">
-                       <return-type type="void*"/>
-                       <parameters>
-                               <parameter name="iterator_handle" type="void*"/>
-                               <parameter name="key" type="char**"/>
-                               <parameter name="value" type="char**"/>
-                       </parameters>
-               </function>
-               <function name="config_make_vector" symbol="gnome_config_make_vector">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="string" type="char*"/>
-                               <parameter name="argcp" type="int*"/>
-                               <parameter name="argvp" type="char***"/>
-                       </parameters>
-               </function>
-               <function name="config_pop_prefix" symbol="gnome_config_pop_prefix">
-                       <return-type type="void"/>
-               </function>
-               <function name="config_push_prefix" symbol="gnome_config_push_prefix">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="path" type="char*"/>
-                       </parameters>
-               </function>
-               <function name="config_set_bool_" symbol="gnome_config_set_bool_">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="path" type="char*"/>
-                               <parameter name="value" type="gboolean"/>
-                               <parameter name="priv" type="gboolean"/>
-                       </parameters>
-               </function>
-               <function name="config_set_float_" symbol="gnome_config_set_float_">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="path" type="char*"/>
-                               <parameter name="value" type="gdouble"/>
-                               <parameter name="priv" type="gboolean"/>
-                       </parameters>
-               </function>
-               <function name="config_set_int_" symbol="gnome_config_set_int_">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="path" type="char*"/>
-                               <parameter name="value" type="int"/>
-                               <parameter name="priv" type="gboolean"/>
-                       </parameters>
-               </function>
-               <function name="config_set_set_handler" symbol="gnome_config_set_set_handler">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="func" type="GCallback"/>
-                               <parameter name="data" type="void*"/>
-                       </parameters>
-               </function>
-               <function name="config_set_string_" symbol="gnome_config_set_string_">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="path" type="char*"/>
-                               <parameter name="value" type="char*"/>
-                               <parameter name="priv" type="gboolean"/>
-                       </parameters>
-               </function>
-               <function name="config_set_sync_handler" symbol="gnome_config_set_sync_handler">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="func" type="GCallback"/>
-                               <parameter name="data" type="void*"/>
-                       </parameters>
-               </function>
-               <function name="config_set_translated_string_" symbol="gnome_config_set_translated_string_">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="path" type="char*"/>
-                               <parameter name="value" type="char*"/>
-                               <parameter name="priv" type="gboolean"/>
-                       </parameters>
-               </function>
-               <function name="config_set_vector_" symbol="gnome_config_set_vector_">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="path" type="char*"/>
-                               <parameter name="argc" type="int"/>
-                               <parameter name="argv" type="char*[]"/>
-                               <parameter name="priv" type="gboolean"/>
-                       </parameters>
-               </function>
-               <function name="config_sync" symbol="gnome_config_sync">
-                       <return-type type="gboolean"/>
-               </function>
-               <function name="config_sync_file_" symbol="gnome_config_sync_file_">
-                       <return-type type="gboolean"/>
-                       <parameters>
-                               <parameter name="path" type="char*"/>
-                               <parameter name="priv" type="gboolean"/>
-                       </parameters>
-               </function>
                <function name="execute_async" symbol="gnome_execute_async">
                        <return-type type="int"/>
                        <parameters>
                <function name="help_error_quark" symbol="gnome_help_error_quark">
                        <return-type type="GQuark"/>
                </function>
-               <function name="i18n_get_language_list" symbol="gnome_i18n_get_language_list">
-                       <return-type type="GList*"/>
-                       <parameters>
-                               <parameter name="category_name" type="gchar*"/>
-                       </parameters>
-               </function>
-               <function name="i18n_pop_c_numeric_locale" symbol="gnome_i18n_pop_c_numeric_locale">
-                       <return-type type="void"/>
-               </function>
-               <function name="i18n_push_c_numeric_locale" symbol="gnome_i18n_push_c_numeric_locale">
-                       <return-type type="void"/>
-               </function>
                <function name="libgnome_module_info_get" symbol="libgnome_module_info_get">
                        <return-type type="GnomeModuleInfo*"/>
                </function>
                                <parameter name="argv" type="char***"/>
                        </parameters>
                </function>
-               <function name="score_get_notable" symbol="gnome_score_get_notable">
-                       <return-type type="gint"/>
-                       <parameters>
-                               <parameter name="gamename" type="gchar*"/>
-                               <parameter name="level" type="gchar*"/>
-                               <parameter name="names" type="gchar***"/>
-                               <parameter name="scores" type="gfloat**"/>
-                               <parameter name="scoretimes" type="time_t**"/>
-                       </parameters>
-               </function>
-               <function name="score_init" symbol="gnome_score_init">
-                       <return-type type="gint"/>
-                       <parameters>
-                               <parameter name="gamename" type="gchar*"/>
-                       </parameters>
-               </function>
-               <function name="score_log" symbol="gnome_score_log">
-                       <return-type type="gint"/>
-                       <parameters>
-                               <parameter name="score" type="gfloat"/>
-                               <parameter name="level" type="gchar*"/>
-                               <parameter name="higher_to_lower_score_order" type="gboolean"/>
-                       </parameters>
-               </function>
                <function name="setenv" symbol="gnome_setenv">
                        <return-type type="int"/>
                        <parameters>
                        <field name="instance_init" type="GnomeModuleHook"/>
                        <field name="pre_args_parse" type="GnomeModuleHook"/>
                        <field name="post_args_parse" type="GnomeModuleHook"/>
-                       <field name="options" type="struct poptOption*"/>
+                       <field name="_options" type="void*"/>
                        <field name="init_pass" type="GnomeModuleInitHook"/>
                        <field name="class_init" type="GnomeModuleClassInitHook"/>
                        <field name="opt_prefix" type="char*"/>
                                        <parameter name="module_info" type="GnomeModuleInfo*"/>
                                </parameters>
                        </method>
-                       <method name="parse_args" symbol="gnome_program_parse_args">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="program" type="GnomeProgram*"/>
-                               </parameters>
-                       </method>
-                       <method name="postinit" symbol="gnome_program_postinit">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="program" type="GnomeProgram*"/>
-                               </parameters>
-                       </method>
-                       <method name="preinit" symbol="gnome_program_preinit">
-                               <return-type type="poptContext"/>
-                               <parameters>
-                                       <parameter name="program" type="GnomeProgram*"/>
-                                       <parameter name="app_id" type="char*"/>
-                                       <parameter name="app_version" type="char*"/>
-                                       <parameter name="argc" type="int"/>
-                                       <parameter name="argv" type="char**"/>
-                               </parameters>
-                       </method>
                        <property name="app-datadir" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
                        <property name="app-id" type="char*" readable="1" writable="0" construct="0" construct-only="0"/>
                        <property name="app-libdir" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
diff --git a/vapi/packages/libgnomeui-2.0/libgnomeui-2.0.defines b/vapi/packages/libgnomeui-2.0/libgnomeui-2.0.defines
new file mode 100644 (file)
index 0000000..56dabc3
--- /dev/null
@@ -0,0 +1 @@
+-DGNOME_DISABLE_DEPRECATED
index 828ec72..c44f5fe 100644 (file)
                <function name="authentication_manager_init" symbol="gnome_authentication_manager_init">
                        <return-type type="void"/>
                </function>
-               <function name="error_dialog" symbol="gnome_error_dialog">
-                       <return-type type="GtkWidget*"/>
-                       <parameters>
-                               <parameter name="error" type="gchar*"/>
-                       </parameters>
-               </function>
-               <function name="error_dialog_parented" symbol="gnome_error_dialog_parented">
-                       <return-type type="GtkWidget*"/>
-                       <parameters>
-                               <parameter name="error" type="gchar*"/>
-                               <parameter name="parent" type="GtkWindow*"/>
-                       </parameters>
-               </function>
                <function name="gdk_pixbuf_new_from_uri" symbol="gnome_gdk_pixbuf_new_from_uri">
                        <return-type type="GdkPixbuf*"/>
                        <parameters>
                <function name="gtk_module_info_get" symbol="gnome_gtk_module_info_get">
                        <return-type type="GnomeModuleInfo*"/>
                </function>
-               <function name="gtk_widget_add_popup_items" symbol="gnome_gtk_widget_add_popup_items">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="widget" type="GtkWidget*"/>
-                               <parameter name="uiinfo" type="GnomeUIInfo*"/>
-                               <parameter name="user_data" type="gpointer"/>
-                       </parameters>
-               </function>
                <function name="help_display_desktop_on_screen" symbol="gnome_help_display_desktop_on_screen">
                        <return-type type="gboolean"/>
                        <parameters>
                                <parameter name="result" type="GnomeIconLookupResultFlags*"/>
                        </parameters>
                </function>
-               <function name="init_with_popt_table" symbol="gnome_init_with_popt_table">
-                       <return-type type="int"/>
-                       <parameters>
-                               <parameter name="app_id" type="char*"/>
-                               <parameter name="app_version" type="char*"/>
-                               <parameter name="argc" type="int"/>
-                               <parameter name="argv" type="char**"/>
-                               <parameter name="options" type="struct poptOption*"/>
-                               <parameter name="flags" type="int"/>
-                               <parameter name="return_ctx" type="poptContext*"/>
-                       </parameters>
-               </function>
                <function name="interaction_key_return" symbol="gnome_interaction_key_return">
                        <return-type type="void"/>
                        <parameters>
                <function name="master_client" symbol="gnome_master_client">
                        <return-type type="GnomeClient*"/>
                </function>
-               <function name="ok_cancel_dialog" symbol="gnome_ok_cancel_dialog">
-                       <return-type type="GtkWidget*"/>
-                       <parameters>
-                               <parameter name="message" type="gchar*"/>
-                               <parameter name="callback" type="GnomeReplyCallback"/>
-                               <parameter name="data" type="gpointer"/>
-                       </parameters>
-               </function>
-               <function name="ok_cancel_dialog_modal" symbol="gnome_ok_cancel_dialog_modal">
-                       <return-type type="GtkWidget*"/>
-                       <parameters>
-                               <parameter name="message" type="gchar*"/>
-                               <parameter name="callback" type="GnomeReplyCallback"/>
-                               <parameter name="data" type="gpointer"/>
-                       </parameters>
-               </function>
-               <function name="ok_cancel_dialog_modal_parented" symbol="gnome_ok_cancel_dialog_modal_parented">
-                       <return-type type="GtkWidget*"/>
-                       <parameters>
-                               <parameter name="message" type="gchar*"/>
-                               <parameter name="callback" type="GnomeReplyCallback"/>
-                               <parameter name="data" type="gpointer"/>
-                               <parameter name="parent" type="GtkWindow*"/>
-                       </parameters>
-               </function>
-               <function name="ok_cancel_dialog_parented" symbol="gnome_ok_cancel_dialog_parented">
-                       <return-type type="GtkWidget*"/>
-                       <parameters>
-                               <parameter name="message" type="gchar*"/>
-                               <parameter name="callback" type="GnomeReplyCallback"/>
-                               <parameter name="data" type="gpointer"/>
-                               <parameter name="parent" type="GtkWindow*"/>
-                       </parameters>
-               </function>
-               <function name="ok_dialog" symbol="gnome_ok_dialog">
-                       <return-type type="GtkWidget*"/>
-                       <parameters>
-                               <parameter name="message" type="gchar*"/>
-                       </parameters>
-               </function>
-               <function name="ok_dialog_parented" symbol="gnome_ok_dialog_parented">
-                       <return-type type="GtkWidget*"/>
-                       <parameters>
-                               <parameter name="message" type="gchar*"/>
-                               <parameter name="parent" type="GtkWindow*"/>
-                       </parameters>
-               </function>
-               <function name="popup_menu_append" symbol="gnome_popup_menu_append">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="popup" type="GtkWidget*"/>
-                               <parameter name="uiinfo" type="GnomeUIInfo*"/>
-                       </parameters>
-               </function>
-               <function name="popup_menu_attach" symbol="gnome_popup_menu_attach">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="popup" type="GtkWidget*"/>
-                               <parameter name="widget" type="GtkWidget*"/>
-                               <parameter name="user_data" type="gpointer"/>
-                       </parameters>
-               </function>
-               <function name="popup_menu_do_popup" symbol="gnome_popup_menu_do_popup">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="popup" type="GtkWidget*"/>
-                               <parameter name="pos_func" type="GtkMenuPositionFunc"/>
-                               <parameter name="pos_data" type="gpointer"/>
-                               <parameter name="event" type="GdkEventButton*"/>
-                               <parameter name="user_data" type="gpointer"/>
-                               <parameter name="for_widget" type="GtkWidget*"/>
-                       </parameters>
-               </function>
-               <function name="popup_menu_do_popup_modal" symbol="gnome_popup_menu_do_popup_modal">
-                       <return-type type="int"/>
-                       <parameters>
-                               <parameter name="popup" type="GtkWidget*"/>
-                               <parameter name="pos_func" type="GtkMenuPositionFunc"/>
-                               <parameter name="pos_data" type="gpointer"/>
-                               <parameter name="event" type="GdkEventButton*"/>
-                               <parameter name="user_data" type="gpointer"/>
-                               <parameter name="for_widget" type="GtkWidget*"/>
-                       </parameters>
-               </function>
-               <function name="popup_menu_get_accel_group" symbol="gnome_popup_menu_get_accel_group">
-                       <return-type type="GtkAccelGroup*"/>
-                       <parameters>
-                               <parameter name="menu" type="GtkMenu*"/>
-                       </parameters>
-               </function>
-               <function name="popup_menu_new" symbol="gnome_popup_menu_new">
-                       <return-type type="GtkWidget*"/>
-                       <parameters>
-                               <parameter name="uiinfo" type="GnomeUIInfo*"/>
-                       </parameters>
-               </function>
-               <function name="popup_menu_new_with_accelgroup" symbol="gnome_popup_menu_new_with_accelgroup">
-                       <return-type type="GtkWidget*"/>
-                       <parameters>
-                               <parameter name="uiinfo" type="GnomeUIInfo*"/>
-                               <parameter name="accelgroup" type="GtkAccelGroup*"/>
-                       </parameters>
-               </function>
-               <function name="question_dialog" symbol="gnome_question_dialog">
-                       <return-type type="GtkWidget*"/>
-                       <parameters>
-                               <parameter name="question" type="gchar*"/>
-                               <parameter name="callback" type="GnomeReplyCallback"/>
-                               <parameter name="data" type="gpointer"/>
-                       </parameters>
-               </function>
-               <function name="question_dialog_modal" symbol="gnome_question_dialog_modal">
-                       <return-type type="GtkWidget*"/>
-                       <parameters>
-                               <parameter name="question" type="gchar*"/>
-                               <parameter name="callback" type="GnomeReplyCallback"/>
-                               <parameter name="data" type="gpointer"/>
-                       </parameters>
-               </function>
-               <function name="question_dialog_modal_parented" symbol="gnome_question_dialog_modal_parented">
-                       <return-type type="GtkWidget*"/>
-                       <parameters>
-                               <parameter name="question" type="gchar*"/>
-                               <parameter name="callback" type="GnomeReplyCallback"/>
-                               <parameter name="data" type="gpointer"/>
-                               <parameter name="parent" type="GtkWindow*"/>
-                       </parameters>
-               </function>
-               <function name="question_dialog_parented" symbol="gnome_question_dialog_parented">
-                       <return-type type="GtkWidget*"/>
-                       <parameters>
-                               <parameter name="question" type="gchar*"/>
-                               <parameter name="callback" type="GnomeReplyCallback"/>
-                               <parameter name="data" type="gpointer"/>
-                               <parameter name="parent" type="GtkWindow*"/>
-                       </parameters>
-               </function>
-               <function name="request_dialog" symbol="gnome_request_dialog">
-                       <return-type type="GtkWidget*"/>
-                       <parameters>
-                               <parameter name="password" type="gboolean"/>
-                               <parameter name="prompt" type="gchar*"/>
-                               <parameter name="default_text" type="gchar*"/>
-                               <parameter name="max_length" type="guint16"/>
-                               <parameter name="callback" type="GnomeStringCallback"/>
-                               <parameter name="data" type="gpointer"/>
-                               <parameter name="parent" type="GtkWindow*"/>
-                       </parameters>
-               </function>
-               <function name="request_password_dialog" symbol="gnome_request_password_dialog">
-                       <return-type type="GtkWidget*"/>
-                       <parameters>
-                               <parameter name="prompt" type="gchar*"/>
-                               <parameter name="callback" type="GnomeStringCallback"/>
-                               <parameter name="data" type="gpointer"/>
-                       </parameters>
-               </function>
-               <function name="request_password_dialog_parented" symbol="gnome_request_password_dialog_parented">
-                       <return-type type="GtkWidget*"/>
-                       <parameters>
-                               <parameter name="prompt" type="gchar*"/>
-                               <parameter name="callback" type="GnomeStringCallback"/>
-                               <parameter name="data" type="gpointer"/>
-                               <parameter name="parent" type="GtkWindow*"/>
-                       </parameters>
-               </function>
-               <function name="request_string_dialog" symbol="gnome_request_string_dialog">
-                       <return-type type="GtkWidget*"/>
-                       <parameters>
-                               <parameter name="prompt" type="gchar*"/>
-                               <parameter name="callback" type="GnomeStringCallback"/>
-                               <parameter name="data" type="gpointer"/>
-                       </parameters>
-               </function>
-               <function name="request_string_dialog_parented" symbol="gnome_request_string_dialog_parented">
-                       <return-type type="GtkWidget*"/>
-                       <parameters>
-                               <parameter name="prompt" type="gchar*"/>
-                               <parameter name="callback" type="GnomeStringCallback"/>
-                               <parameter name="data" type="gpointer"/>
-                               <parameter name="parent" type="GtkWindow*"/>
-                       </parameters>
-               </function>
                <function name="thumbnail_has_uri" symbol="gnome_thumbnail_has_uri">
                        <return-type type="gboolean"/>
                        <parameters>
                                <parameter name="error" type="GError**"/>
                        </parameters>
                </function>
-               <function name="warning_dialog" symbol="gnome_warning_dialog">
-                       <return-type type="GtkWidget*"/>
-                       <parameters>
-                               <parameter name="warning" type="gchar*"/>
-                       </parameters>
-               </function>
-               <function name="warning_dialog_parented" symbol="gnome_warning_dialog_parented">
-                       <return-type type="GtkWidget*"/>
-                       <parameters>
-                               <parameter name="warning" type="gchar*"/>
-                               <parameter name="parent" type="GtkWindow*"/>
-                       </parameters>
-               </function>
-               <function name="window_icon_init" symbol="gnome_window_icon_init">
-                       <return-type type="void"/>
-               </function>
-               <function name="window_icon_set_default_from_file" symbol="gnome_window_icon_set_default_from_file">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="filename" type="char*"/>
-                       </parameters>
-               </function>
-               <function name="window_icon_set_default_from_file_list" symbol="gnome_window_icon_set_default_from_file_list">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="filenames" type="char**"/>
-                       </parameters>
-               </function>
-               <function name="window_icon_set_from_default" symbol="gnome_window_icon_set_from_default">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="w" type="GtkWindow*"/>
-                       </parameters>
-               </function>
-               <function name="window_icon_set_from_file" symbol="gnome_window_icon_set_from_file">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="w" type="GtkWindow*"/>
-                               <parameter name="filename" type="char*"/>
-                       </parameters>
-               </function>
-               <function name="window_icon_set_from_file_list" symbol="gnome_window_icon_set_from_file_list">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="w" type="GtkWindow*"/>
-                               <parameter name="filenames" type="char**"/>
-                       </parameters>
-               </function>
-               <function name="window_toplevel_set_title" symbol="gnome_window_toplevel_set_title">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="window" type="GtkWindow*"/>
-                               <parameter name="doc_name" type="gchar*"/>
-                               <parameter name="app_name" type="gchar*"/>
-                               <parameter name="extension" type="gchar*"/>
-                       </parameters>
-               </function>
-               <callback name="GnomeAppProgressCancelFunc">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="data" type="gpointer"/>
-                       </parameters>
-               </callback>
-               <callback name="GnomeAppProgressFunc">
-                       <return-type type="gdouble"/>
-                       <parameters>
-                               <parameter name="data" type="gpointer"/>
-                       </parameters>
-               </callback>
                <callback name="GnomeGdkPixbufDoneCallback">
                        <return-type type="void"/>
                        <parameters>
                                <parameter name="data" type="gpointer"/>
                        </parameters>
                </callback>
-               <callback name="GnomeMDIChildConfigFunc">
-                       <return-type type="gchar*"/>
-                       <parameters>
-                               <parameter name="p1" type="GnomeMDIChild*"/>
-                               <parameter name="p2" type="gpointer"/>
-                       </parameters>
-               </callback>
-               <callback name="GnomeMDIChildCreator">
-                       <return-type type="GnomeMDIChild*"/>
-                       <parameters>
-                               <parameter name="p1" type="gchar*"/>
-                       </parameters>
-               </callback>
-               <callback name="GnomeMDIChildLabelFunc">
-                       <return-type type="GtkWidget*"/>
-                       <parameters>
-                               <parameter name="p1" type="GnomeMDIChild*"/>
-                               <parameter name="p2" type="GtkWidget*"/>
-                               <parameter name="p3" type="gpointer"/>
-                       </parameters>
-               </callback>
-               <callback name="GnomeMDIChildMenuCreator">
-                       <return-type type="GList*"/>
-                       <parameters>
-                               <parameter name="p1" type="GnomeMDIChild*"/>
-                               <parameter name="p2" type="GtkWidget*"/>
-                               <parameter name="p3" type="gpointer"/>
-                       </parameters>
-               </callback>
-               <callback name="GnomeMDIChildViewCreator">
-                       <return-type type="GtkWidget*"/>
-                       <parameters>
-                               <parameter name="p1" type="GnomeMDIChild*"/>
-                               <parameter name="p2" type="gpointer"/>
-                       </parameters>
-               </callback>
                <callback name="GnomePasswordDialogQualityFunc">
                        <return-type type="gdouble"/>
                        <parameters>
                                <parameter name="data" type="gpointer"/>
                        </parameters>
                </callback>
-               <callback name="GnomeThemeFileLineFunc">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="df" type="GnomeThemeFile*"/>
-                               <parameter name="key" type="char*"/>
-                               <parameter name="locale" type="char*"/>
-                               <parameter name="value" type="char*"/>
-                               <parameter name="data" type="gpointer"/>
-                       </parameters>
-               </callback>
-               <callback name="GnomeThemeFileSectionFunc">
-                       <return-type type="void"/>
-                       <parameters>
-                               <parameter name="df" type="GnomeThemeFile*"/>
-                               <parameter name="name" type="char*"/>
-                               <parameter name="data" type="gpointer"/>
-                       </parameters>
-               </callback>
                <callback name="GnomeUISignalConnectFunc">
                        <return-type type="void"/>
                        <parameters>
                </callback>
                <struct name="GnomeAppBarMsg">
                </struct>
-               <struct name="GnomeAppProgressKey">
-               </struct>
                <struct name="GnomeGdkPixbufAsyncHandle">
                </struct>
-               <struct name="GnomeIconData">
-                       <method name="dup" symbol="gnome_icon_data_dup">
-                               <return-type type="GnomeIconData*"/>
-                               <parameters>
-                                       <parameter name="icon_data" type="GnomeIconData*"/>
-                               </parameters>
-                       </method>
-                       <method name="free" symbol="gnome_icon_data_free">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="icon_data" type="GnomeIconData*"/>
-                               </parameters>
-                       </method>
-                       <field name="has_embedded_rect" type="gboolean"/>
-                       <field name="x0" type="int"/>
-                       <field name="y0" type="int"/>
-                       <field name="x1" type="int"/>
-                       <field name="y1" type="int"/>
-                       <field name="attach_points" type="GnomeIconDataPoint*"/>
-                       <field name="n_attach_points" type="int"/>
-                       <field name="display_name" type="char*"/>
-               </struct>
-               <struct name="GnomeIconDataPoint">
-                       <field name="x" type="int"/>
-                       <field name="y" type="int"/>
-               </struct>
-               <struct name="GnomeIconTheme">
-                       <method name="append_search_path" symbol="gnome_icon_theme_append_search_path">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="theme" type="GnomeIconTheme*"/>
-                                       <parameter name="path" type="char*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_allow_svg" symbol="gnome_icon_theme_get_allow_svg">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="theme" type="GnomeIconTheme*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_example_icon_name" symbol="gnome_icon_theme_get_example_icon_name">
-                               <return-type type="char*"/>
-                               <parameters>
-                                       <parameter name="theme" type="GnomeIconTheme*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_search_path" symbol="gnome_icon_theme_get_search_path">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="theme" type="GnomeIconTheme*"/>
-                                       <parameter name="path" type="char**[]"/>
-                                       <parameter name="n_elements" type="int*"/>
-                               </parameters>
-                       </method>
-                       <method name="has_icon" symbol="gnome_icon_theme_has_icon">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="theme" type="GnomeIconTheme*"/>
-                                       <parameter name="icon_name" type="char*"/>
-                               </parameters>
-                       </method>
-                       <method name="list_icons" symbol="gnome_icon_theme_list_icons">
-                               <return-type type="GList*"/>
-                               <parameters>
-                                       <parameter name="theme" type="GnomeIconTheme*"/>
-                                       <parameter name="context" type="char*"/>
-                               </parameters>
-                       </method>
-                       <method name="lookup_icon" symbol="gnome_icon_theme_lookup_icon">
-                               <return-type type="char*"/>
-                               <parameters>
-                                       <parameter name="theme" type="GnomeIconTheme*"/>
-                                       <parameter name="icon_name" type="char*"/>
-                                       <parameter name="size" type="int"/>
-                                       <parameter name="icon_data" type="GnomeIconData**"/>
-                                       <parameter name="base_size" type="int*"/>
-                               </parameters>
-                       </method>
-                       <method name="new" symbol="gnome_icon_theme_new">
-                               <return-type type="GnomeIconTheme*"/>
-                       </method>
-                       <method name="prepend_search_path" symbol="gnome_icon_theme_prepend_search_path">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="theme" type="GnomeIconTheme*"/>
-                                       <parameter name="path" type="char*"/>
-                               </parameters>
-                       </method>
-                       <method name="rescan_if_needed" symbol="gnome_icon_theme_rescan_if_needed">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="theme" type="GnomeIconTheme*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_allow_svg" symbol="gnome_icon_theme_set_allow_svg">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="theme" type="GnomeIconTheme*"/>
-                                       <parameter name="allow_svg" type="gboolean"/>
-                               </parameters>
-                       </method>
-                       <method name="set_custom_theme" symbol="gnome_icon_theme_set_custom_theme">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="theme" type="GnomeIconTheme*"/>
-                                       <parameter name="theme_name" type="char*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_search_path" symbol="gnome_icon_theme_set_search_path">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="theme" type="GnomeIconTheme*"/>
-                                       <parameter name="path" type="char*[]"/>
-                                       <parameter name="n_elements" type="int"/>
-                               </parameters>
-                       </method>
+               <struct name="GnomePasswordDialogDetails">
                </struct>
-               <struct name="GnomeMessageBoxButton">
+               <struct name="GnomeUIBuilderData">
+                       <field name="connect_func" type="GnomeUISignalConnectFunc"/>
+                       <field name="data" type="gpointer"/>
+                       <field name="is_interp" type="gboolean"/>
+                       <field name="relay_func" type="GtkCallbackMarshal"/>
+                       <field name="destroy_func" type="GtkDestroyNotify"/>
                </struct>
-               <struct name="GnomePasswordDialogDetails">
-               </struct>
-               <struct name="GnomeThemeFile">
-                       <method name="foreach_key" symbol="gnome_theme_file_foreach_key">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="df" type="GnomeThemeFile*"/>
-                                       <parameter name="section" type="char*"/>
-                                       <parameter name="include_localized" type="gboolean"/>
-                                       <parameter name="func" type="GnomeThemeFileLineFunc"/>
-                                       <parameter name="user_data" type="gpointer"/>
-                               </parameters>
-                       </method>
-                       <method name="foreach_section" symbol="gnome_theme_file_foreach_section">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="df" type="GnomeThemeFile*"/>
-                                       <parameter name="func" type="GnomeThemeFileSectionFunc"/>
-                                       <parameter name="user_data" type="gpointer"/>
-                               </parameters>
-                       </method>
-                       <method name="free" symbol="gnome_theme_file_free">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="df" type="GnomeThemeFile*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_integer" symbol="gnome_theme_file_get_integer">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="df" type="GnomeThemeFile*"/>
-                                       <parameter name="section" type="char*"/>
-                                       <parameter name="keyname" type="char*"/>
-                                       <parameter name="val" type="int*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_locale_string" symbol="gnome_theme_file_get_locale_string">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="df" type="GnomeThemeFile*"/>
-                                       <parameter name="section" type="char*"/>
-                                       <parameter name="keyname" type="char*"/>
-                                       <parameter name="val" type="char**"/>
-                               </parameters>
-                       </method>
-                       <method name="get_raw" symbol="gnome_theme_file_get_raw">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="df" type="GnomeThemeFile*"/>
-                                       <parameter name="section" type="char*"/>
-                                       <parameter name="keyname" type="char*"/>
-                                       <parameter name="locale" type="char*"/>
-                                       <parameter name="val" type="char**"/>
-                               </parameters>
-                       </method>
-                       <method name="get_string" symbol="gnome_theme_file_get_string">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="df" type="GnomeThemeFile*"/>
-                                       <parameter name="section" type="char*"/>
-                                       <parameter name="keyname" type="char*"/>
-                                       <parameter name="val" type="char**"/>
-                               </parameters>
-                       </method>
-                       <method name="new_from_string" symbol="gnome_theme_file_new_from_string">
-                               <return-type type="GnomeThemeFile*"/>
-                               <parameters>
-                                       <parameter name="data" type="char*"/>
-                                       <parameter name="error" type="GError**"/>
-                               </parameters>
-                       </method>
-                       <method name="parse_error_quark" symbol="gnome_theme_file_parse_error_quark">
-                               <return-type type="GQuark"/>
-                       </method>
-                       <method name="to_string" symbol="gnome_theme_file_to_string">
-                               <return-type type="char*"/>
-                               <parameters>
-                                       <parameter name="df" type="GnomeThemeFile*"/>
-                               </parameters>
-                       </method>
-               </struct>
-               <struct name="GnomeUIBuilderData">
-                       <field name="connect_func" type="GnomeUISignalConnectFunc"/>
-                       <field name="data" type="gpointer"/>
-                       <field name="is_interp" type="gboolean"/>
-                       <field name="relay_func" type="GtkCallbackMarshal"/>
-                       <field name="destroy_func" type="GtkDestroyNotify"/>
-               </struct>
-               <struct name="GnomeUIInfo">
-                       <field name="type" type="GnomeUIInfoType"/>
-                       <field name="label" type="gchar*"/>
-                       <field name="hint" type="gchar*"/>
-                       <field name="moreinfo" type="gpointer"/>
-                       <field name="user_data" type="gpointer"/>
-                       <field name="unused_data" type="gpointer"/>
-                       <field name="pixmap_type" type="GnomeUIPixmapType"/>
-                       <field name="pixmap_info" type="gconstpointer"/>
-                       <field name="accelerator_key" type="guint"/>
-                       <field name="ac_mods" type="GdkModifierType"/>
-                       <field name="widget" type="GtkWidget*"/>
+               <struct name="GnomeUIInfo">
+                       <field name="type" type="GnomeUIInfoType"/>
+                       <field name="label" type="gchar*"/>
+                       <field name="hint" type="gchar*"/>
+                       <field name="moreinfo" type="gpointer"/>
+                       <field name="user_data" type="gpointer"/>
+                       <field name="unused_data" type="gpointer"/>
+                       <field name="pixmap_type" type="GnomeUIPixmapType"/>
+                       <field name="pixmap_info" type="gconstpointer"/>
+                       <field name="accelerator_key" type="guint"/>
+                       <field name="ac_mods" type="GdkModifierType"/>
+                       <field name="widget" type="GtkWidget*"/>
                </struct>
                <enum name="GnomeClientState">
                        <member name="GNOME_CLIENT_IDLE" value="0"/>
                        <member name="GNOME_SAVE_LOCAL" value="1"/>
                        <member name="GNOME_SAVE_BOTH" value="2"/>
                </enum>
-               <enum name="GnomeThemeFileParseError">
-                       <member name="GNOME_THEME_FILE_PARSE_ERROR_INVALID_SYNTAX" value="0"/>
-                       <member name="GNOME_THEME_FILE_PARSE_ERROR_INVALID_ESCAPES" value="1"/>
-                       <member name="GNOME_THEME_FILE_PARSE_ERROR_INVALID_CHARS" value="2"/>
-               </enum>
                <enum name="GnomeThumbnailSize">
                        <member name="GNOME_THUMBNAIL_SIZE_NORMAL" value="0"/>
                        <member name="GNOME_THUMBNAIL_SIZE_LARGE" value="1"/>
                        <member name="GNOME_ICON_LOOKUP_RESULT_FLAGS_NONE" value="0"/>
                        <member name="GNOME_ICON_LOOKUP_RESULT_FLAGS_THUMBNAIL" value="1"/>
                </flags>
-               <object name="GnomeAbout" parent="GtkDialog" type-name="GnomeAbout" get-type="gnome_about_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <method name="construct" symbol="gnome_about_construct">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="about" type="GnomeAbout*"/>
-                                       <parameter name="name" type="gchar*"/>
-                                       <parameter name="version" type="gchar*"/>
-                                       <parameter name="copyright" type="gchar*"/>
-                                       <parameter name="comments" type="gchar*"/>
-                                       <parameter name="authors" type="gchar**"/>
-                                       <parameter name="documenters" type="gchar**"/>
-                                       <parameter name="translator_credits" type="gchar*"/>
-                                       <parameter name="logo_pixbuf" type="GdkPixbuf*"/>
-                               </parameters>
-                       </method>
-                       <constructor name="new" symbol="gnome_about_new">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="name" type="gchar*"/>
-                                       <parameter name="version" type="gchar*"/>
-                                       <parameter name="copyright" type="gchar*"/>
-                                       <parameter name="comments" type="gchar*"/>
-                                       <parameter name="authors" type="gchar**"/>
-                                       <parameter name="documenters" type="gchar**"/>
-                                       <parameter name="translator_credits" type="gchar*"/>
-                                       <parameter name="logo_pixbuf" type="GdkPixbuf*"/>
-                               </parameters>
-                       </constructor>
-                       <property name="authors" type="GValueArray*" readable="0" writable="1" construct="0" construct-only="0"/>
-                       <property name="comments" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="copyright" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="documenters" type="GValueArray*" readable="0" writable="1" construct="0" construct-only="0"/>
-                       <property name="logo" type="GdkPixbuf*" readable="0" writable="1" construct="0" construct-only="0"/>
-                       <property name="name" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="translator-credits" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="version" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-               </object>
                <object name="GnomeApp" parent="GtkWindow" type-name="GnomeApp" get-type="gnome_app_get_type">
                        <implements>
                                <interface name="AtkImplementor"/>
                                        <parameter name="enable" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="error" symbol="gnome_app_error">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="app" type="GnomeApp*"/>
-                                       <parameter name="error" type="gchar*"/>
-                               </parameters>
-                       </method>
                        <method name="fill_menu" symbol="gnome_app_fill_menu">
                                <return-type type="void"/>
                                <parameters>
                                        <parameter name="pos" type="gint*"/>
                                </parameters>
                        </method>
-                       <method name="flash" symbol="gnome_app_flash">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="app" type="GnomeApp*"/>
-                                       <parameter name="flash" type="gchar*"/>
-                               </parameters>
-                       </method>
                        <method name="get_dock" symbol="gnome_app_get_dock">
                                <return-type type="BonoboDock*"/>
                                <parameters>
                                        <parameter name="uiinfo" type="GnomeUIInfo*"/>
                                </parameters>
                        </method>
-                       <method name="message" symbol="gnome_app_message">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="app" type="GnomeApp*"/>
-                                       <parameter name="message" type="gchar*"/>
-                               </parameters>
-                       </method>
                        <constructor name="new" symbol="gnome_app_new">
                                <return-type type="GtkWidget*"/>
                                <parameters>
                                        <parameter name="title" type="gchar*"/>
                                </parameters>
                        </constructor>
-                       <method name="ok_cancel" symbol="gnome_app_ok_cancel">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="app" type="GnomeApp*"/>
-                                       <parameter name="message" type="gchar*"/>
-                                       <parameter name="callback" type="GnomeReplyCallback"/>
-                                       <parameter name="data" type="gpointer"/>
-                               </parameters>
-                       </method>
-                       <method name="ok_cancel_modal" symbol="gnome_app_ok_cancel_modal">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="app" type="GnomeApp*"/>
-                                       <parameter name="message" type="gchar*"/>
-                                       <parameter name="callback" type="GnomeReplyCallback"/>
-                                       <parameter name="data" type="gpointer"/>
-                               </parameters>
-                       </method>
-                       <method name="progress_done" symbol="gnome_app_progress_done">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="key" type="GnomeAppProgressKey"/>
-                               </parameters>
-                       </method>
-                       <method name="progress_manual" symbol="gnome_app_progress_manual">
-                               <return-type type="GnomeAppProgressKey"/>
-                               <parameters>
-                                       <parameter name="app" type="GnomeApp*"/>
-                                       <parameter name="description" type="gchar*"/>
-                                       <parameter name="cancel_cb" type="GnomeAppProgressCancelFunc"/>
-                                       <parameter name="data" type="gpointer"/>
-                               </parameters>
-                       </method>
-                       <method name="progress_timeout" symbol="gnome_app_progress_timeout">
-                               <return-type type="GnomeAppProgressKey"/>
-                               <parameters>
-                                       <parameter name="app" type="GnomeApp*"/>
-                                       <parameter name="description" type="gchar*"/>
-                                       <parameter name="interval" type="guint32"/>
-                                       <parameter name="percentage_cb" type="GnomeAppProgressFunc"/>
-                                       <parameter name="cancel_cb" type="GnomeAppProgressCancelFunc"/>
-                                       <parameter name="data" type="gpointer"/>
-                               </parameters>
-                       </method>
-                       <method name="question" symbol="gnome_app_question">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="app" type="GnomeApp*"/>
-                                       <parameter name="question" type="gchar*"/>
-                                       <parameter name="callback" type="GnomeReplyCallback"/>
-                                       <parameter name="data" type="gpointer"/>
-                               </parameters>
-                       </method>
-                       <method name="question_modal" symbol="gnome_app_question_modal">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="app" type="GnomeApp*"/>
-                                       <parameter name="question" type="gchar*"/>
-                                       <parameter name="callback" type="GnomeReplyCallback"/>
-                                       <parameter name="data" type="gpointer"/>
-                               </parameters>
-                       </method>
                        <method name="remove_menu_range" symbol="gnome_app_remove_menu_range">
                                <return-type type="void"/>
                                <parameters>
                                        <parameter name="items" type="gint"/>
                                </parameters>
                        </method>
-                       <method name="request_password" symbol="gnome_app_request_password">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="app" type="GnomeApp*"/>
-                                       <parameter name="prompt" type="gchar*"/>
-                                       <parameter name="callback" type="GnomeStringCallback"/>
-                                       <parameter name="data" type="gpointer"/>
-                               </parameters>
-                       </method>
-                       <method name="request_string" symbol="gnome_app_request_string">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="app" type="GnomeApp*"/>
-                                       <parameter name="prompt" type="gchar*"/>
-                                       <parameter name="callback" type="GnomeStringCallback"/>
-                                       <parameter name="data" type="gpointer"/>
-                               </parameters>
-                       </method>
                        <method name="set_contents" symbol="gnome_app_set_contents">
                                <return-type type="void"/>
                                <parameters>
                                        <parameter name="menubar" type="GtkMenuBar*"/>
                                </parameters>
                        </method>
-                       <method name="set_progress" symbol="gnome_app_set_progress">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="key" type="GnomeAppProgressKey"/>
-                                       <parameter name="percent" type="gdouble"/>
-                               </parameters>
-                       </method>
                        <method name="set_statusbar" symbol="gnome_app_set_statusbar">
                                <return-type type="void"/>
                                <parameters>
                                        <parameter name="uiinfo" type="GnomeUIInfo*"/>
                                </parameters>
                        </method>
-                       <method name="warning" symbol="gnome_app_warning">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="app" type="GnomeApp*"/>
-                                       <parameter name="warning" type="gchar*"/>
-                               </parameters>
-                       </method>
                        <property name="app-id" type="char*" readable="1" writable="1" construct="1" construct-only="0"/>
                        <field name="name" type="gchar*"/>
                        <field name="prefix" type="gchar*"/>
                                        <parameter name="client" type="GnomeClient*"/>
                                </parameters>
                        </method>
-                       <method name="disable_master_connection" symbol="gnome_client_disable_master_connection">
-                               <return-type type="void"/>
-                       </method>
                        <method name="disconnect" symbol="gnome_client_disconnect">
                                <return-type type="void"/>
                                <parameters>
                        <field name="save_yourself_emitted" type="guint"/>
                        <field name="reserved" type="gpointer"/>
                </object>
-               <object name="GnomeColorPicker" parent="GtkButton" type-name="GnomeColorPicker" get-type="gnome_color_picker_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <method name="get_d" symbol="gnome_color_picker_get_d">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="cp" type="GnomeColorPicker*"/>
-                                       <parameter name="r" type="gdouble*"/>
-                                       <parameter name="g" type="gdouble*"/>
-                                       <parameter name="b" type="gdouble*"/>
-                                       <parameter name="a" type="gdouble*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_dither" symbol="gnome_color_picker_get_dither">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="cp" type="GnomeColorPicker*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_i16" symbol="gnome_color_picker_get_i16">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="cp" type="GnomeColorPicker*"/>
-                                       <parameter name="r" type="gushort*"/>
-                                       <parameter name="g" type="gushort*"/>
-                                       <parameter name="b" type="gushort*"/>
-                                       <parameter name="a" type="gushort*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_i8" symbol="gnome_color_picker_get_i8">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="cp" type="GnomeColorPicker*"/>
-                                       <parameter name="r" type="guint8*"/>
-                                       <parameter name="g" type="guint8*"/>
-                                       <parameter name="b" type="guint8*"/>
-                                       <parameter name="a" type="guint8*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_title" symbol="gnome_color_picker_get_title">
-                               <return-type type="char*"/>
-                               <parameters>
-                                       <parameter name="cp" type="GnomeColorPicker*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_use_alpha" symbol="gnome_color_picker_get_use_alpha">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="cp" type="GnomeColorPicker*"/>
-                               </parameters>
-                       </method>
-                       <constructor name="new" symbol="gnome_color_picker_new">
-                               <return-type type="GtkWidget*"/>
-                       </constructor>
-                       <method name="set_d" symbol="gnome_color_picker_set_d">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="cp" type="GnomeColorPicker*"/>
-                                       <parameter name="r" type="gdouble"/>
-                                       <parameter name="g" type="gdouble"/>
-                                       <parameter name="b" type="gdouble"/>
-                                       <parameter name="a" type="gdouble"/>
-                               </parameters>
-                       </method>
-                       <method name="set_dither" symbol="gnome_color_picker_set_dither">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="cp" type="GnomeColorPicker*"/>
-                                       <parameter name="dither" type="gboolean"/>
-                               </parameters>
-                       </method>
-                       <method name="set_i16" symbol="gnome_color_picker_set_i16">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="cp" type="GnomeColorPicker*"/>
-                                       <parameter name="r" type="gushort"/>
-                                       <parameter name="g" type="gushort"/>
-                                       <parameter name="b" type="gushort"/>
-                                       <parameter name="a" type="gushort"/>
-                               </parameters>
-                       </method>
-                       <method name="set_i8" symbol="gnome_color_picker_set_i8">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="cp" type="GnomeColorPicker*"/>
-                                       <parameter name="r" type="guint8"/>
-                                       <parameter name="g" type="guint8"/>
-                                       <parameter name="b" type="guint8"/>
-                                       <parameter name="a" type="guint8"/>
-                               </parameters>
-                       </method>
-                       <method name="set_title" symbol="gnome_color_picker_set_title">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="cp" type="GnomeColorPicker*"/>
-                                       <parameter name="title" type="gchar*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_use_alpha" symbol="gnome_color_picker_set_use_alpha">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="cp" type="GnomeColorPicker*"/>
-                                       <parameter name="use_alpha" type="gboolean"/>
-                               </parameters>
-                       </method>
-                       <property name="alpha" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="blue" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="dither" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="green" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="red" type="guint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="title" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="use-alpha" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <signal name="color-set" when="FIRST">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="cp" type="GnomeColorPicker*"/>
-                                       <parameter name="r" type="guint"/>
-                                       <parameter name="g" type="guint"/>
-                                       <parameter name="b" type="guint"/>
-                                       <parameter name="a" type="guint"/>
-                               </parameters>
-                       </signal>
-               </object>
                <object name="GnomeDateEdit" parent="GtkHBox" type-name="GnomeDateEdit" get-type="gnome_date_edit_get_type">
                        <implements>
                                <interface name="AtkImplementor"/>
                                        <parameter name="flags" type="GnomeDateEditFlags"/>
                                </parameters>
                        </method>
-                       <method name="get_date" symbol="gnome_date_edit_get_date">
-                               <return-type type="time_t"/>
-                               <parameters>
-                                       <parameter name="gde" type="GnomeDateEdit*"/>
-                               </parameters>
-                       </method>
                        <method name="get_flags" symbol="gnome_date_edit_get_flags">
                                <return-type type="int"/>
                                <parameters>
                                </parameters>
                        </signal>
                </object>
-               <object name="GnomeDialog" parent="GtkWindow" type-name="GnomeDialog" get-type="gnome_dialog_get_type">
+               <object name="GnomeIconEntry" parent="GtkVBox" type-name="GnomeIconEntry" get-type="gnome_icon_entry_get_type">
                        <implements>
                                <interface name="AtkImplementor"/>
                                <interface name="GtkBuildable"/>
                        </implements>
-                       <method name="append_button" symbol="gnome_dialog_append_button">
+                       <method name="construct" symbol="gnome_icon_entry_construct">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="dialog" type="GnomeDialog*"/>
-                                       <parameter name="button_name" type="gchar*"/>
+                                       <parameter name="ientry" type="GnomeIconEntry*"/>
+                                       <parameter name="history_id" type="gchar*"/>
+                                       <parameter name="browse_dialog_title" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="append_button_with_pixmap" symbol="gnome_dialog_append_button_with_pixmap">
-                               <return-type type="void"/>
+                       <method name="get_filename" symbol="gnome_icon_entry_get_filename">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="dialog" type="GnomeDialog*"/>
-                                       <parameter name="button_name" type="gchar*"/>
-                                       <parameter name="pixmap_name" type="gchar*"/>
+                                       <parameter name="ientry" type="GnomeIconEntry*"/>
                                </parameters>
                        </method>
-                       <method name="append_buttons" symbol="gnome_dialog_append_buttons">
-                               <return-type type="void"/>
+                       <method name="gnome_entry" symbol="gnome_icon_entry_gnome_entry">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="dialog" type="GnomeDialog*"/>
-                                       <parameter name="first" type="gchar*"/>
+                                       <parameter name="ientry" type="GnomeIconEntry*"/>
                                </parameters>
                        </method>
-                       <method name="append_buttons_with_pixmaps" symbol="gnome_dialog_append_buttons_with_pixmaps">
-                               <return-type type="void"/>
+                       <method name="gnome_file_entry" symbol="gnome_icon_entry_gnome_file_entry">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="dialog" type="GnomeDialog*"/>
-                                       <parameter name="names" type="gchar**"/>
-                                       <parameter name="pixmaps" type="gchar**"/>
+                                       <parameter name="ientry" type="GnomeIconEntry*"/>
                                </parameters>
                        </method>
-                       <method name="append_buttonsv" symbol="gnome_dialog_append_buttonsv">
-                               <return-type type="void"/>
+                       <method name="gtk_entry" symbol="gnome_icon_entry_gtk_entry">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="dialog" type="GnomeDialog*"/>
-                                       <parameter name="buttons" type="gchar**"/>
+                                       <parameter name="ientry" type="GnomeIconEntry*"/>
                                </parameters>
                        </method>
-                       <method name="button_connect" symbol="gnome_dialog_button_connect">
-                               <return-type type="void"/>
+                       <constructor name="new" symbol="gnome_icon_entry_new">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="dialog" type="GnomeDialog*"/>
-                                       <parameter name="button" type="gint"/>
-                                       <parameter name="callback" type="GCallback"/>
-                                       <parameter name="data" type="gpointer"/>
+                                       <parameter name="history_id" type="gchar*"/>
+                                       <parameter name="browse_dialog_title" type="gchar*"/>
                                </parameters>
-                       </method>
-                       <method name="button_connect_object" symbol="gnome_dialog_button_connect_object">
-                               <return-type type="void"/>
+                       </constructor>
+                       <method name="pick_dialog" symbol="gnome_icon_entry_pick_dialog">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="dialog" type="GnomeDialog*"/>
-                                       <parameter name="button" type="gint"/>
-                                       <parameter name="callback" type="GCallback"/>
-                                       <parameter name="obj" type="GtkObject*"/>
+                                       <parameter name="ientry" type="GnomeIconEntry*"/>
                                </parameters>
                        </method>
-                       <method name="close" symbol="gnome_dialog_close">
+                       <method name="set_browse_dialog_title" symbol="gnome_icon_entry_set_browse_dialog_title">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="dialog" type="GnomeDialog*"/>
+                                       <parameter name="ientry" type="GnomeIconEntry*"/>
+                                       <parameter name="browse_dialog_title" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="close_hides" symbol="gnome_dialog_close_hides">
-                               <return-type type="void"/>
+                       <method name="set_filename" symbol="gnome_icon_entry_set_filename">
+                               <return-type type="gboolean"/>
                                <parameters>
-                                       <parameter name="dialog" type="GnomeDialog*"/>
-                                       <parameter name="just_hide" type="gboolean"/>
+                                       <parameter name="ientry" type="GnomeIconEntry*"/>
+                                       <parameter name="filename" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="construct" symbol="gnome_dialog_construct">
+                       <method name="set_history_id" symbol="gnome_icon_entry_set_history_id">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="dialog" type="GnomeDialog*"/>
-                                       <parameter name="title" type="gchar*"/>
-                                       <parameter name="ap" type="va_list"/>
+                                       <parameter name="ientry" type="GnomeIconEntry*"/>
+                                       <parameter name="history_id" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="constructv" symbol="gnome_dialog_constructv">
+                       <method name="set_icon" symbol="gnome_icon_entry_set_icon">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="dialog" type="GnomeDialog*"/>
-                                       <parameter name="title" type="gchar*"/>
-                                       <parameter name="buttons" type="gchar**"/>
-                               </parameters>
-                       </method>
-                       <method name="editable_enters" symbol="gnome_dialog_editable_enters">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="dialog" type="GnomeDialog*"/>
-                                       <parameter name="editable" type="GtkEditable*"/>
-                               </parameters>
-                       </method>
-                       <method name="grab_focus" symbol="gnome_dialog_grab_focus">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="dialog" type="GnomeDialog*"/>
-                                       <parameter name="button" type="gint"/>
-                               </parameters>
-                       </method>
-                       <constructor name="new" symbol="gnome_dialog_new">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="title" type="gchar*"/>
-                               </parameters>
-                       </constructor>
-                       <constructor name="newv" symbol="gnome_dialog_newv">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="title" type="gchar*"/>
-                                       <parameter name="buttons" type="gchar**"/>
-                               </parameters>
-                       </constructor>
-                       <method name="run" symbol="gnome_dialog_run">
-                               <return-type type="gint"/>
-                               <parameters>
-                                       <parameter name="dialog" type="GnomeDialog*"/>
-                               </parameters>
-                       </method>
-                       <method name="run_and_close" symbol="gnome_dialog_run_and_close">
-                               <return-type type="gint"/>
-                               <parameters>
-                                       <parameter name="dialog" type="GnomeDialog*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_accelerator" symbol="gnome_dialog_set_accelerator">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="dialog" type="GnomeDialog*"/>
-                                       <parameter name="button" type="gint"/>
-                                       <parameter name="accelerator_key" type="guchar"/>
-                                       <parameter name="accelerator_mods" type="guint8"/>
-                               </parameters>
-                       </method>
-                       <method name="set_close" symbol="gnome_dialog_set_close">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="dialog" type="GnomeDialog*"/>
-                                       <parameter name="click_closes" type="gboolean"/>
-                               </parameters>
-                       </method>
-                       <method name="set_default" symbol="gnome_dialog_set_default">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="dialog" type="GnomeDialog*"/>
-                                       <parameter name="button" type="gint"/>
-                               </parameters>
-                       </method>
-                       <method name="set_parent" symbol="gnome_dialog_set_parent">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="dialog" type="GnomeDialog*"/>
-                                       <parameter name="parent" type="GtkWindow*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_sensitive" symbol="gnome_dialog_set_sensitive">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="dialog" type="GnomeDialog*"/>
-                                       <parameter name="button" type="gint"/>
-                                       <parameter name="setting" type="gboolean"/>
-                               </parameters>
-                       </method>
-                       <signal name="clicked" when="LAST">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="dialog" type="GnomeDialog*"/>
-                                       <parameter name="button_number" type="gint"/>
-                               </parameters>
-                       </signal>
-                       <signal name="close" when="LAST">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="dialog" type="GnomeDialog*"/>
-                               </parameters>
-                       </signal>
-                       <field name="vbox" type="GtkWidget*"/>
-                       <field name="buttons" type="GList*"/>
-                       <field name="action_area" type="GtkWidget*"/>
-                       <field name="accelerators" type="GtkAccelGroup*"/>
-                       <field name="click_closes" type="unsigned"/>
-                       <field name="just_hide" type="unsigned"/>
-               </object>
-               <object name="GnomeDruid" parent="GtkContainer" type-name="GnomeDruid" get-type="gnome_druid_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <method name="append_page" symbol="gnome_druid_append_page">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="druid" type="GnomeDruid*"/>
-                                       <parameter name="page" type="GnomeDruidPage*"/>
-                               </parameters>
-                       </method>
-                       <method name="construct_with_window" symbol="gnome_druid_construct_with_window">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="druid" type="GnomeDruid*"/>
-                                       <parameter name="title" type="char*"/>
-                                       <parameter name="parent" type="GtkWindow*"/>
-                                       <parameter name="close_on_cancel" type="gboolean"/>
-                                       <parameter name="window" type="GtkWidget**"/>
-                               </parameters>
-                       </method>
-                       <method name="insert_page" symbol="gnome_druid_insert_page">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="druid" type="GnomeDruid*"/>
-                                       <parameter name="back_page" type="GnomeDruidPage*"/>
-                                       <parameter name="page" type="GnomeDruidPage*"/>
-                               </parameters>
-                       </method>
-                       <constructor name="new" symbol="gnome_druid_new">
-                               <return-type type="GtkWidget*"/>
-                       </constructor>
-                       <constructor name="new_with_window" symbol="gnome_druid_new_with_window">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="title" type="char*"/>
-                                       <parameter name="parent" type="GtkWindow*"/>
-                                       <parameter name="close_on_cancel" type="gboolean"/>
-                                       <parameter name="window" type="GtkWidget**"/>
-                               </parameters>
-                       </constructor>
-                       <method name="prepend_page" symbol="gnome_druid_prepend_page">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="druid" type="GnomeDruid*"/>
-                                       <parameter name="page" type="GnomeDruidPage*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_buttons_sensitive" symbol="gnome_druid_set_buttons_sensitive">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="druid" type="GnomeDruid*"/>
-                                       <parameter name="back_sensitive" type="gboolean"/>
-                                       <parameter name="next_sensitive" type="gboolean"/>
-                                       <parameter name="cancel_sensitive" type="gboolean"/>
-                                       <parameter name="help_sensitive" type="gboolean"/>
-                               </parameters>
-                       </method>
-                       <method name="set_page" symbol="gnome_druid_set_page">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="druid" type="GnomeDruid*"/>
-                                       <parameter name="page" type="GnomeDruidPage*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_show_finish" symbol="gnome_druid_set_show_finish">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="druid" type="GnomeDruid*"/>
-                                       <parameter name="show_finish" type="gboolean"/>
-                               </parameters>
-                       </method>
-                       <method name="set_show_help" symbol="gnome_druid_set_show_help">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="druid" type="GnomeDruid*"/>
-                                       <parameter name="show_help" type="gboolean"/>
-                               </parameters>
-                       </method>
-                       <property name="show-finish" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="show-help" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <signal name="cancel" when="LAST">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="druid" type="GnomeDruid*"/>
-                               </parameters>
-                       </signal>
-                       <signal name="help" when="LAST">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="druid" type="GnomeDruid*"/>
-                               </parameters>
-                       </signal>
-                       <field name="help" type="GtkWidget*"/>
-                       <field name="back" type="GtkWidget*"/>
-                       <field name="next" type="GtkWidget*"/>
-                       <field name="cancel" type="GtkWidget*"/>
-                       <field name="finish" type="GtkWidget*"/>
-               </object>
-               <object name="GnomeDruidPage" parent="GtkBin" type-name="GnomeDruidPage" get-type="gnome_druid_page_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <method name="back" symbol="gnome_druid_page_back">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="druid_page" type="GnomeDruidPage*"/>
-                               </parameters>
-                       </method>
-                       <method name="cancel" symbol="gnome_druid_page_cancel">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="druid_page" type="GnomeDruidPage*"/>
-                               </parameters>
-                       </method>
-                       <method name="finish" symbol="gnome_druid_page_finish">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="druid_page" type="GnomeDruidPage*"/>
-                               </parameters>
-                       </method>
-                       <constructor name="new" symbol="gnome_druid_page_new">
-                               <return-type type="GtkWidget*"/>
-                       </constructor>
-                       <method name="next" symbol="gnome_druid_page_next">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="druid_page" type="GnomeDruidPage*"/>
-                               </parameters>
-                       </method>
-                       <method name="prepare" symbol="gnome_druid_page_prepare">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="druid_page" type="GnomeDruidPage*"/>
-                               </parameters>
-                       </method>
-                       <signal name="back" when="LAST">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="druid_page" type="GnomeDruidPage*"/>
-                                       <parameter name="druid" type="GtkWidget*"/>
-                               </parameters>
-                       </signal>
-                       <signal name="cancel" when="LAST">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="druid_page" type="GnomeDruidPage*"/>
-                                       <parameter name="druid" type="GtkWidget*"/>
-                               </parameters>
-                       </signal>
-                       <signal name="finish" when="LAST">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="druid_page" type="GnomeDruidPage*"/>
-                                       <parameter name="druid" type="GtkWidget*"/>
-                               </parameters>
-                       </signal>
-                       <signal name="next" when="LAST">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="druid_page" type="GnomeDruidPage*"/>
-                                       <parameter name="druid" type="GtkWidget*"/>
-                               </parameters>
-                       </signal>
-                       <signal name="prepare" when="LAST">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="druid_page" type="GnomeDruidPage*"/>
-                                       <parameter name="druid" type="GtkWidget*"/>
-                               </parameters>
-                       </signal>
-                       <vfunc name="configure_canvas">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="druid_page" type="GnomeDruidPage*"/>
-                               </parameters>
-                       </vfunc>
-                       <vfunc name="set_sidebar_shown">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="druid_page" type="GnomeDruidPage*"/>
-                                       <parameter name="sidebar_shown" type="gboolean"/>
-                               </parameters>
-                       </vfunc>
-               </object>
-               <object name="GnomeDruidPageEdge" parent="GnomeDruidPage" type-name="GnomeDruidPageEdge" get-type="gnome_druid_page_edge_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <method name="construct" symbol="gnome_druid_page_edge_construct">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="druid_page_edge" type="GnomeDruidPageEdge*"/>
-                                       <parameter name="position" type="GnomeEdgePosition"/>
-                                       <parameter name="antialiased" type="gboolean"/>
-                                       <parameter name="title" type="gchar*"/>
-                                       <parameter name="text" type="gchar*"/>
-                                       <parameter name="logo" type="GdkPixbuf*"/>
-                                       <parameter name="watermark" type="GdkPixbuf*"/>
-                                       <parameter name="top_watermark" type="GdkPixbuf*"/>
-                               </parameters>
-                       </method>
-                       <constructor name="new" symbol="gnome_druid_page_edge_new">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="position" type="GnomeEdgePosition"/>
-                               </parameters>
-                       </constructor>
-                       <constructor name="new_aa" symbol="gnome_druid_page_edge_new_aa">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="position" type="GnomeEdgePosition"/>
-                               </parameters>
-                       </constructor>
-                       <constructor name="new_with_vals" symbol="gnome_druid_page_edge_new_with_vals">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="position" type="GnomeEdgePosition"/>
-                                       <parameter name="antialiased" type="gboolean"/>
-                                       <parameter name="title" type="gchar*"/>
-                                       <parameter name="text" type="gchar*"/>
-                                       <parameter name="logo" type="GdkPixbuf*"/>
-                                       <parameter name="watermark" type="GdkPixbuf*"/>
-                                       <parameter name="top_watermark" type="GdkPixbuf*"/>
-                               </parameters>
-                       </constructor>
-                       <method name="set_bg_color" symbol="gnome_druid_page_edge_set_bg_color">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="druid_page_edge" type="GnomeDruidPageEdge*"/>
-                                       <parameter name="color" type="GdkColor*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_logo" symbol="gnome_druid_page_edge_set_logo">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="druid_page_edge" type="GnomeDruidPageEdge*"/>
-                                       <parameter name="logo_image" type="GdkPixbuf*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_logo_bg_color" symbol="gnome_druid_page_edge_set_logo_bg_color">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="druid_page_edge" type="GnomeDruidPageEdge*"/>
-                                       <parameter name="color" type="GdkColor*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_text" symbol="gnome_druid_page_edge_set_text">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="druid_page_edge" type="GnomeDruidPageEdge*"/>
-                                       <parameter name="text" type="gchar*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_text_color" symbol="gnome_druid_page_edge_set_text_color">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="druid_page_edge" type="GnomeDruidPageEdge*"/>
-                                       <parameter name="color" type="GdkColor*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_textbox_color" symbol="gnome_druid_page_edge_set_textbox_color">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="druid_page_edge" type="GnomeDruidPageEdge*"/>
-                                       <parameter name="color" type="GdkColor*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_title" symbol="gnome_druid_page_edge_set_title">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="druid_page_edge" type="GnomeDruidPageEdge*"/>
-                                       <parameter name="title" type="gchar*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_title_color" symbol="gnome_druid_page_edge_set_title_color">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="druid_page_edge" type="GnomeDruidPageEdge*"/>
-                                       <parameter name="color" type="GdkColor*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_top_watermark" symbol="gnome_druid_page_edge_set_top_watermark">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="druid_page_edge" type="GnomeDruidPageEdge*"/>
-                                       <parameter name="top_watermark_image" type="GdkPixbuf*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_watermark" symbol="gnome_druid_page_edge_set_watermark">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="druid_page_edge" type="GnomeDruidPageEdge*"/>
-                                       <parameter name="watermark" type="GdkPixbuf*"/>
-                               </parameters>
-                       </method>
-                       <field name="title" type="gchar*"/>
-                       <field name="text" type="gchar*"/>
-                       <field name="logo_image" type="GdkPixbuf*"/>
-                       <field name="watermark_image" type="GdkPixbuf*"/>
-                       <field name="top_watermark_image" type="GdkPixbuf*"/>
-                       <field name="background_color" type="GdkColor"/>
-                       <field name="textbox_color" type="GdkColor"/>
-                       <field name="logo_background_color" type="GdkColor"/>
-                       <field name="title_color" type="GdkColor"/>
-                       <field name="text_color" type="GdkColor"/>
-                       <field name="position" type="guint"/>
-               </object>
-               <object name="GnomeDruidPageStandard" parent="GnomeDruidPage" type-name="GnomeDruidPageStandard" get-type="gnome_druid_page_standard_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <method name="append_item" symbol="gnome_druid_page_standard_append_item">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="druid_page_standard" type="GnomeDruidPageStandard*"/>
-                                       <parameter name="question" type="gchar*"/>
-                                       <parameter name="item" type="GtkWidget*"/>
-                                       <parameter name="additional_info" type="gchar*"/>
-                               </parameters>
-                       </method>
-                       <constructor name="new" symbol="gnome_druid_page_standard_new">
-                               <return-type type="GtkWidget*"/>
-                       </constructor>
-                       <constructor name="new_with_vals" symbol="gnome_druid_page_standard_new_with_vals">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="title" type="gchar*"/>
-                                       <parameter name="logo" type="GdkPixbuf*"/>
-                                       <parameter name="top_watermark" type="GdkPixbuf*"/>
-                               </parameters>
-                       </constructor>
-                       <method name="set_background" symbol="gnome_druid_page_standard_set_background">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="druid_page_standard" type="GnomeDruidPageStandard*"/>
-                                       <parameter name="color" type="GdkColor*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_contents_background" symbol="gnome_druid_page_standard_set_contents_background">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="druid_page_standard" type="GnomeDruidPageStandard*"/>
-                                       <parameter name="color" type="GdkColor*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_logo" symbol="gnome_druid_page_standard_set_logo">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="druid_page_standard" type="GnomeDruidPageStandard*"/>
-                                       <parameter name="logo_image" type="GdkPixbuf*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_logo_background" symbol="gnome_druid_page_standard_set_logo_background">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="druid_page_standard" type="GnomeDruidPageStandard*"/>
-                                       <parameter name="color" type="GdkColor*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_title" symbol="gnome_druid_page_standard_set_title">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="druid_page_standard" type="GnomeDruidPageStandard*"/>
-                                       <parameter name="title" type="gchar*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_title_foreground" symbol="gnome_druid_page_standard_set_title_foreground">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="druid_page_standard" type="GnomeDruidPageStandard*"/>
-                                       <parameter name="color" type="GdkColor*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_top_watermark" symbol="gnome_druid_page_standard_set_top_watermark">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="druid_page_standard" type="GnomeDruidPageStandard*"/>
-                                       <parameter name="top_watermark_image" type="GdkPixbuf*"/>
-                               </parameters>
-                       </method>
-                       <property name="background" type="char*" readable="0" writable="1" construct="0" construct-only="0"/>
-                       <property name="background-gdk" type="GdkColor*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="background-set" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="contents-background" type="char*" readable="0" writable="1" construct="0" construct-only="0"/>
-                       <property name="contents-background-gdk" type="GdkColor*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="contents-background-set" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="logo" type="GdkPixbuf*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="logo-background" type="char*" readable="0" writable="1" construct="0" construct-only="0"/>
-                       <property name="logo-background-gdk" type="GdkColor*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="logo-background-set" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="title" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="title-foreground" type="char*" readable="0" writable="1" construct="0" construct-only="0"/>
-                       <property name="title-foreground-gdk" type="GdkColor*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="title-foreground-set" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="top-watermark" type="GdkPixbuf*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <field name="vbox" type="GtkWidget*"/>
-                       <field name="title" type="gchar*"/>
-                       <field name="logo" type="GdkPixbuf*"/>
-                       <field name="top_watermark" type="GdkPixbuf*"/>
-                       <field name="title_foreground" type="GdkColor"/>
-                       <field name="background" type="GdkColor"/>
-                       <field name="logo_background" type="GdkColor"/>
-                       <field name="contents_background" type="GdkColor"/>
-               </object>
-               <object name="GnomeEntry" parent="GtkCombo" type-name="GnomeEntry" get-type="gnome_entry_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                               <interface name="GtkEditable"/>
-                       </implements>
-                       <method name="append_history" symbol="gnome_entry_append_history">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="gentry" type="GnomeEntry*"/>
-                                       <parameter name="save" type="gboolean"/>
-                                       <parameter name="text" type="gchar*"/>
-                               </parameters>
-                       </method>
-                       <method name="clear_history" symbol="gnome_entry_clear_history">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="gentry" type="GnomeEntry*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_history_id" symbol="gnome_entry_get_history_id">
-                               <return-type type="gchar*"/>
-                               <parameters>
-                                       <parameter name="gentry" type="GnomeEntry*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_max_saved" symbol="gnome_entry_get_max_saved">
-                               <return-type type="guint"/>
-                               <parameters>
-                                       <parameter name="gentry" type="GnomeEntry*"/>
-                               </parameters>
-                       </method>
-                       <method name="gtk_entry" symbol="gnome_entry_gtk_entry">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="gentry" type="GnomeEntry*"/>
-                               </parameters>
-                       </method>
-                       <constructor name="new" symbol="gnome_entry_new">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="history_id" type="gchar*"/>
-                               </parameters>
-                       </constructor>
-                       <method name="prepend_history" symbol="gnome_entry_prepend_history">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="gentry" type="GnomeEntry*"/>
-                                       <parameter name="save" type="gboolean"/>
-                                       <parameter name="text" type="gchar*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_history_id" symbol="gnome_entry_set_history_id">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="gentry" type="GnomeEntry*"/>
-                                       <parameter name="history_id" type="gchar*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_max_saved" symbol="gnome_entry_set_max_saved">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="gentry" type="GnomeEntry*"/>
-                                       <parameter name="max_saved" type="guint"/>
-                               </parameters>
-                       </method>
-                       <property name="gtk-entry" type="GtkEntry*" readable="1" writable="0" construct="0" construct-only="0"/>
-                       <property name="history-id" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <signal name="activate" when="LAST">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="entry" type="GnomeEntry*"/>
-                               </parameters>
-                       </signal>
-               </object>
-               <object name="GnomeFileEntry" parent="GtkVBox" type-name="GnomeFileEntry" get-type="gnome_file_entry_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                               <interface name="GtkEditable"/>
-                       </implements>
-                       <method name="construct" symbol="gnome_file_entry_construct">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="fentry" type="GnomeFileEntry*"/>
-                                       <parameter name="history_id" type="char*"/>
-                                       <parameter name="browse_dialog_title" type="char*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_directory_entry" symbol="gnome_file_entry_get_directory_entry">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="fentry" type="GnomeFileEntry*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_full_path" symbol="gnome_file_entry_get_full_path">
-                               <return-type type="char*"/>
-                               <parameters>
-                                       <parameter name="fentry" type="GnomeFileEntry*"/>
-                                       <parameter name="file_must_exist" type="gboolean"/>
-                               </parameters>
-                       </method>
-                       <method name="get_modal" symbol="gnome_file_entry_get_modal">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="fentry" type="GnomeFileEntry*"/>
-                               </parameters>
-                       </method>
-                       <method name="gnome_entry" symbol="gnome_file_entry_gnome_entry">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="fentry" type="GnomeFileEntry*"/>
-                               </parameters>
-                       </method>
-                       <method name="gtk_entry" symbol="gnome_file_entry_gtk_entry">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="fentry" type="GnomeFileEntry*"/>
-                               </parameters>
-                       </method>
-                       <constructor name="new" symbol="gnome_file_entry_new">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="history_id" type="char*"/>
-                                       <parameter name="browse_dialog_title" type="char*"/>
-                               </parameters>
-                       </constructor>
-                       <method name="set_default_path" symbol="gnome_file_entry_set_default_path">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="fentry" type="GnomeFileEntry*"/>
-                                       <parameter name="path" type="char*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_directory" symbol="gnome_file_entry_set_directory">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="fentry" type="GnomeFileEntry*"/>
-                                       <parameter name="directory_entry" type="gboolean"/>
-                               </parameters>
-                       </method>
-                       <method name="set_directory_entry" symbol="gnome_file_entry_set_directory_entry">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="fentry" type="GnomeFileEntry*"/>
-                                       <parameter name="directory_entry" type="gboolean"/>
-                               </parameters>
-                       </method>
-                       <method name="set_filename" symbol="gnome_file_entry_set_filename">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="fentry" type="GnomeFileEntry*"/>
-                                       <parameter name="filename" type="char*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_modal" symbol="gnome_file_entry_set_modal">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="fentry" type="GnomeFileEntry*"/>
-                                       <parameter name="is_modal" type="gboolean"/>
-                               </parameters>
-                       </method>
-                       <method name="set_title" symbol="gnome_file_entry_set_title">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="fentry" type="GnomeFileEntry*"/>
-                                       <parameter name="browse_dialog_title" type="char*"/>
-                               </parameters>
-                       </method>
-                       <property name="browse-dialog-title" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="default-path" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="directory-entry" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="filechooser-action" type="GtkFileChooserAction" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="filename" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="gnome-entry" type="GnomeEntry*" readable="1" writable="0" construct="0" construct-only="0"/>
-                       <property name="gtk-entry" type="GtkEntry*" readable="1" writable="0" construct="0" construct-only="0"/>
-                       <property name="history-id" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="modal" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="use-filechooser" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <signal name="activate" when="LAST">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="fentry" type="GnomeFileEntry*"/>
-                               </parameters>
-                       </signal>
-                       <signal name="browse-clicked" when="LAST">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="fentry" type="GnomeFileEntry*"/>
-                               </parameters>
-                       </signal>
-                       <field name="fsw" type="GtkWidget*"/>
-                       <field name="default_path" type="char*"/>
-               </object>
-               <object name="GnomeFontPicker" parent="GtkButton" type-name="GnomeFontPicker" get-type="gnome_font_picker_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <method name="fi_set_show_size" symbol="gnome_font_picker_fi_set_show_size">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="gfp" type="GnomeFontPicker*"/>
-                                       <parameter name="show_size" type="gboolean"/>
-                               </parameters>
-                       </method>
-                       <method name="fi_set_use_font_in_label" symbol="gnome_font_picker_fi_set_use_font_in_label">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="gfp" type="GnomeFontPicker*"/>
-                                       <parameter name="use_font_in_label" type="gboolean"/>
-                                       <parameter name="size" type="gint"/>
-                               </parameters>
-                       </method>
-                       <method name="get_font" symbol="gnome_font_picker_get_font">
-                               <return-type type="GdkFont*"/>
-                               <parameters>
-                                       <parameter name="gfp" type="GnomeFontPicker*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_font_name" symbol="gnome_font_picker_get_font_name">
-                               <return-type type="gchar*"/>
-                               <parameters>
-                                       <parameter name="gfp" type="GnomeFontPicker*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_mode" symbol="gnome_font_picker_get_mode">
-                               <return-type type="GnomeFontPickerMode"/>
-                               <parameters>
-                                       <parameter name="gfp" type="GnomeFontPicker*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_preview_text" symbol="gnome_font_picker_get_preview_text">
-                               <return-type type="gchar*"/>
-                               <parameters>
-                                       <parameter name="gfp" type="GnomeFontPicker*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_title" symbol="gnome_font_picker_get_title">
-                               <return-type type="gchar*"/>
-                               <parameters>
-                                       <parameter name="gfp" type="GnomeFontPicker*"/>
-                               </parameters>
-                       </method>
-                       <constructor name="new" symbol="gnome_font_picker_new">
-                               <return-type type="GtkWidget*"/>
-                       </constructor>
-                       <method name="set_font_name" symbol="gnome_font_picker_set_font_name">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="gfp" type="GnomeFontPicker*"/>
-                                       <parameter name="fontname" type="gchar*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_mode" symbol="gnome_font_picker_set_mode">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="gfp" type="GnomeFontPicker*"/>
-                                       <parameter name="mode" type="GnomeFontPickerMode"/>
-                               </parameters>
-                       </method>
-                       <method name="set_preview_text" symbol="gnome_font_picker_set_preview_text">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="gfp" type="GnomeFontPicker*"/>
-                                       <parameter name="text" type="gchar*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_title" symbol="gnome_font_picker_set_title">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="gfp" type="GnomeFontPicker*"/>
-                                       <parameter name="title" type="gchar*"/>
-                               </parameters>
-                       </method>
-                       <method name="uw_get_widget" symbol="gnome_font_picker_uw_get_widget">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="gfp" type="GnomeFontPicker*"/>
-                               </parameters>
-                       </method>
-                       <method name="uw_set_widget" symbol="gnome_font_picker_uw_set_widget">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="gfp" type="GnomeFontPicker*"/>
-                                       <parameter name="widget" type="GtkWidget*"/>
-                               </parameters>
-                       </method>
-                       <property name="font" type="gpointer" readable="1" writable="0" construct="0" construct-only="0"/>
-                       <property name="font-name" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="label-font-size" type="gint" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="mode" type="GnomeFontPickerMode" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="preview-text" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="show-size" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="title" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="use-font-in-label" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <signal name="font-set" when="FIRST">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="gfp" type="GnomeFontPicker*"/>
-                                       <parameter name="font_name" type="char*"/>
-                               </parameters>
-                       </signal>
-               </object>
-               <object name="GnomeHRef" parent="GtkButton" type-name="GnomeHRef" get-type="gnome_href_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <method name="get_label" symbol="gnome_href_get_label">
-                               <return-type type="gchar*"/>
-                               <parameters>
-                                       <parameter name="href" type="GnomeHRef*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_text" symbol="gnome_href_get_text">
-                               <return-type type="gchar*"/>
-                               <parameters>
-                                       <parameter name="href" type="GnomeHRef*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_url" symbol="gnome_href_get_url">
-                               <return-type type="gchar*"/>
-                               <parameters>
-                                       <parameter name="href" type="GnomeHRef*"/>
-                               </parameters>
-                       </method>
-                       <constructor name="new" symbol="gnome_href_new">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="url" type="gchar*"/>
-                                       <parameter name="text" type="gchar*"/>
-                               </parameters>
-                       </constructor>
-                       <method name="set_label" symbol="gnome_href_set_label">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="href" type="GnomeHRef*"/>
-                                       <parameter name="label" type="gchar*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_text" symbol="gnome_href_set_text">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="href" type="GnomeHRef*"/>
-                                       <parameter name="text" type="gchar*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_url" symbol="gnome_href_set_url">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="href" type="GnomeHRef*"/>
-                                       <parameter name="url" type="gchar*"/>
-                               </parameters>
-                       </method>
-                       <property name="text" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="url" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-               </object>
-               <object name="GnomeIconEntry" parent="GtkVBox" type-name="GnomeIconEntry" get-type="gnome_icon_entry_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <method name="construct" symbol="gnome_icon_entry_construct">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="ientry" type="GnomeIconEntry*"/>
-                                       <parameter name="history_id" type="gchar*"/>
-                                       <parameter name="browse_dialog_title" type="gchar*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_filename" symbol="gnome_icon_entry_get_filename">
-                               <return-type type="gchar*"/>
-                               <parameters>
-                                       <parameter name="ientry" type="GnomeIconEntry*"/>
-                               </parameters>
-                       </method>
-                       <method name="gnome_entry" symbol="gnome_icon_entry_gnome_entry">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="ientry" type="GnomeIconEntry*"/>
-                               </parameters>
-                       </method>
-                       <method name="gnome_file_entry" symbol="gnome_icon_entry_gnome_file_entry">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="ientry" type="GnomeIconEntry*"/>
-                               </parameters>
-                       </method>
-                       <method name="gtk_entry" symbol="gnome_icon_entry_gtk_entry">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="ientry" type="GnomeIconEntry*"/>
-                               </parameters>
-                       </method>
-                       <constructor name="new" symbol="gnome_icon_entry_new">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="history_id" type="gchar*"/>
-                                       <parameter name="browse_dialog_title" type="gchar*"/>
-                               </parameters>
-                       </constructor>
-                       <method name="pick_dialog" symbol="gnome_icon_entry_pick_dialog">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="ientry" type="GnomeIconEntry*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_browse_dialog_title" symbol="gnome_icon_entry_set_browse_dialog_title">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="ientry" type="GnomeIconEntry*"/>
-                                       <parameter name="browse_dialog_title" type="gchar*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_filename" symbol="gnome_icon_entry_set_filename">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="ientry" type="GnomeIconEntry*"/>
-                                       <parameter name="filename" type="gchar*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_history_id" symbol="gnome_icon_entry_set_history_id">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="ientry" type="GnomeIconEntry*"/>
-                                       <parameter name="history_id" type="gchar*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_icon" symbol="gnome_icon_entry_set_icon">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="ientry" type="GnomeIconEntry*"/>
-                                       <parameter name="filename" type="gchar*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_max_saved" symbol="gnome_icon_entry_set_max_saved">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="ientry" type="GnomeIconEntry*"/>
-                                       <parameter name="max_saved" type="guint"/>
-                               </parameters>
-                       </method>
-                       <method name="set_pixmap_subdir" symbol="gnome_icon_entry_set_pixmap_subdir">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="ientry" type="GnomeIconEntry*"/>
-                                       <parameter name="subdir" type="gchar*"/>
-                               </parameters>
-                       </method>
-                       <property name="browse-dialog-title" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="filename" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="history-id" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <property name="pick-dialog" type="GtkDialog*" readable="1" writable="0" construct="0" construct-only="0"/>
-                       <property name="pixmap-subdir" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
-                       <signal name="browse" when="LAST">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="ientry" type="GnomeIconEntry*"/>
-                               </parameters>
-                       </signal>
-                       <signal name="changed" when="LAST">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="ientry" type="GnomeIconEntry*"/>
-                               </parameters>
-                       </signal>
-               </object>
-               <object name="GnomeIconList" parent="GnomeCanvas" type-name="GnomeIconList" get-type="gnome_icon_list_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <method name="append" symbol="gnome_icon_list_append">
-                               <return-type type="int"/>
-                               <parameters>
-                                       <parameter name="gil" type="GnomeIconList*"/>
-                                       <parameter name="icon_filename" type="char*"/>
-                                       <parameter name="text" type="char*"/>
-                               </parameters>
-                       </method>
-                       <method name="append_pixbuf" symbol="gnome_icon_list_append_pixbuf">
-                               <return-type type="int"/>
-                               <parameters>
-                                       <parameter name="gil" type="GnomeIconList*"/>
-                                       <parameter name="im" type="GdkPixbuf*"/>
-                                       <parameter name="icon_filename" type="char*"/>
-                                       <parameter name="text" type="char*"/>
-                               </parameters>
-                       </method>
-                       <method name="clear" symbol="gnome_icon_list_clear">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="gil" type="GnomeIconList*"/>
-                               </parameters>
-                       </method>
-                       <method name="construct" symbol="gnome_icon_list_construct">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="gil" type="GnomeIconList*"/>
-                                       <parameter name="icon_width" type="guint"/>
-                                       <parameter name="adj" type="GtkAdjustment*"/>
-                                       <parameter name="flags" type="int"/>
-                               </parameters>
-                       </method>
-                       <method name="find_icon_from_data" symbol="gnome_icon_list_find_icon_from_data">
-                               <return-type type="int"/>
-                               <parameters>
-                                       <parameter name="gil" type="GnomeIconList*"/>
-                                       <parameter name="data" type="gpointer"/>
-                               </parameters>
-                       </method>
-                       <method name="find_icon_from_filename" symbol="gnome_icon_list_find_icon_from_filename">
-                               <return-type type="int"/>
-                               <parameters>
-                                       <parameter name="gil" type="GnomeIconList*"/>
-                                       <parameter name="filename" type="char*"/>
-                               </parameters>
-                       </method>
-                       <method name="focus_icon" symbol="gnome_icon_list_focus_icon">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="gil" type="GnomeIconList*"/>
-                                       <parameter name="idx" type="gint"/>
-                               </parameters>
-                       </method>
-                       <method name="freeze" symbol="gnome_icon_list_freeze">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="gil" type="GnomeIconList*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_icon_at" symbol="gnome_icon_list_get_icon_at">
-                               <return-type type="int"/>
-                               <parameters>
-                                       <parameter name="gil" type="GnomeIconList*"/>
-                                       <parameter name="x" type="int"/>
-                                       <parameter name="y" type="int"/>
-                               </parameters>
-                       </method>
-                       <method name="get_icon_data" symbol="gnome_icon_list_get_icon_data">
-                               <return-type type="gpointer"/>
-                               <parameters>
-                                       <parameter name="gil" type="GnomeIconList*"/>
-                                       <parameter name="pos" type="int"/>
-                               </parameters>
-                       </method>
-                       <method name="get_icon_filename" symbol="gnome_icon_list_get_icon_filename">
-                               <return-type type="gchar*"/>
-                               <parameters>
-                                       <parameter name="gil" type="GnomeIconList*"/>
-                                       <parameter name="idx" type="int"/>
-                               </parameters>
-                       </method>
-                       <method name="get_icon_pixbuf_item" symbol="gnome_icon_list_get_icon_pixbuf_item">
-                               <return-type type="GnomeCanvasPixbuf*"/>
-                               <parameters>
-                                       <parameter name="gil" type="GnomeIconList*"/>
-                                       <parameter name="idx" type="int"/>
-                               </parameters>
-                       </method>
-                       <method name="get_icon_text_item" symbol="gnome_icon_list_get_icon_text_item">
-                               <return-type type="GnomeIconTextItem*"/>
-                               <parameters>
-                                       <parameter name="gil" type="GnomeIconList*"/>
-                                       <parameter name="idx" type="int"/>
-                               </parameters>
-                       </method>
-                       <method name="get_items_per_line" symbol="gnome_icon_list_get_items_per_line">
-                               <return-type type="int"/>
-                               <parameters>
-                                       <parameter name="gil" type="GnomeIconList*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_num_icons" symbol="gnome_icon_list_get_num_icons">
-                               <return-type type="guint"/>
-                               <parameters>
-                                       <parameter name="gil" type="GnomeIconList*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_selection" symbol="gnome_icon_list_get_selection">
-                               <return-type type="GList*"/>
-                               <parameters>
-                                       <parameter name="gil" type="GnomeIconList*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_selection_mode" symbol="gnome_icon_list_get_selection_mode">
-                               <return-type type="GtkSelectionMode"/>
-                               <parameters>
-                                       <parameter name="gil" type="GnomeIconList*"/>
-                               </parameters>
-                       </method>
-                       <method name="icon_is_visible" symbol="gnome_icon_list_icon_is_visible">
-                               <return-type type="GtkVisibility"/>
-                               <parameters>
-                                       <parameter name="gil" type="GnomeIconList*"/>
-                                       <parameter name="pos" type="int"/>
-                               </parameters>
-                       </method>
-                       <method name="insert" symbol="gnome_icon_list_insert">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="gil" type="GnomeIconList*"/>
-                                       <parameter name="pos" type="int"/>
-                                       <parameter name="icon_filename" type="char*"/>
-                                       <parameter name="text" type="char*"/>
-                               </parameters>
-                       </method>
-                       <method name="insert_pixbuf" symbol="gnome_icon_list_insert_pixbuf">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="gil" type="GnomeIconList*"/>
-                                       <parameter name="pos" type="int"/>
-                                       <parameter name="im" type="GdkPixbuf*"/>
-                                       <parameter name="icon_filename" type="char*"/>
-                                       <parameter name="text" type="char*"/>
-                               </parameters>
-                       </method>
-                       <method name="moveto" symbol="gnome_icon_list_moveto">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="gil" type="GnomeIconList*"/>
-                                       <parameter name="pos" type="int"/>
-                                       <parameter name="yalign" type="double"/>
-                               </parameters>
-                       </method>
-                       <constructor name="new" symbol="gnome_icon_list_new">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="icon_width" type="guint"/>
-                                       <parameter name="adj" type="GtkAdjustment*"/>
-                                       <parameter name="flags" type="int"/>
-                               </parameters>
-                       </constructor>
-                       <method name="remove" symbol="gnome_icon_list_remove">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="gil" type="GnomeIconList*"/>
-                                       <parameter name="pos" type="int"/>
-                               </parameters>
-                       </method>
-                       <method name="select_all" symbol="gnome_icon_list_select_all">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="gil" type="GnomeIconList*"/>
-                               </parameters>
-                       </method>
-                       <method name="select_icon" symbol="gnome_icon_list_select_icon">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="gil" type="GnomeIconList*"/>
-                                       <parameter name="pos" type="int"/>
-                               </parameters>
-                       </method>
-                       <method name="set_col_spacing" symbol="gnome_icon_list_set_col_spacing">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="gil" type="GnomeIconList*"/>
-                                       <parameter name="pixels" type="int"/>
-                               </parameters>
-                       </method>
-                       <method name="set_hadjustment" symbol="gnome_icon_list_set_hadjustment">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="gil" type="GnomeIconList*"/>
-                                       <parameter name="hadj" type="GtkAdjustment*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_icon_border" symbol="gnome_icon_list_set_icon_border">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="gil" type="GnomeIconList*"/>
-                                       <parameter name="pixels" type="int"/>
-                               </parameters>
-                       </method>
-                       <method name="set_icon_data" symbol="gnome_icon_list_set_icon_data">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="gil" type="GnomeIconList*"/>
-                                       <parameter name="idx" type="int"/>
-                                       <parameter name="data" type="gpointer"/>
-                               </parameters>
-                       </method>
-                       <method name="set_icon_data_full" symbol="gnome_icon_list_set_icon_data_full">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="gil" type="GnomeIconList*"/>
-                                       <parameter name="pos" type="int"/>
-                                       <parameter name="data" type="gpointer"/>
-                                       <parameter name="destroy" type="GDestroyNotify"/>
-                               </parameters>
-                       </method>
-                       <method name="set_icon_width" symbol="gnome_icon_list_set_icon_width">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="gil" type="GnomeIconList*"/>
-                                       <parameter name="w" type="int"/>
-                               </parameters>
-                       </method>
-                       <method name="set_row_spacing" symbol="gnome_icon_list_set_row_spacing">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="gil" type="GnomeIconList*"/>
-                                       <parameter name="pixels" type="int"/>
-                               </parameters>
-                       </method>
-                       <method name="set_selection_mode" symbol="gnome_icon_list_set_selection_mode">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="gil" type="GnomeIconList*"/>
-                                       <parameter name="mode" type="GtkSelectionMode"/>
-                               </parameters>
-                       </method>
-                       <method name="set_separators" symbol="gnome_icon_list_set_separators">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="gil" type="GnomeIconList*"/>
-                                       <parameter name="sep" type="char*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_text_spacing" symbol="gnome_icon_list_set_text_spacing">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="gil" type="GnomeIconList*"/>
-                                       <parameter name="pixels" type="int"/>
-                               </parameters>
-                       </method>
-                       <method name="set_vadjustment" symbol="gnome_icon_list_set_vadjustment">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="gil" type="GnomeIconList*"/>
-                                       <parameter name="vadj" type="GtkAdjustment*"/>
-                               </parameters>
-                       </method>
-                       <method name="thaw" symbol="gnome_icon_list_thaw">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="gil" type="GnomeIconList*"/>
-                               </parameters>
-                       </method>
-                       <method name="unselect_all" symbol="gnome_icon_list_unselect_all">
-                               <return-type type="int"/>
-                               <parameters>
-                                       <parameter name="gil" type="GnomeIconList*"/>
-                               </parameters>
-                       </method>
-                       <method name="unselect_icon" symbol="gnome_icon_list_unselect_icon">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="gil" type="GnomeIconList*"/>
-                                       <parameter name="pos" type="int"/>
-                               </parameters>
-                       </method>
-                       <signal name="focus-icon" when="FIRST">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="gil" type="GnomeIconList*"/>
-                                       <parameter name="num" type="gint"/>
-                               </parameters>
-                       </signal>
-                       <signal name="move-cursor" when="LAST">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="gil" type="GnomeIconList*"/>
-                                       <parameter name="dir" type="GtkDirectionType"/>
-                                       <parameter name="clear_selection" type="gboolean"/>
-                               </parameters>
-                       </signal>
-                       <signal name="select-icon" when="FIRST">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="gil" type="GnomeIconList*"/>
-                                       <parameter name="num" type="gint"/>
-                                       <parameter name="event" type="GdkEvent*"/>
-                               </parameters>
-                       </signal>
-                       <signal name="text-changed" when="LAST">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="gil" type="GnomeIconList*"/>
-                                       <parameter name="num" type="gint"/>
-                                       <parameter name="new_text" type="char*"/>
-                               </parameters>
-                       </signal>
-                       <signal name="toggle-cursor-selection" when="LAST">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="gil" type="GnomeIconList*"/>
-                               </parameters>
-                       </signal>
-                       <signal name="unselect-icon" when="FIRST">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="gil" type="GnomeIconList*"/>
-                                       <parameter name="num" type="gint"/>
-                                       <parameter name="event" type="GdkEvent*"/>
-                               </parameters>
-                       </signal>
-                       <vfunc name="unused">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="unused" type="GnomeIconList*"/>
-                               </parameters>
-                       </vfunc>
-                       <field name="adj" type="GtkAdjustment*"/>
-                       <field name="hadj" type="GtkAdjustment*"/>
-               </object>
-               <object name="GnomeIconSelection" parent="GtkVBox" type-name="GnomeIconSelection" get-type="gnome_icon_selection_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <method name="add_defaults" symbol="gnome_icon_selection_add_defaults">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="gis" type="GnomeIconSelection*"/>
-                               </parameters>
-                       </method>
-                       <method name="add_directory" symbol="gnome_icon_selection_add_directory">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="gis" type="GnomeIconSelection*"/>
-                                       <parameter name="dir" type="gchar*"/>
-                               </parameters>
-                       </method>
-                       <method name="clear" symbol="gnome_icon_selection_clear">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="gis" type="GnomeIconSelection*"/>
-                                       <parameter name="not_shown" type="gboolean"/>
-                               </parameters>
-                       </method>
-                       <method name="get_box" symbol="gnome_icon_selection_get_box">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="gis" type="GnomeIconSelection*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_gil" symbol="gnome_icon_selection_get_gil">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="gis" type="GnomeIconSelection*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_icon" symbol="gnome_icon_selection_get_icon">
-                               <return-type type="gchar*"/>
-                               <parameters>
-                                       <parameter name="gis" type="GnomeIconSelection*"/>
-                                       <parameter name="full_path" type="gboolean"/>
-                               </parameters>
-                       </method>
-                       <constructor name="new" symbol="gnome_icon_selection_new">
-                               <return-type type="GtkWidget*"/>
-                       </constructor>
-                       <method name="select_icon" symbol="gnome_icon_selection_select_icon">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="gis" type="GnomeIconSelection*"/>
+                                       <parameter name="ientry" type="GnomeIconEntry*"/>
                                        <parameter name="filename" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="show_icons" symbol="gnome_icon_selection_show_icons">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="gis" type="GnomeIconSelection*"/>
-                               </parameters>
-                       </method>
-                       <method name="stop_loading" symbol="gnome_icon_selection_stop_loading">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="gis" type="GnomeIconSelection*"/>
-                               </parameters>
-                       </method>
-               </object>
-               <object name="GnomeIconTextItem" parent="GnomeCanvasItem" type-name="GnomeIconTextItem" get-type="gnome_icon_text_item_get_type">
-                       <method name="configure" symbol="gnome_icon_text_item_configure">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="iti" type="GnomeIconTextItem*"/>
-                                       <parameter name="x" type="int"/>
-                                       <parameter name="y" type="int"/>
-                                       <parameter name="width" type="int"/>
-                                       <parameter name="fontname" type="char*"/>
-                                       <parameter name="text" type="char*"/>
-                                       <parameter name="is_editable" type="gboolean"/>
-                                       <parameter name="is_static" type="gboolean"/>
-                               </parameters>
-                       </method>
-                       <method name="focus" symbol="gnome_icon_text_item_focus">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="iti" type="GnomeIconTextItem*"/>
-                                       <parameter name="focused" type="gboolean"/>
-                               </parameters>
-                       </method>
-                       <method name="get_editable" symbol="gnome_icon_text_item_get_editable">
-                               <return-type type="GtkEditable*"/>
-                               <parameters>
-                                       <parameter name="iti" type="GnomeIconTextItem*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_text" symbol="gnome_icon_text_item_get_text">
-                               <return-type type="char*"/>
-                               <parameters>
-                                       <parameter name="iti" type="GnomeIconTextItem*"/>
-                               </parameters>
-                       </method>
-                       <method name="select" symbol="gnome_icon_text_item_select">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="iti" type="GnomeIconTextItem*"/>
-                                       <parameter name="sel" type="gboolean"/>
-                               </parameters>
-                       </method>
-                       <method name="setxy" symbol="gnome_icon_text_item_setxy">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="iti" type="GnomeIconTextItem*"/>
-                                       <parameter name="x" type="int"/>
-                                       <parameter name="y" type="int"/>
-                               </parameters>
-                       </method>
-                       <method name="start_editing" symbol="gnome_icon_text_item_start_editing">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="iti" type="GnomeIconTextItem*"/>
-                               </parameters>
-                       </method>
-                       <method name="stop_editing" symbol="gnome_icon_text_item_stop_editing">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="iti" type="GnomeIconTextItem*"/>
-                                       <parameter name="accept" type="gboolean"/>
-                               </parameters>
-                       </method>
-                       <signal name="editing-started" when="LAST">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="iti" type="GnomeIconTextItem*"/>
-                               </parameters>
-                       </signal>
-                       <signal name="editing-stopped" when="LAST">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="iti" type="GnomeIconTextItem*"/>
-                               </parameters>
-                       </signal>
-                       <signal name="height-changed" when="LAST">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="iti" type="GnomeIconTextItem*"/>
-                               </parameters>
-                       </signal>
-                       <signal name="selection-started" when="FIRST">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="iti" type="GnomeIconTextItem*"/>
-                               </parameters>
-                       </signal>
-                       <signal name="selection-stopped" when="FIRST">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="iti" type="GnomeIconTextItem*"/>
-                               </parameters>
-                       </signal>
-                       <signal name="text-changed" when="LAST">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="iti" type="GnomeIconTextItem*"/>
-                               </parameters>
-                       </signal>
-                       <signal name="width-changed" when="LAST">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="iti" type="GnomeIconTextItem*"/>
-                               </parameters>
-                       </signal>
-                       <vfunc name="create_entry">
-                               <return-type type="GtkEntry*"/>
-                               <parameters>
-                                       <parameter name="iti" type="GnomeIconTextItem*"/>
-                               </parameters>
-                       </vfunc>
-                       <field name="x" type="int"/>
-                       <field name="y" type="int"/>
-                       <field name="width" type="int"/>
-                       <field name="fontname" type="char*"/>
-                       <field name="text" type="char*"/>
-                       <field name="editing" type="unsigned"/>
-                       <field name="selected" type="unsigned"/>
-                       <field name="focused" type="unsigned"/>
-                       <field name="is_editable" type="unsigned"/>
-                       <field name="is_text_allocated" type="unsigned"/>
-               </object>
-               <object name="GnomeIconTheme" parent="GObject" type-name="GnomeIconTheme" get-type="gnome_icon_theme_get_type">
-                       <signal name="changed" when="LAST">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="icon_theme" type="GnomeIconTheme*"/>
-                               </parameters>
-                       </signal>
-               </object>
-               <object name="GnomeMDI" parent="GtkObject" type-name="GnomeMDI" get-type="gnome_mdi_get_type">
-                       <method name="add_child" symbol="gnome_mdi_add_child">
-                               <return-type type="gint"/>
-                               <parameters>
-                                       <parameter name="mdi" type="GnomeMDI*"/>
-                                       <parameter name="child" type="GnomeMDIChild*"/>
-                               </parameters>
-                       </method>
-                       <method name="add_toplevel_view" symbol="gnome_mdi_add_toplevel_view">
-                               <return-type type="gint"/>
-                               <parameters>
-                                       <parameter name="mdi" type="GnomeMDI*"/>
-                                       <parameter name="child" type="GnomeMDIChild*"/>
-                               </parameters>
-                       </method>
-                       <method name="add_view" symbol="gnome_mdi_add_view">
-                               <return-type type="gint"/>
-                               <parameters>
-                                       <parameter name="mdi" type="GnomeMDI*"/>
-                                       <parameter name="child" type="GnomeMDIChild*"/>
-                               </parameters>
-                       </method>
-                       <method name="find_child" symbol="gnome_mdi_find_child">
-                               <return-type type="GnomeMDIChild*"/>
-                               <parameters>
-                                       <parameter name="mdi" type="GnomeMDI*"/>
-                                       <parameter name="name" type="gchar*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_active_child" symbol="gnome_mdi_get_active_child">
-                               <return-type type="GnomeMDIChild*"/>
-                               <parameters>
-                                       <parameter name="mdi" type="GnomeMDI*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_active_view" symbol="gnome_mdi_get_active_view">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="mdi" type="GnomeMDI*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_active_window" symbol="gnome_mdi_get_active_window">
-                               <return-type type="GnomeApp*"/>
-                               <parameters>
-                                       <parameter name="mdi" type="GnomeMDI*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_app_from_view" symbol="gnome_mdi_get_app_from_view">
-                               <return-type type="GnomeApp*"/>
-                               <parameters>
-                                       <parameter name="view" type="GtkWidget*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_child_from_view" symbol="gnome_mdi_get_child_from_view">
-                               <return-type type="GnomeMDIChild*"/>
-                               <parameters>
-                                       <parameter name="view" type="GtkWidget*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_child_menu_info" symbol="gnome_mdi_get_child_menu_info">
-                               <return-type type="GnomeUIInfo*"/>
-                               <parameters>
-                                       <parameter name="app" type="GnomeApp*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_menubar_info" symbol="gnome_mdi_get_menubar_info">
-                               <return-type type="GnomeUIInfo*"/>
-                               <parameters>
-                                       <parameter name="app" type="GnomeApp*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_toolbar_info" symbol="gnome_mdi_get_toolbar_info">
-                               <return-type type="GnomeUIInfo*"/>
-                               <parameters>
-                                       <parameter name="app" type="GnomeApp*"/>
-                               </parameters>
-                       </method>
-                       <method name="get_view_from_window" symbol="gnome_mdi_get_view_from_window">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="mdi" type="GnomeMDI*"/>
-                                       <parameter name="app" type="GnomeApp*"/>
-                               </parameters>
-                       </method>
-                       <constructor name="new" symbol="gnome_mdi_new">
-                               <return-type type="GtkObject*"/>
-                               <parameters>
-                                       <parameter name="appname" type="gchar*"/>
-                                       <parameter name="title" type="gchar*"/>
-                               </parameters>
-                       </constructor>
-                       <method name="open_toplevel" symbol="gnome_mdi_open_toplevel">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="mdi" type="GnomeMDI*"/>
-                               </parameters>
-                       </method>
-                       <method name="register" symbol="gnome_mdi_register">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="mdi" type="GnomeMDI*"/>
-                                       <parameter name="object" type="GtkObject*"/>
-                               </parameters>
-                       </method>
-                       <method name="remove_all" symbol="gnome_mdi_remove_all">
-                               <return-type type="gint"/>
-                               <parameters>
-                                       <parameter name="mdi" type="GnomeMDI*"/>
-                                       <parameter name="force" type="gint"/>
-                               </parameters>
-                       </method>
-                       <method name="remove_child" symbol="gnome_mdi_remove_child">
-                               <return-type type="gint"/>
-                               <parameters>
-                                       <parameter name="mdi" type="GnomeMDI*"/>
-                                       <parameter name="child" type="GnomeMDIChild*"/>
-                                       <parameter name="force" type="gint"/>
-                               </parameters>
-                       </method>
-                       <method name="remove_view" symbol="gnome_mdi_remove_view">
-                               <return-type type="gint"/>
-                               <parameters>
-                                       <parameter name="mdi" type="GnomeMDI*"/>
-                                       <parameter name="view" type="GtkWidget*"/>
-                                       <parameter name="force" type="gint"/>
-                               </parameters>
-                       </method>
-                       <method name="restore_state" symbol="gnome_mdi_restore_state">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="mdi" type="GnomeMDI*"/>
-                                       <parameter name="section" type="gchar*"/>
-                                       <parameter name="create_child_func" type="GnomeMDIChildCreator"/>
-                               </parameters>
-                       </method>
-                       <method name="save_state" symbol="gnome_mdi_save_state">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="mdi" type="GnomeMDI*"/>
-                                       <parameter name="section" type="gchar*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_active_view" symbol="gnome_mdi_set_active_view">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="mdi" type="GnomeMDI*"/>
-                                       <parameter name="view" type="GtkWidget*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_child_list_path" symbol="gnome_mdi_set_child_list_path">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="mdi" type="GnomeMDI*"/>
-                                       <parameter name="path" type="gchar*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_child_menu_path" symbol="gnome_mdi_set_child_menu_path">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="mdi" type="GnomeMDI*"/>
-                                       <parameter name="path" type="gchar*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_menubar_template" symbol="gnome_mdi_set_menubar_template">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="mdi" type="GnomeMDI*"/>
-                                       <parameter name="menu_tmpl" type="GnomeUIInfo*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_mode" symbol="gnome_mdi_set_mode">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="mdi" type="GnomeMDI*"/>
-                                       <parameter name="mode" type="GnomeMDIMode"/>
-                               </parameters>
-                       </method>
-                       <method name="set_toolbar_template" symbol="gnome_mdi_set_toolbar_template">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="mdi" type="GnomeMDI*"/>
-                                       <parameter name="tbar_tmpl" type="GnomeUIInfo*"/>
-                               </parameters>
-                       </method>
-                       <method name="unregister" symbol="gnome_mdi_unregister">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="mdi" type="GnomeMDI*"/>
-                                       <parameter name="object" type="GtkObject*"/>
-                               </parameters>
-                       </method>
-                       <method name="update_child" symbol="gnome_mdi_update_child">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="mdi" type="GnomeMDI*"/>
-                                       <parameter name="child" type="GnomeMDIChild*"/>
-                               </parameters>
-                       </method>
-                       <signal name="add-child" when="LAST">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="object" type="GnomeMDI*"/>
-                                       <parameter name="p0" type="GnomeMDIChild*"/>
-                               </parameters>
-                       </signal>
-                       <signal name="add-view" when="LAST">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="object" type="GnomeMDI*"/>
-                                       <parameter name="p0" type="GtkWidget*"/>
-                               </parameters>
-                       </signal>
-                       <signal name="app-created" when="LAST">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="object" type="GnomeMDI*"/>
-                                       <parameter name="p0" type="GnomeApp*"/>
-                               </parameters>
-                       </signal>
-                       <signal name="child-changed" when="LAST">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="object" type="GnomeMDI*"/>
-                                       <parameter name="p0" type="GnomeMDIChild*"/>
-                               </parameters>
-                       </signal>
-                       <signal name="remove-child" when="LAST">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="object" type="GnomeMDI*"/>
-                                       <parameter name="p0" type="GnomeMDIChild*"/>
-                               </parameters>
-                       </signal>
-                       <signal name="remove-view" when="LAST">
-                               <return-type type="gboolean"/>
-                               <parameters>
-                                       <parameter name="object" type="GnomeMDI*"/>
-                                       <parameter name="p0" type="GtkWidget*"/>
-                               </parameters>
-                       </signal>
-                       <signal name="view-changed" when="LAST">
+                       <method name="set_max_saved" symbol="gnome_icon_entry_set_max_saved">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="object" type="GnomeMDI*"/>
-                                       <parameter name="p0" type="GtkWidget*"/>
-                               </parameters>
-                       </signal>
-                       <field name="mode" type="GnomeMDIMode"/>
-                       <field name="tab_pos" type="GtkPositionType"/>
-                       <field name="signal_id" type="guint"/>
-                       <field name="in_drag" type="guint"/>
-                       <field name="appname" type="gchar*"/>
-                       <field name="title" type="gchar*"/>
-                       <field name="menu_template" type="GnomeUIInfo*"/>
-                       <field name="toolbar_template" type="GnomeUIInfo*"/>
-                       <field name="active_child" type="GnomeMDIChild*"/>
-                       <field name="active_view" type="GtkWidget*"/>
-                       <field name="active_window" type="GnomeApp*"/>
-                       <field name="windows" type="GList*"/>
-                       <field name="children" type="GList*"/>
-                       <field name="registered" type="GSList*"/>
-                       <field name="child_menu_path" type="gchar*"/>
-                       <field name="child_list_path" type="gchar*"/>
-                       <field name="reserved" type="gpointer"/>
-               </object>
-               <object name="GnomeMDIChild" parent="GtkObject" type-name="GnomeMDIChild" get-type="gnome_mdi_child_get_type">
-                       <method name="add_view" symbol="gnome_mdi_child_add_view">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="mdi_child" type="GnomeMDIChild*"/>
+                                       <parameter name="ientry" type="GnomeIconEntry*"/>
+                                       <parameter name="max_saved" type="guint"/>
                                </parameters>
                        </method>
-                       <method name="remove_view" symbol="gnome_mdi_child_remove_view">
+                       <method name="set_pixmap_subdir" symbol="gnome_icon_entry_set_pixmap_subdir">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="mdi_child" type="GnomeMDIChild*"/>
-                                       <parameter name="view" type="GtkWidget*"/>
+                                       <parameter name="ientry" type="GnomeIconEntry*"/>
+                                       <parameter name="subdir" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="set_menu_template" symbol="gnome_mdi_child_set_menu_template">
+                       <property name="browse-dialog-title" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="filename" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="history-id" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <property name="pick-dialog" type="GtkDialog*" readable="1" writable="0" construct="0" construct-only="0"/>
+                       <property name="pixmap-subdir" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
+                       <signal name="browse" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="mdi_child" type="GnomeMDIChild*"/>
-                                       <parameter name="menu_tmpl" type="GnomeUIInfo*"/>
+                                       <parameter name="ientry" type="GnomeIconEntry*"/>
                                </parameters>
-                       </method>
-                       <method name="set_name" symbol="gnome_mdi_child_set_name">
+                       </signal>
+                       <signal name="changed" when="LAST">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="mdi_child" type="GnomeMDIChild*"/>
-                                       <parameter name="name" type="gchar*"/>
+                                       <parameter name="ientry" type="GnomeIconEntry*"/>
                                </parameters>
-                       </method>
-                       <field name="parent" type="GtkObject*"/>
-                       <field name="name" type="gchar*"/>
-                       <field name="views" type="GList*"/>
-                       <field name="menu_template" type="GnomeUIInfo*"/>
-                       <field name="reserved" type="gpointer"/>
+                       </signal>
                </object>
-               <object name="GnomeMDIGenericChild" parent="GnomeMDIChild" type-name="GnomeMDIGenericChild" get-type="gnome_mdi_generic_child_get_type">
-                       <constructor name="new" symbol="gnome_mdi_generic_child_new">
-                               <return-type type="GnomeMDIGenericChild*"/>
-                               <parameters>
-                                       <parameter name="name" type="gchar*"/>
-                               </parameters>
-                       </constructor>
-                       <method name="set_config_func" symbol="gnome_mdi_generic_child_set_config_func">
+               <object name="GnomeIconSelection" parent="GtkVBox" type-name="GnomeIconSelection" get-type="gnome_icon_selection_get_type">
+                       <implements>
+                               <interface name="AtkImplementor"/>
+                               <interface name="GtkBuildable"/>
+                       </implements>
+                       <method name="add_defaults" symbol="gnome_icon_selection_add_defaults">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="child" type="GnomeMDIGenericChild*"/>
-                                       <parameter name="func" type="GnomeMDIChildConfigFunc"/>
-                                       <parameter name="data" type="gpointer"/>
+                                       <parameter name="gis" type="GnomeIconSelection*"/>
                                </parameters>
                        </method>
-                       <method name="set_config_func_full" symbol="gnome_mdi_generic_child_set_config_func_full">
+                       <method name="add_directory" symbol="gnome_icon_selection_add_directory">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="child" type="GnomeMDIGenericChild*"/>
-                                       <parameter name="func" type="GnomeMDIChildConfigFunc"/>
-                                       <parameter name="marshal" type="GtkCallbackMarshal"/>
-                                       <parameter name="data" type="gpointer"/>
-                                       <parameter name="notify" type="GtkDestroyNotify"/>
+                                       <parameter name="gis" type="GnomeIconSelection*"/>
+                                       <parameter name="dir" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="set_label_func" symbol="gnome_mdi_generic_child_set_label_func">
+                       <method name="clear" symbol="gnome_icon_selection_clear">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="child" type="GnomeMDIGenericChild*"/>
-                                       <parameter name="func" type="GnomeMDIChildLabelFunc"/>
-                                       <parameter name="data" type="gpointer"/>
+                                       <parameter name="gis" type="GnomeIconSelection*"/>
+                                       <parameter name="not_shown" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="set_label_func_full" symbol="gnome_mdi_generic_child_set_label_func_full">
-                               <return-type type="void"/>
+                       <method name="get_box" symbol="gnome_icon_selection_get_box">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="child" type="GnomeMDIGenericChild*"/>
-                                       <parameter name="func" type="GnomeMDIChildLabelFunc"/>
-                                       <parameter name="marshal" type="GtkCallbackMarshal"/>
-                                       <parameter name="data" type="gpointer"/>
-                                       <parameter name="notify" type="GtkDestroyNotify"/>
+                                       <parameter name="gis" type="GnomeIconSelection*"/>
                                </parameters>
                        </method>
-                       <method name="set_menu_creator" symbol="gnome_mdi_generic_child_set_menu_creator">
-                               <return-type type="void"/>
+                       <method name="get_gil" symbol="gnome_icon_selection_get_gil">
+                               <return-type type="GtkWidget*"/>
                                <parameters>
-                                       <parameter name="child" type="GnomeMDIGenericChild*"/>
-                                       <parameter name="func" type="GnomeMDIChildMenuCreator"/>
-                                       <parameter name="data" type="gpointer"/>
+                                       <parameter name="gis" type="GnomeIconSelection*"/>
                                </parameters>
                        </method>
-                       <method name="set_menu_creator_full" symbol="gnome_mdi_generic_child_set_menu_creator_full">
-                               <return-type type="void"/>
+                       <method name="get_icon" symbol="gnome_icon_selection_get_icon">
+                               <return-type type="gchar*"/>
                                <parameters>
-                                       <parameter name="child" type="GnomeMDIGenericChild*"/>
-                                       <parameter name="func" type="GnomeMDIChildMenuCreator"/>
-                                       <parameter name="marshal" type="GtkCallbackMarshal"/>
-                                       <parameter name="data" type="gpointer"/>
-                                       <parameter name="notify" type="GtkDestroyNotify"/>
+                                       <parameter name="gis" type="GnomeIconSelection*"/>
+                                       <parameter name="full_path" type="gboolean"/>
                                </parameters>
                        </method>
-                       <method name="set_view_creator" symbol="gnome_mdi_generic_child_set_view_creator">
+                       <constructor name="new" symbol="gnome_icon_selection_new">
+                               <return-type type="GtkWidget*"/>
+                       </constructor>
+                       <method name="select_icon" symbol="gnome_icon_selection_select_icon">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="child" type="GnomeMDIGenericChild*"/>
-                                       <parameter name="func" type="GnomeMDIChildViewCreator"/>
-                                       <parameter name="data" type="gpointer"/>
+                                       <parameter name="gis" type="GnomeIconSelection*"/>
+                                       <parameter name="filename" type="gchar*"/>
                                </parameters>
                        </method>
-                       <method name="set_view_creator_full" symbol="gnome_mdi_generic_child_set_view_creator_full">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="child" type="GnomeMDIGenericChild*"/>
-                                       <parameter name="func" type="GnomeMDIChildViewCreator"/>
-                                       <parameter name="marshal" type="GtkCallbackMarshal"/>
-                                       <parameter name="data" type="gpointer"/>
-                                       <parameter name="notify" type="GtkDestroyNotify"/>
-                               </parameters>
-                       </method>
-                       <field name="create_view" type="GnomeMDIChildViewCreator"/>
-                       <field name="create_menus" type="GnomeMDIChildMenuCreator"/>
-                       <field name="get_config_string" type="GnomeMDIChildConfigFunc"/>
-                       <field name="set_label" type="GnomeMDIChildLabelFunc"/>
-                       <field name="create_view_cbm" type="GtkCallbackMarshal"/>
-                       <field name="create_menus_cbm" type="GtkCallbackMarshal"/>
-                       <field name="get_config_string_cbm" type="GtkCallbackMarshal"/>
-                       <field name="set_label_cbm" type="GtkCallbackMarshal"/>
-                       <field name="create_view_dn" type="GtkDestroyNotify"/>
-                       <field name="create_menus_dn" type="GtkDestroyNotify"/>
-                       <field name="get_config_string_dn" type="GtkDestroyNotify"/>
-                       <field name="set_label_dn" type="GtkDestroyNotify"/>
-                       <field name="create_view_data" type="gpointer"/>
-                       <field name="create_menus_data" type="gpointer"/>
-                       <field name="get_config_string_data" type="gpointer"/>
-                       <field name="set_label_data" type="gpointer"/>
-                       <field name="reserved" type="gpointer"/>
-               </object>
-               <object name="GnomeMessageBox" parent="GnomeDialog" type-name="GnomeMessageBox" get-type="gnome_message_box_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <method name="construct" symbol="gnome_message_box_construct">
+                       <method name="show_icons" symbol="gnome_icon_selection_show_icons">
                                <return-type type="void"/>
                                <parameters>
-                                       <parameter name="messagebox" type="GnomeMessageBox*"/>
-                                       <parameter name="message" type="gchar*"/>
-                                       <parameter name="message_box_type" type="gchar*"/>
-                                       <parameter name="buttons" type="gchar**"/>
+                                       <parameter name="gis" type="GnomeIconSelection*"/>
                                </parameters>
                        </method>
-                       <constructor name="new" symbol="gnome_message_box_new">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="message" type="gchar*"/>
-                                       <parameter name="message_box_type" type="gchar*"/>
-                               </parameters>
-                       </constructor>
-                       <constructor name="newv" symbol="gnome_message_box_newv">
-                               <return-type type="GtkWidget*"/>
+                       <method name="stop_loading" symbol="gnome_icon_selection_stop_loading">
+                               <return-type type="void"/>
                                <parameters>
-                                       <parameter name="message" type="gchar*"/>
-                                       <parameter name="message_box_type" type="gchar*"/>
-                                       <parameter name="buttons" type="gchar**"/>
+                                       <parameter name="gis" type="GnomeIconSelection*"/>
                                </parameters>
-                       </constructor>
+                       </method>
                </object>
                <object name="GnomePasswordDialog" parent="GtkDialog" type-name="GnomePasswordDialog" get-type="gnome_password_dialog_get_type">
                        <implements>
                        <property name="username" type="char*" readable="1" writable="1" construct="0" construct-only="0"/>
                        <field name="details" type="GnomePasswordDialogDetails*"/>
                </object>
-               <object name="GnomePixmap" parent="GtkImage" type-name="GnomePixmap" get-type="gnome_pixmap_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <method name="load_file" symbol="gnome_pixmap_load_file">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="gpixmap" type="GnomePixmap*"/>
-                                       <parameter name="filename" type="char*"/>
-                               </parameters>
-                       </method>
-                       <method name="load_file_at_size" symbol="gnome_pixmap_load_file_at_size">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="gpixmap" type="GnomePixmap*"/>
-                                       <parameter name="filename" type="char*"/>
-                                       <parameter name="width" type="int"/>
-                                       <parameter name="height" type="int"/>
-                               </parameters>
-                       </method>
-                       <method name="load_xpm_d" symbol="gnome_pixmap_load_xpm_d">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="gpixmap" type="GnomePixmap*"/>
-                                       <parameter name="xpm_data" type="char**"/>
-                               </parameters>
-                       </method>
-                       <method name="load_xpm_d_at_size" symbol="gnome_pixmap_load_xpm_d_at_size">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="gpixmap" type="GnomePixmap*"/>
-                                       <parameter name="xpm_data" type="char**"/>
-                                       <parameter name="width" type="int"/>
-                                       <parameter name="height" type="int"/>
-                               </parameters>
-                       </method>
-                       <constructor name="new_from_file" symbol="gnome_pixmap_new_from_file">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="filename" type="gchar*"/>
-                               </parameters>
-                       </constructor>
-                       <constructor name="new_from_file_at_size" symbol="gnome_pixmap_new_from_file_at_size">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="filename" type="gchar*"/>
-                                       <parameter name="width" type="gint"/>
-                                       <parameter name="height" type="gint"/>
-                               </parameters>
-                       </constructor>
-                       <constructor name="new_from_gnome_pixmap" symbol="gnome_pixmap_new_from_gnome_pixmap">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="gpixmap" type="GnomePixmap*"/>
-                               </parameters>
-                       </constructor>
-                       <constructor name="new_from_xpm_d" symbol="gnome_pixmap_new_from_xpm_d">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="xpm_data" type="gchar**"/>
-                               </parameters>
-                       </constructor>
-                       <constructor name="new_from_xpm_d_at_size" symbol="gnome_pixmap_new_from_xpm_d_at_size">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="xpm_data" type="gchar**"/>
-                                       <parameter name="width" type="gint"/>
-                                       <parameter name="height" type="gint"/>
-                               </parameters>
-                       </constructor>
-               </object>
-               <object name="GnomePixmapEntry" parent="GnomeFileEntry" type-name="GnomePixmapEntry" get-type="gnome_pixmap_entry_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                               <interface name="GtkEditable"/>
-                       </implements>
-                       <method name="construct" symbol="gnome_pixmap_entry_construct">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="pentry" type="GnomePixmapEntry*"/>
-                                       <parameter name="history_id" type="gchar*"/>
-                                       <parameter name="browse_dialog_title" type="gchar*"/>
-                                       <parameter name="do_preview" type="gboolean"/>
-                               </parameters>
-                       </method>
-                       <method name="get_filename" symbol="gnome_pixmap_entry_get_filename">
-                               <return-type type="gchar*"/>
-                               <parameters>
-                                       <parameter name="pentry" type="GnomePixmapEntry*"/>
-                               </parameters>
-                       </method>
-                       <method name="gnome_entry" symbol="gnome_pixmap_entry_gnome_entry">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="pentry" type="GnomePixmapEntry*"/>
-                               </parameters>
-                       </method>
-                       <method name="gnome_file_entry" symbol="gnome_pixmap_entry_gnome_file_entry">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="pentry" type="GnomePixmapEntry*"/>
-                               </parameters>
-                       </method>
-                       <method name="gtk_entry" symbol="gnome_pixmap_entry_gtk_entry">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="pentry" type="GnomePixmapEntry*"/>
-                               </parameters>
-                       </method>
-                       <constructor name="new" symbol="gnome_pixmap_entry_new">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="history_id" type="gchar*"/>
-                                       <parameter name="browse_dialog_title" type="gchar*"/>
-                                       <parameter name="do_preview" type="gboolean"/>
-                               </parameters>
-                       </constructor>
-                       <method name="preview_widget" symbol="gnome_pixmap_entry_preview_widget">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="pentry" type="GnomePixmapEntry*"/>
-                               </parameters>
-                       </method>
-                       <method name="scrolled_window" symbol="gnome_pixmap_entry_scrolled_window">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="pentry" type="GnomePixmapEntry*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_pixmap_subdir" symbol="gnome_pixmap_entry_set_pixmap_subdir">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="pentry" type="GnomePixmapEntry*"/>
-                                       <parameter name="subdir" type="gchar*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_preview" symbol="gnome_pixmap_entry_set_preview">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="pentry" type="GnomePixmapEntry*"/>
-                                       <parameter name="do_preview" type="gboolean"/>
-                               </parameters>
-                       </method>
-                       <method name="set_preview_size" symbol="gnome_pixmap_entry_set_preview_size">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="pentry" type="GnomePixmapEntry*"/>
-                                       <parameter name="preview_w" type="gint"/>
-                                       <parameter name="preview_h" type="gint"/>
-                               </parameters>
-                       </method>
-                       <property name="do-preview" type="gboolean" readable="1" writable="1" construct="0" construct-only="0"/>
-               </object>
-               <object name="GnomePropertyBox" parent="GnomeDialog" type-name="GnomePropertyBox" get-type="gnome_property_box_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <method name="append_page" symbol="gnome_property_box_append_page">
-                               <return-type type="gint"/>
-                               <parameters>
-                                       <parameter name="property_box" type="GnomePropertyBox*"/>
-                                       <parameter name="child" type="GtkWidget*"/>
-                                       <parameter name="tab_label" type="GtkWidget*"/>
-                               </parameters>
-                       </method>
-                       <method name="changed" symbol="gnome_property_box_changed">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="property_box" type="GnomePropertyBox*"/>
-                               </parameters>
-                       </method>
-                       <constructor name="new" symbol="gnome_property_box_new">
-                               <return-type type="GtkWidget*"/>
-                       </constructor>
-                       <method name="set_modified" symbol="gnome_property_box_set_modified">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="property_box" type="GnomePropertyBox*"/>
-                                       <parameter name="state" type="gboolean"/>
-                               </parameters>
-                       </method>
-                       <method name="set_state" symbol="gnome_property_box_set_state">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="property_box" type="GnomePropertyBox*"/>
-                                       <parameter name="state" type="gboolean"/>
-                               </parameters>
-                       </method>
-                       <signal name="apply" when="LAST">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="propertybox" type="GnomePropertyBox*"/>
-                                       <parameter name="page_num" type="gint"/>
-                               </parameters>
-                       </signal>
-                       <signal name="help" when="LAST">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="propertybox" type="GnomePropertyBox*"/>
-                                       <parameter name="page_num" type="gint"/>
-                               </parameters>
-                       </signal>
-                       <field name="notebook" type="GtkWidget*"/>
-                       <field name="ok_button" type="GtkWidget*"/>
-                       <field name="apply_button" type="GtkWidget*"/>
-                       <field name="cancel_button" type="GtkWidget*"/>
-                       <field name="help_button" type="GtkWidget*"/>
-                       <field name="reserved" type="gpointer"/>
-               </object>
-               <object name="GnomeScores" parent="GtkDialog" type-name="GnomeScores" get-type="gnome_scores_get_type">
-                       <implements>
-                               <interface name="AtkImplementor"/>
-                               <interface name="GtkBuildable"/>
-                       </implements>
-                       <method name="construct" symbol="gnome_scores_construct">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="gs" type="GnomeScores*"/>
-                                       <parameter name="n_scores" type="guint"/>
-                                       <parameter name="names" type="gchar**"/>
-                                       <parameter name="scores" type="gfloat*"/>
-                                       <parameter name="times" type="time_t*"/>
-                                       <parameter name="clear" type="gboolean"/>
-                               </parameters>
-                       </method>
-                       <method name="display" symbol="gnome_scores_display">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="title" type="gchar*"/>
-                                       <parameter name="app_name" type="gchar*"/>
-                                       <parameter name="level" type="gchar*"/>
-                                       <parameter name="pos" type="int"/>
-                               </parameters>
-                       </method>
-                       <method name="display_with_pixmap" symbol="gnome_scores_display_with_pixmap">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="pixmap_logo" type="gchar*"/>
-                                       <parameter name="app_name" type="gchar*"/>
-                                       <parameter name="level" type="gchar*"/>
-                                       <parameter name="pos" type="int"/>
-                               </parameters>
-                       </method>
-                       <constructor name="new" symbol="gnome_scores_new">
-                               <return-type type="GtkWidget*"/>
-                               <parameters>
-                                       <parameter name="n_scores" type="guint"/>
-                                       <parameter name="names" type="gchar**"/>
-                                       <parameter name="scores" type="gfloat*"/>
-                                       <parameter name="times" type="time_t*"/>
-                                       <parameter name="clear" type="gboolean"/>
-                               </parameters>
-                       </constructor>
-                       <method name="set_color" symbol="gnome_scores_set_color">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="gs" type="GnomeScores*"/>
-                                       <parameter name="n" type="guint"/>
-                                       <parameter name="col" type="GdkColor*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_colors" symbol="gnome_scores_set_colors">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="gs" type="GnomeScores*"/>
-                                       <parameter name="col" type="GdkColor*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_current_player" symbol="gnome_scores_set_current_player">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="gs" type="GnomeScores*"/>
-                                       <parameter name="i" type="gint"/>
-                               </parameters>
-                       </method>
-                       <method name="set_def_color" symbol="gnome_scores_set_def_color">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="gs" type="GnomeScores*"/>
-                                       <parameter name="col" type="GdkColor*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_logo_label" symbol="gnome_scores_set_logo_label">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="gs" type="GnomeScores*"/>
-                                       <parameter name="txt" type="gchar*"/>
-                                       <parameter name="font" type="gchar*"/>
-                                       <parameter name="col" type="GdkColor*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_logo_label_title" symbol="gnome_scores_set_logo_label_title">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="gs" type="GnomeScores*"/>
-                                       <parameter name="txt" type="gchar*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_logo_pixmap" symbol="gnome_scores_set_logo_pixmap">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="gs" type="GnomeScores*"/>
-                                       <parameter name="pix_name" type="gchar*"/>
-                               </parameters>
-                       </method>
-                       <method name="set_logo_widget" symbol="gnome_scores_set_logo_widget">
-                               <return-type type="void"/>
-                               <parameters>
-                                       <parameter name="gs" type="GnomeScores*"/>
-                                       <parameter name="w" type="GtkWidget*"/>
-                               </parameters>
-                       </method>
-               </object>
                <object name="GnomeThumbnailFactory" parent="GObject" type-name="GnomeThumbnailFactory" get-type="gnome_thumbnail_factory_get_type">
                        <method name="can_thumbnail" symbol="gnome_thumbnail_factory_can_thumbnail">
                                <return-type type="gboolean"/>
diff --git a/vapi/packages/libsoup-2.2/libsoup-2.2-custom.vala b/vapi/packages/libsoup-2.2/libsoup-2.2-custom.vala
deleted file mode 100644 (file)
index df47d35..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-/* libsoup-2.2-custom.vala
- *
- * Copyright (C) 2007  Jürg Billeter
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
-
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
-
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
- *
- * Author:
- *     Jürg Billeter <j@bitron.ch>
- */
-
-[CCode (cheader_filename = "libsoup/soup.h")]
-namespace Soup {
-       public class ServerAuth {
-               [Import]
-               public ServerAuth (ServerAuthContext auth_ctx, GLib.SList auth_hdrs, Message msg);
-               [Import]
-               public weak string get_user ();
-               [Import]
-               public bool check_passwd (string passwd);
-       }
-}
index 812247a..bd1c74d 100644 (file)
                                        <parameter name="data" type="gpointer"/>
                                </parameters>
                        </method>
+                       <method name="get_async_context" symbol="soup_server_get_async_context">
+                               <return-type type="GMainContext*"/>
+                               <parameters>
+                                       <parameter name="serv" type="SoupServer*"/>
+                               </parameters>
+                       </method>
                        <method name="get_handler" symbol="soup_server_get_handler">
                                <return-type type="SoupServerHandler*"/>
                                <parameters>
                                        <parameter name="msg" type="SoupMessage*"/>
                                </parameters>
                        </method>
+                       <method name="get_async_context" symbol="soup_session_get_async_context">
+                               <return-type type="GMainContext*"/>
+                               <parameters>
+                                       <parameter name="session" type="SoupSession*"/>
+                               </parameters>
+                       </method>
                        <method name="get_connection" symbol="soup_session_get_connection">
                                <return-type type="SoupConnection*"/>
                                <parameters>
index 000a9f3..29695ad 100644 (file)
@@ -344,7 +344,7 @@ namespace Poppler {
        public class FontInfo : GLib.Object {
                public void free ();
                public FontInfo (Poppler.Document document);
-               public bool scan (int n_pages, out Poppler.FontsIter iter);
+               public bool scan (int n_pages, out weak Poppler.FontsIter iter);
        }
        [CCode (cheader_filename = "poppler.h")]
        public class FormField : GLib.Object {
index c83eb38..9245398 100644 (file)
@@ -228,6 +228,8 @@ public class Vala.GIdlParser : CodeVisitor {
                                current_source_file.add_node (cb);
                        } else if (node.type == IdlNodeTypeId.STRUCT) {
                                parse_struct ((IdlNodeStruct) node, ns, module);
+                       } else if (node.type == IdlNodeTypeId.UNION) {
+                               parse_union ((IdlNodeUnion) node, ns, module);
                        } else if (node.type == IdlNodeTypeId.BOXED) {
                                parse_boxed ((IdlNodeBoxed) node, ns, module);
                        } else if (node.type == IdlNodeTypeId.ENUM) {
@@ -430,6 +432,128 @@ public class Vala.GIdlParser : CodeVisitor {
                        current_data_type = null;
                }
        }
+
+       private void parse_union (IdlNodeUnion! un_node, Namespace! ns, IdlModule! module) {
+               weak IdlNode node = (IdlNode) un_node;
+               
+               if (un_node.deprecated) {
+                       return;
+               }
+
+               string name = fix_type_name (node.name, ns);
+
+               if (!is_reference_type (node.name)) {
+                       var st = ns.scope.lookup (name) as Struct;
+                       if (st == null) {
+                               st = new Struct (name, current_source_reference);
+                               st.access = SymbolAccessibility.PUBLIC;
+
+                               var st_attributes = get_attributes (node.name);
+                               if (st_attributes != null) {
+                                       foreach (string attr in st_attributes) {
+                                               var nv = attr.split ("=", 2);
+                                               if (nv[0] == "cheader_filename") {
+                                                       st.add_cheader_filename (eval (nv[1]));
+                                               } else if (nv[0] == "hidden") {
+                                                       if (eval (nv[1]) == "1") {
+                                                               return;
+                                                       }
+                                               }
+                                       }
+                               }
+
+                               ns.add_struct (st);
+                               current_source_file.add_node (st);
+                       }
+
+                       current_data_type = st;
+
+                       foreach (weak IdlNode member in un_node.members) {
+                               if (member.type == IdlNodeTypeId.FUNCTION) {
+                                       var m = parse_function ((IdlNodeFunction) member);
+                                       if (m != null) {
+                                               st.add_method (m);
+                                       }
+                               } else if (member.type == IdlNodeTypeId.FIELD) {
+                                       var f = parse_field ((IdlNodeField) member);
+                                       if (f != null) {
+                                               st.add_field (f);
+                                       }
+                               }
+                       }
+
+                       current_data_type = null;
+               } else {
+                       var cl = ns.scope.lookup (name) as Class;
+                       if (cl == null) {
+                               cl = new Class (name, current_source_reference);
+                               cl.access = SymbolAccessibility.PUBLIC;
+
+                               var cl_attributes = get_attributes (node.name);
+                               if (cl_attributes != null) {
+                                       foreach (string attr in cl_attributes) {
+                                               var nv = attr.split ("=", 2);
+                                               if (nv[0] == "cheader_filename") {
+                                                       cl.add_cheader_filename (eval (nv[1]));
+                                               } else if (nv[0] == "hidden") {
+                                                       if (eval (nv[1]) == "1") {
+                                                               return;
+                                                       }
+                                               }
+                                       }
+                               }
+
+                               ns.add_class (cl);
+                               current_source_file.add_node (cl);
+                       }
+
+                       current_data_type = cl;
+
+                       string ref_function = null;
+                       string unref_function = null;
+                       string copy_function = null;
+                       string free_function = null;
+
+                       foreach (weak IdlNode member in un_node.members) {
+                               if (member.type == IdlNodeTypeId.FUNCTION) {
+                                       if (member.name == "ref") {
+                                               ref_function = ((IdlNodeFunction) member).symbol;
+                                       } else if (member.name == "unref") {
+                                               unref_function = ((IdlNodeFunction) member).symbol;
+                                       } else if (member.name == "free" || member.name == "destroy") {
+                                               free_function = ((IdlNodeFunction) member).symbol;
+                                       } else {
+                                               if (member.name == "copy") {
+                                                       copy_function = ((IdlNodeFunction) member).symbol;
+                                               }
+                                               var m = parse_function ((IdlNodeFunction) member);
+                                               if (m != null) {
+                                                       cl.add_method (m);
+                                               }
+                                       }
+                               } else if (member.type == IdlNodeTypeId.FIELD) {
+                                       var f = parse_field ((IdlNodeField) member);
+                                       if (f != null) {
+                                               cl.add_field (f);
+                                       }
+                               }
+                       }
+
+                       if (ref_function != null) {
+                               cl.set_ref_function (ref_function);
+                       }
+                       if (copy_function != null) {
+                               cl.set_dup_function (copy_function);
+                       }
+                       if (unref_function != null) {
+                               cl.set_unref_function (unref_function);
+                       } else if (free_function != null) {
+                               cl.set_free_function (free_function);
+                       }
+
+                       current_data_type = null;
+               }
+       }
        
        private void parse_boxed (IdlNodeBoxed! boxed_node, Namespace! ns, IdlModule! module) {
                weak IdlNode node = (IdlNode) boxed_node;