From 7c2b6e1b1c1095fd561aa01ea4c05c6b4596f859 Mon Sep 17 00:00:00 2001 From: Juerg Billeter Date: Mon, 21 Apr 2008 20:18:44 +0000 Subject: [PATCH] Various minor binding fixes 2008-04-21 Juerg Billeter * vapi/enchant.vapi: * vapi/glib-2.0.vapi: * vapi/hal.vapi: * vapi/packages/gtk+-2.0/: * vapi/packages/hildon-fm-2/: Various minor binding fixes * vapi/gdk-x11-2.0.vapi: * vapi/gtk+-2.0.vapi: * vapi/hildon-fm-2.vapi: Regenerated svn path=/trunk/; revision=1299 --- ChangeLog | 16 ++++++ vapi/enchant.vapi | 10 ++-- vapi/gdk-x11-2.0.vapi | 74 ++++++++++++++++++++------ vapi/glib-2.0.vapi | 8 +-- vapi/gtk+-2.0.vapi | 2 +- vapi/hal.vapi | 4 +- vapi/hildon-fm-2.vapi | 36 ++++++------- vapi/packages/gtk+-2.0/gtk+-2.0.metadata | 1 + vapi/packages/hildon-fm-2/hildon-fm-2.metadata | 2 + 9 files changed, 107 insertions(+), 46 deletions(-) diff --git a/ChangeLog b/ChangeLog index 10c60cf..aaf1135 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,21 @@ 2008-04-21 Jürg Billeter + * vapi/enchant.vapi: + * vapi/glib-2.0.vapi: + * vapi/hal.vapi: + * vapi/packages/gtk+-2.0/: + * vapi/packages/hildon-fm-2/: + + Various minor binding fixes + + * vapi/gdk-x11-2.0.vapi: + * vapi/gtk+-2.0.vapi: + * vapi/hildon-fm-2.vapi: + + Regenerated + +2008-04-21 Jürg Billeter + * vala/valadynamicmethod.vala: generate unique names for wrapper methods, fixes bug 529251 diff --git a/vapi/enchant.vapi b/vapi/enchant.vapi index 2dc3174..dcff332 100644 --- a/vapi/enchant.vapi +++ b/vapi/enchant.vapi @@ -1,7 +1,7 @@ [CCode (cname_prefix = "enchant_", cheader_filename = "enchant.h")] namespace Enchant { - public static delegate void BrokerDescribeFn (string provider_name, string provider_desc, string provider_dll_file, pointer user_data); - public static delegate void DictDescribeFn (string lang_tag, string provider_name, string provider_desc, string provider_file, pointer user_data); + public delegate void BrokerDescribeFn (string provider_name, string provider_desc, string provider_dll_file); + public delegate void DictDescribeFn (string lang_tag, string provider_name, string provider_desc, string provider_file); [CCode (free_function = "enchant_broker_free")] public class Broker { @@ -13,8 +13,8 @@ namespace Enchant { public void free_dict (Dict dict); // FIXME integrate with memory manager public int dict_exists (weak string tag); public void set_ordering (weak string tag, weak string ordering); - public void describe (BrokerDescribeFn fn, pointer user_data = null); - public void list_dicts (DictDescribeFn fn, pointer user_data = null); + public void describe (BrokerDescribeFn fn); + public void list_dicts (DictDescribeFn fn); public weak string get_error (); } @@ -27,7 +27,7 @@ namespace Enchant { public int is_in_session (weak string word, long len = -1); public void store_replacement (weak string mis, long mis_len, weak string cor, long cor_len); public void add_to_pwl (weak string word, long len = -1); - public void describe (DictDescribeFn fn, pointer user_data = null); + public void describe (DictDescribeFn fn); [NoArrayLength ()] public weak string get_error (); } diff --git a/vapi/gdk-x11-2.0.vapi b/vapi/gdk-x11-2.0.vapi index 5ad1663..4d1b176 100644 --- a/vapi/gdk-x11-2.0.vapi +++ b/vapi/gdk-x11-2.0.vapi @@ -2,54 +2,96 @@ [CCode (cprefix = "Gdk", lower_case_cprefix = "gdk_")] namespace Gdk { - [CCode (cname = "gdkx_visual_get")] + [CCode (cname = "gdkx_visual_get", cheader_filename = "gdk/gdkx.h")] public static weak Gdk.Visual x11_visual_get (uint32 xvisualid); - [CCode (cname = "gdk_net_wm_supports")] + [CCode (cname = "gdk_net_wm_supports", cheader_filename = "gdk/gdkx.h")] public static bool x11_net_wm_supports (Gdk.Atom property); + [CCode (cheader_filename = "gdk/gdkx.h")] public static Gdk.Atom x11_atom_to_xatom (Gdk.Atom atom); + [CCode (cheader_filename = "gdk/gdkx.h")] public static Gdk.Atom x11_atom_to_xatom_for_display (Gdk.Display display, Gdk.Atom atom); + [CCode (cheader_filename = "gdk/gdkx.h")] public static weak Gdk.Colormap x11_colormap_foreign_new (Gdk.Visual visual, Gdk.Colormap xcolormap); + [CCode (cheader_filename = "gdk/gdkx.h")] public static weak Gdk.Colormap x11_colormap_get_xcolormap (Gdk.Colormap colormap); - public static pointer x11_colormap_get_xdisplay (Gdk.Colormap colormap); + [CCode (cheader_filename = "gdk/gdkx.h")] + public static void* x11_colormap_get_xdisplay (Gdk.Colormap colormap); + [CCode (cheader_filename = "gdk/gdkx.h")] public static weak Gdk.Cursor x11_cursor_get_xcursor (Gdk.Cursor cursor); - public static pointer x11_cursor_get_xdisplay (Gdk.Cursor cursor); + [CCode (cheader_filename = "gdk/gdkx.h")] + public static void* x11_cursor_get_xdisplay (Gdk.Cursor cursor); + [CCode (cheader_filename = "gdk/gdkx.h")] public static void x11_display_broadcast_startup_message (Gdk.Display display, string message_type); + [CCode (cheader_filename = "gdk/gdkx.h")] public static weak string x11_display_get_startup_notification_id (Gdk.Display display); + [CCode (cheader_filename = "gdk/gdkx.h")] public static uint x11_display_get_user_time (Gdk.Display display); - public static pointer x11_display_get_xdisplay (Gdk.Display display); + [CCode (cheader_filename = "gdk/gdkx.h")] + public static void* x11_display_get_xdisplay (Gdk.Display display); + [CCode (cheader_filename = "gdk/gdkx.h")] public static void x11_display_grab (Gdk.Display display); + [CCode (cheader_filename = "gdk/gdkx.h")] public static void x11_display_set_cursor_theme (Gdk.Display display, string theme, int size); + [CCode (cheader_filename = "gdk/gdkx.h")] public static void x11_display_ungrab (Gdk.Display display); - public static pointer x11_drawable_get_xdisplay (Gdk.Drawable drawable); + [CCode (cheader_filename = "gdk/gdkx.h")] + public static void* x11_drawable_get_xdisplay (Gdk.Drawable drawable); + [CCode (cheader_filename = "gdk/gdkx.h")] public static uint32 x11_drawable_get_xid (Gdk.Drawable drawable); - public static pointer x11_gc_get_xdisplay (Gdk.GC gc); - public static pointer x11_gc_get_xgc (Gdk.GC gc); + [CCode (cheader_filename = "gdk/gdkx.h")] + public static void* x11_gc_get_xdisplay (Gdk.GC gc); + [CCode (cheader_filename = "gdk/gdkx.h")] + public static void* x11_gc_get_xgc (Gdk.GC gc); + [CCode (cheader_filename = "gdk/gdkx.h")] public static weak Gdk.Window x11_get_default_root_xwindow (); + [CCode (cheader_filename = "gdk/gdkx.h")] public static int x11_get_default_screen (); - public static pointer x11_get_default_xdisplay (); + [CCode (cheader_filename = "gdk/gdkx.h")] + public static void* x11_get_default_xdisplay (); + [CCode (cheader_filename = "gdk/gdkx.h")] public static uint x11_get_server_time (Gdk.Window window); + [CCode (cheader_filename = "gdk/gdkx.h")] public static Gdk.Atom x11_get_xatom_by_name (string atom_name); + [CCode (cheader_filename = "gdk/gdkx.h")] public static Gdk.Atom x11_get_xatom_by_name_for_display (Gdk.Display display, string atom_name); + [CCode (cheader_filename = "gdk/gdkx.h")] public static weak string x11_get_xatom_name (Gdk.Atom xatom); + [CCode (cheader_filename = "gdk/gdkx.h")] public static weak string x11_get_xatom_name_for_display (Gdk.Display display, Gdk.Atom xatom); + [CCode (cheader_filename = "gdk/gdkx.h")] public static void x11_grab_server (); - public static pointer x11_image_get_xdisplay (Gdk.Image image); - public static pointer x11_image_get_ximage (Gdk.Image image); - public static weak Gdk.Display x11_lookup_xdisplay (pointer xdisplay); + [CCode (cheader_filename = "gdk/gdkx.h")] + public static void* x11_image_get_xdisplay (Gdk.Image image); + [CCode (cheader_filename = "gdk/gdkx.h")] + public static void* x11_image_get_ximage (Gdk.Image image); + [CCode (cheader_filename = "gdk/gdkx.h")] + public static weak Gdk.Display x11_lookup_xdisplay (void* xdisplay); + [CCode (cheader_filename = "gdk/gdkx.h")] public static void x11_register_standard_event_type (Gdk.Display display, int event_base, int n_events); + [CCode (cheader_filename = "gdk/gdkx.h")] public static int x11_screen_get_screen_number (Gdk.Screen screen); + [CCode (cheader_filename = "gdk/gdkx.h")] public static weak string x11_screen_get_window_manager_name (Gdk.Screen screen); + [CCode (cheader_filename = "gdk/gdkx.h")] public static weak Gdk.Screen x11_screen_get_xscreen (Gdk.Screen screen); + [CCode (cheader_filename = "gdk/gdkx.h")] public static weak Gdk.Visual x11_screen_lookup_visual (Gdk.Screen screen, uint32 xvisualid); + [CCode (cheader_filename = "gdk/gdkx.h")] public static bool x11_screen_supports_net_wm_hint (Gdk.Screen screen, Gdk.Atom property); + [CCode (cheader_filename = "gdk/gdkx.h")] public static void x11_ungrab_server (); + [CCode (cheader_filename = "gdk/gdkx.h")] public static weak Gdk.Visual x11_visual_get_xvisual (Gdk.Visual visual); + [CCode (cheader_filename = "gdk/gdkx.h")] public static void x11_window_move_to_current_desktop (Gdk.Window window); + [CCode (cheader_filename = "gdk/gdkx.h")] public static void x11_window_set_user_time (Gdk.Window window, uint timestamp); + [CCode (cheader_filename = "gdk/gdkx.h")] public static Gdk.Atom x11_xatom_to_atom (Gdk.Atom xatom); + [CCode (cheader_filename = "gdk/gdkx.h")] public static Gdk.Atom x11_xatom_to_atom_for_display (Gdk.Display display, Gdk.Atom xatom); - [CCode (cname = "gdk_xid_table_lookup")] - public static pointer x11_xid_table_lookup (uint32 xid); - [CCode (cname = "gdk_xid_table_lookup_for_display")] - public static pointer x11_xid_table_lookup_for_display (Gdk.Display display, uint32 xid); + [CCode (cname = "gdk_xid_table_lookup", cheader_filename = "gdk/gdkx.h")] + public static void* x11_xid_table_lookup (uint32 xid); + [CCode (cname = "gdk_xid_table_lookup_for_display", cheader_filename = "gdk/gdkx.h")] + public static void* x11_xid_table_lookup_for_display (Gdk.Display display, uint32 xid); } diff --git a/vapi/glib-2.0.vapi b/vapi/glib-2.0.vapi index dfa1ad7..600a237 100644 --- a/vapi/glib-2.0.vapi +++ b/vapi/glib-2.0.vapi @@ -1962,16 +1962,16 @@ namespace GLib { FILE_AND_ARGV_ZERO } - public static delegate void SpawnChildSetupFunc (void* user_data); + public delegate void SpawnChildSetupFunc (); [CCode (cprefix = "g_")] public static class Process { [NoArrayLength ()] - public static bool spawn_async_with_pipes (string working_directory, string[] argv, string[] envp, SpawnFlags _flags, SpawnChildSetupFunc child_setup, void* user_data, out Pid child_pid, out int standard_input = null, out int standard_output = null, out int standard_error = null) throws SpawnError; + public static bool spawn_async_with_pipes (string? working_directory, string[] argv, string[]? envp, SpawnFlags _flags, SpawnChildSetupFunc? child_setup, out Pid child_pid, out int standard_input = null, out int standard_output = null, out int standard_error = null) throws SpawnError; [NoArrayLength ()] - public static bool spawn_async (string working_directory, string[] argv, string[] envp, SpawnFlags _flags, SpawnChildSetupFunc child_setup, void* user_data, out Pid child_pid) throws SpawnError; + public static bool spawn_async (string? working_directory, string[] argv, string[]? envp, SpawnFlags _flags, SpawnChildSetupFunc? child_setup, out Pid child_pid) throws SpawnError; [NoArrayLength ()] - public static bool spawn_sync (string working_directory, string[] argv, string[] envp, SpawnFlags _flags, SpawnChildSetupFunc child_setup, void* user_data, out string standard_output = null, out string standard_error = null, out int exit_status = null) throws SpawnError; + public static bool spawn_sync (string? working_directory, string[] argv, string[]? envp, SpawnFlags _flags, SpawnChildSetupFunc? child_setup, out string standard_output = null, out string standard_error = null, out int exit_status = null) throws SpawnError; public static bool spawn_command_line_async (string command_line) throws SpawnError; public static bool spawn_command_line_sync (string command_line, out string standard_output = null, out string standard_error = null, out int exit_status = null) throws SpawnError; [CCode (cname = "g_spawn_close_pid")] diff --git a/vapi/gtk+-2.0.vapi b/vapi/gtk+-2.0.vapi index 8d0d213..5974980 100644 --- a/vapi/gtk+-2.0.vapi +++ b/vapi/gtk+-2.0.vapi @@ -5252,7 +5252,7 @@ namespace Gtk { public void convert_iter_to_child_iter (out Gtk.TreeIter child_iter, Gtk.TreeIter filter_iter); public weak Gtk.TreePath convert_path_to_child_path (Gtk.TreePath filter_path); public weak Gtk.TreeModel get_model (); - public TreeModelFilter (Gtk.TreeModel child_model, Gtk.TreePath root); + public TreeModelFilter (Gtk.TreeModel child_model, Gtk.TreePath? root); public void refilter (); public void set_modify_func (int n_columns, GLib.Type[] types, Gtk.TreeModelFilterModifyFunc func, void* data, Gtk.DestroyNotify destroy); public void set_visible_column (int column); diff --git a/vapi/hal.vapi b/vapi/hal.vapi index 24e96e2..d72f266 100644 --- a/vapi/hal.vapi +++ b/vapi/hal.vapi @@ -30,8 +30,8 @@ namespace Hal { public Context (); public bool init (ref DBus.RawError error); public bool set_dbus_connection (DBus.RawConnection conn); - public bool set_user_data (pointer user_data); - public pointer get_user_data (); + public bool set_user_data (void* user_data); + public void* get_user_data (); public bool set_device_added (DeviceAdded _callback); public bool set_device_removed (DeviceRemoved _callback); [NoArrayLength] diff --git a/vapi/hildon-fm-2.vapi b/vapi/hildon-fm-2.vapi index 225f3e8..94eaeb6 100644 --- a/vapi/hildon-fm-2.vapi +++ b/vapi/hildon-fm-2.vapi @@ -2,31 +2,31 @@ [CCode (cprefix = "Hildon", lower_case_cprefix = "hildon_")] namespace Hildon { - [CCode (cprefix = "HILDON_FILE_SELECTION_MODE_", cheader_filename = "hildon/hildon-file-selection.h")] + [CCode (cprefix = "HILDON_FILE_SELECTION_MODE_", has_type_id = "0", cheader_filename = "hildon/hildon-file-selection.h")] public enum FileSelectionMode { LIST, - THUMBNAILS, + THUMBNAILS } - [CCode (cprefix = "HILDON_FILE_SELECTION_PANE_", cheader_filename = "hildon/hildon-file-selection.h")] + [CCode (cprefix = "HILDON_FILE_SELECTION_PANE_", has_type_id = "0", cheader_filename = "hildon/hildon-file-selection.h")] public enum FileSelectionPane { NAVIGATION, - CONTENT, + CONTENT } - [CCode (cprefix = "HILDON_FILE_SELECTION_SORT_", cheader_filename = "hildon/hildon-file-selection.h")] + [CCode (cprefix = "HILDON_FILE_SELECTION_SORT_", has_type_id = "0", cheader_filename = "hildon/hildon-file-selection.h")] public enum FileSelectionSortKey { NAME, TYPE, MODIFIED, - SIZE, + SIZE } - [CCode (cprefix = "HILDON_FILE_SELECTION_SHOW_", cheader_filename = "hildon/hildon-file-selection.h")] + [CCode (cprefix = "HILDON_FILE_SELECTION_SHOW_", has_type_id = "0", cheader_filename = "hildon/hildon-file-selection.h")] public enum FileSelectionVisibleColumns { NAME, MODIFIED, SIZE, - ALL, + ALL } - [CCode (cprefix = "HILDON_FILE_SYSTEM_MODEL_", cheader_filename = "hildon/hildon-file-system-model.h")] + [CCode (cprefix = "HILDON_FILE_SYSTEM_MODEL_", has_type_id = "0", cheader_filename = "hildon/hildon-file-system-model.h")] public enum FileSystemModelColumns { COLUMN_GTK_PATH_INTERNAL, COLUMN_LOCAL_PATH, @@ -55,9 +55,9 @@ namespace Hildon { COLUMN_SORT_WEIGHT, COLUMN_EXTRA_INFO, COLUMN_IS_DRIVE, - NUM_COLUMNS, + NUM_COLUMNS } - [CCode (cprefix = "HILDON_FILE_SYSTEM_MODEL_", cheader_filename = "hildon/hildon-file-system-model.h")] + [CCode (cprefix = "HILDON_FILE_SYSTEM_MODEL_", has_type_id = "0", cheader_filename = "hildon/hildon-file-system-model.h")] public enum FileSystemModelItemType { UNKNOWN, FILE, @@ -69,12 +69,12 @@ namespace Hildon { SAFE_FOLDER_GAMES, MMC, GATEWAY, - LOCAL_DEVICE, + LOCAL_DEVICE } [CCode (cheader_filename = "hildon/hildon-file-system-info.h")] public class FileSystemInfo { public static void async_cancel (Hildon.FileSystemInfoHandle handle); - public static weak Hildon.FileSystemInfoHandle async_new (string uri, Hildon.FileSystemInfoCallback callback, pointer data); + public static weak Hildon.FileSystemInfoHandle async_new (string uri, Hildon.FileSystemInfoCallback callback); public weak string get_display_name (); public weak Gdk.Pixbuf get_icon (Gtk.Widget ref_widget); public weak Gdk.Pixbuf get_icon_at_size (Gtk.Widget ref_widget, int size); @@ -183,7 +183,7 @@ namespace Hildon { [NoAccessorMethod] public weak int pane_position { get; set construct; } [NoAccessorMethod] - public weak pointer safe_folder { get; set; } + public weak void* safe_folder { get; set; } [NoAccessorMethod] public weak bool show_hidden { get; set; } [NoAccessorMethod] @@ -196,7 +196,7 @@ namespace Hildon { public signal void location_insensitive (Gtk.TreeIter iter); public signal void navigation_pane_context_menu (); public signal void selection_changed (); - public signal void uris_dropped (string destination, pointer sources); + public signal void uris_dropped (string destination, void* sources); } [CCode (cheader_filename = "hildon/hildon-file-system-model.h")] public class FileSystemModel : GLib.Object, Gtk.TreeModel, Gtk.TreeDragSource { @@ -211,7 +211,7 @@ namespace Hildon { [NoAccessorMethod] public weak string backend { get; construct; } [NoAccessorMethod] - public weak pointer backend_object { get; construct; } + public weak void* backend_object { get; construct; } [NoAccessorMethod] public weak bool multi_root { get; construct; } [NoAccessorMethod] @@ -219,7 +219,7 @@ namespace Hildon { [NoAccessorMethod] public weak string root_dir { get; construct; } [NoAccessorMethod] - public weak pointer thumbnail_callback { get; set; } + public weak void* thumbnail_callback { get; set; } public signal void device_disconnected (Gtk.TreeIter iter); public signal void finished_loading (Gtk.TreeIter iter); } @@ -229,7 +229,7 @@ namespace Hildon { public static void set_uri (Gtk.Widget widget, string uri_str); } [CCode (cheader_filename = "hildon/hildon-file-system-info.h")] - public static delegate void FileSystemInfoCallback (Hildon.FileSystemInfoHandle handle, Hildon.FileSystemInfo info, GLib.Error error, pointer data); + public delegate void FileSystemInfoCallback (Hildon.FileSystemInfoHandle handle, Hildon.FileSystemInfo info, GLib.Error error); [CCode (cheader_filename = "hildon/hildon-file-system-model.h")] public static delegate bool FileSystemModelThumbnailCallback (string uri, string path, string thumbnail_file); } diff --git a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata index 86aa99f..934606c 100644 --- a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata +++ b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata @@ -218,6 +218,7 @@ GtkToolbar.GtkTooltips hidden="1" GtkToolbar.gpointer hidden="1" GtkToolItem::set_tooltip hidden="1" GtkTreeIter is_value_type="1" +gtk_tree_model_filter_new.root nullable="1" gtk_tree_model_get ellipsis="1" sentinel="-1" gtk_tree_model_get_iter.iter is_out="1" gtk_tree_model_get_iter_first.iter is_out="1" diff --git a/vapi/packages/hildon-fm-2/hildon-fm-2.metadata b/vapi/packages/hildon-fm-2/hildon-fm-2.metadata index 1915128..9196dce 100644 --- a/vapi/packages/hildon-fm-2/hildon-fm-2.metadata +++ b/vapi/packages/hildon-fm-2/hildon-fm-2.metadata @@ -20,6 +20,7 @@ hildon_file_selection_get_current_folder hidden="1" hildon_file_selection_set_current_folder hidden="1" hildon_file_selection_select_path hidden="1" hildon_file_selection_unselect_path hidden="1" +hildon_file_system_info_async_new.data hidden="1" hildon_file_system_model_load_path hidden="1" hildon_file_system_model_search_path hidden="1" hildon_file_chooser_dialog_selection_mode hidden="1" @@ -27,3 +28,4 @@ HildonFileSystemStorageDialogPriv hidden="1" HildonFileChooserDialogSelectionMode name="int" GtkFileSystem name="pointer" GtkFilePath name="pointer" + -- 2.7.4