From fde5cc92853732e4c11acdc58d0a367593ad8d80 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=BCrg=20Billeter?= Date: Mon, 7 May 2007 10:05:06 +0000 Subject: [PATCH] correct strstr cname, patch by Zsombor add ellipsis to Gtk.ListStore.set() MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 2007-05-07 Jürg Billeter * vapi/glib-2.0.vala: correct strstr cname, patch by Zsombor * vapi/gtk+-2.0.vala: add ellipsis to Gtk.ListStore.set() and Gtk.TreeStore.set() * vapi/gdk-2.0.vala, vapi/gtk+-2.0.vala: update to GTK+ 2.10.12 svn path=/trunk/; revision=309 --- ChangeLog | 7 +++++++ vapi/gdk-2.0.vala | 8 +++++--- vapi/glib-2.0.vala | 2 +- vapi/gtk+-2.0.vala | 35 +++++++++++++++++++------------- vapi/packages/gdk-2.0/gdk-2.0.gidl | 2 ++ vapi/packages/gtk+-2.0/gtk+-2.0.gidl | 6 ++++++ vapi/packages/gtk+-2.0/gtk+-2.0.metadata | 2 ++ 7 files changed, 44 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index c54d1db..fd469a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2007-05-07 Jürg Billeter + * vapi/glib-2.0.vala: correct strstr cname, patch by Zsombor + * vapi/gtk+-2.0.vala: add ellipsis to Gtk.ListStore.set() and + Gtk.TreeStore.set() + * vapi/gdk-2.0.vala, vapi/gtk+-2.0.vala: update to GTK+ 2.10.12 + +2007-05-07 Jürg Billeter + * gobject/valacodegenerator.vala, gobject/valacodegeneratormemberaccess.vala: ensure that local variables don't use keywords in the C code diff --git a/vapi/gdk-2.0.vala b/vapi/gdk-2.0.vala index d1af4ea..0046840 100644 --- a/vapi/gdk-2.0.vala +++ b/vapi/gdk-2.0.vala @@ -511,6 +511,7 @@ namespace Gdk { VISUAL, WMCLASS, NOREDIR, + TYPE_HINT, } [CCode (cprefix = "GDK_INPUT_")] public enum WindowClass { @@ -650,7 +651,7 @@ namespace Gdk { } [CCode (cheader_filename = "gdk/gdk.h")] public class DisplayManager : GLib.Object { - public static weak Gdk.DisplayManager @get (); + public static weak Gdk.DisplayManager get (); public weak Gdk.Display get_default_display (); public static GLib.Type get_type (); public weak GLib.SList list_displays (); @@ -1604,6 +1605,7 @@ namespace Gdk { public weak string wmclass_name; public weak string wmclass_class; public bool override_redirect; + public Gdk.WindowTypeHint type_hint; } [ReferenceType] public struct WindowObject { @@ -1692,7 +1694,7 @@ namespace Gdk { public struct Event { public weak Gdk.Event copy (); public void free (); - public static weak Gdk.Event @get (); + public static weak Gdk.Event get (); public bool get_axis (Gdk.AxisUse axis_use, double value); public bool get_coords (double x_win, double y_win); public static weak Gdk.Event get_graphics_expose (Gdk.Window window); @@ -1754,7 +1756,7 @@ namespace Gdk { public static void change (Gdk.Window window, Gdk.Atom property, Gdk.Atom type, int format, Gdk.PropMode mode, uchar[] data, int nelements); public static void delete (Gdk.Window window, Gdk.Atom property); [NoArrayLength] - public static bool @get (Gdk.Window window, Gdk.Atom property, Gdk.Atom type, ulong offset, ulong length, int pdelete, ref Gdk.Atom actual_property_type, int actual_format, int actual_length, uchar[] data); + public static bool get (Gdk.Window window, Gdk.Atom property, Gdk.Atom type, ulong offset, ulong length, int pdelete, ref Gdk.Atom actual_property_type, int actual_format, int actual_length, uchar[] data); } [ReferenceType] public struct Query { diff --git a/vapi/glib-2.0.vala b/vapi/glib-2.0.vala index 65773e8..dbe3749 100644 --- a/vapi/glib-2.0.vala +++ b/vapi/glib-2.0.vala @@ -426,7 +426,7 @@ public enum UnicodeBreakType { [ReferenceType (dup_function = "g_strdup", free_function = "g_free", type_id = "G_TYPE_STRING")] [CCode (cname = "char", const_cname = "const char", cheader_filename = "stdlib.h,string.h,glib.h", type_id = "G_TYPE_STRING", marshaller_type_name = "STRING", get_value_function = "g_value_get_string", set_value_function = "g_value_set_string")] public struct string { - [CCode (cname = "g_strstr")] + [CCode (cname = "strstr")] public weak string str (string! needle); [CCode (cname = "g_str_has_prefix")] public bool has_prefix (string! prefix); diff --git a/vapi/gtk+-2.0.vala b/vapi/gtk+-2.0.vala index 022e6c0..84c5851 100644 --- a/vapi/gtk+-2.0.vala +++ b/vapi/gtk+-2.0.vala @@ -954,7 +954,7 @@ namespace Gtk { public static bool change_entry (string accel_path, uint accel_key, Gdk.ModifierType accel_mods, bool replace); public static void @foreach (pointer data, Gtk.AccelMapForeach foreach_func); public static void foreach_unfiltered (pointer data, Gtk.AccelMapForeach foreach_func); - public static weak Gtk.AccelMap @get (); + public static weak Gtk.AccelMap get (); public static GLib.Type get_type (); public static void load (string file_name); public static void load_fd (int fd); @@ -1091,7 +1091,7 @@ namespace Gtk { public void get_padding (uint padding_top, uint padding_bottom, uint padding_left, uint padding_right); public static GLib.Type get_type (); public Alignment (float xalign, float yalign, float xscale, float yscale); - public void @set (float xalign, float yalign, float xscale, float yscale); + public void set (float xalign, float yalign, float xscale, float yscale); public void set_padding (uint padding_top, uint padding_bottom, uint padding_left, uint padding_right); [NoAccessorMethod] public weak float xalign { get; set; } @@ -1114,7 +1114,7 @@ namespace Gtk { public class Arrow : Gtk.Misc { public static GLib.Type get_type (); public Arrow (Gtk.ArrowType arrow_type, Gtk.ShadowType shadow_type); - public void @set (Gtk.ArrowType arrow_type, Gtk.ShadowType shadow_type); + public void set (Gtk.ArrowType arrow_type, Gtk.ShadowType shadow_type); [NoAccessorMethod] public weak Gtk.ArrowType arrow_type { get; set; } [NoAccessorMethod] @@ -1124,7 +1124,7 @@ namespace Gtk { public class AspectFrame : Gtk.Frame { public static GLib.Type get_type (); public AspectFrame (string label, float xalign, float yalign, float ratio, bool obey_child); - public void @set (float xalign, float yalign, float ratio, bool obey_child); + public void set (float xalign, float yalign, float ratio, bool obey_child); [NoAccessorMethod] public weak float xalign { get; set; } [NoAccessorMethod] @@ -1513,7 +1513,7 @@ namespace Gtk { [CCode (cheader_filename = "gtk/gtk.h")] public class Clipboard : GLib.Object { public void clear (); - public static weak Gtk.Clipboard @get (Gdk.Atom selection); + public static weak Gtk.Clipboard get (Gdk.Atom selection); public weak Gdk.Display get_display (); public static weak Gtk.Clipboard get_for_display (Gdk.Display display, Gdk.Atom selection); public weak GLib.Object get_owner (); @@ -2499,7 +2499,7 @@ namespace Gtk { public void prepend (ref Gtk.TreeIter iter); public bool remove (ref Gtk.TreeIter iter); public void reorder (int new_order); - public void @set (ref Gtk.TreeIter iter); + public void set (ref Gtk.TreeIter iter, ...); public void set_column_types (int n_columns, GLib.Type types); public void set_valist (ref Gtk.TreeIter iter, pointer var_args); public void set_value (ref Gtk.TreeIter iter, int column, GLib.Value value); @@ -2839,7 +2839,7 @@ namespace Gtk { public static GLib.Type get_type (); public bool has_choice (string choice); public PrinterOption (string name, string display_text, Gtk.PrinterOptionType type); - public void @set (string value); + public void set (string value); public signal void changed (); } [CCode (cheader_filename = "gtk/gtk.h")] @@ -2989,7 +2989,7 @@ namespace Gtk { public class PrintSettings : GLib.Object { public weak Gtk.PrintSettings copy (); public void @foreach (Gtk.PrintSettingsFunc func, pointer user_data); - public weak string @get (string key); + public weak string get (string key); public bool get_bool (string key); public bool get_collate (); public weak string get_default_source (); @@ -3021,7 +3021,7 @@ namespace Gtk { public bool get_use_color (); public bool has_key (string key); public PrintSettings (); - public void @set (string key, string value); + public void set (string key, string value); public void set_bool (string key, bool value); public void set_collate (bool collate); public void set_default_source (string default_source); @@ -4096,7 +4096,7 @@ namespace Gtk { public void prepend (ref Gtk.TreeIter iter, ref Gtk.TreeIter parent); public bool remove (ref Gtk.TreeIter iter); public void reorder (ref Gtk.TreeIter parent, int new_order); - public void @set (ref Gtk.TreeIter iter); + public void set (ref Gtk.TreeIter iter, ...); public void set_column_types (int n_columns, GLib.Type types); public void set_valist (ref Gtk.TreeIter iter, pointer var_args); public void set_value (ref Gtk.TreeIter iter, int column, GLib.Value value); @@ -4901,7 +4901,7 @@ namespace Gtk { } public interface TreeModel { public void @foreach (Gtk.TreeModelForeachFunc func, pointer user_data); - public void @get (ref Gtk.TreeIter iter); + public void get (ref Gtk.TreeIter iter); public virtual GLib.Type get_column_type (int index_); public virtual Gtk.TreeModelFlags get_flags (); public virtual bool get_iter (ref Gtk.TreeIter iter, Gtk.TreePath path); @@ -4943,6 +4943,13 @@ namespace Gtk { public signal void sort_column_changed (); } [ReferenceType] + public struct CacheInfo { + public weak string cache; + public ulong cache_size; + public uint n_directories; + public int @flags; + } + [ReferenceType] public struct AccelGroupEntry { public weak Gtk.AccelKey key; public GLib.Closure closure; @@ -5302,7 +5309,7 @@ namespace Gtk { public static GLib.Type get_type (); public weak string get_uris (); [NoArrayLength] - public void @set (Gdk.Atom type, int format, uchar[] data, int length); + public void set (Gdk.Atom type, int format, uchar[] data, int length); public bool set_pixbuf (Gdk.Pixbuf pixbuf); public bool set_text (string str, int len); public bool set_uris (string uris); @@ -5638,7 +5645,7 @@ namespace Gtk { public weak Gtk.Widget widget; public weak string tip_text; public weak string tip_private; - public static weak Gtk.TooltipsData @get (Gtk.Widget widget); + public static weak Gtk.TooltipsData get (Gtk.Widget widget); } public struct TreeIter { public int stamp; @@ -5778,7 +5785,7 @@ namespace Gtk { } [ReferenceType] public struct Gc { - public static weak Gdk.GC @get (int depth, Gdk.Colormap colormap, Gdk.GCValues values, Gdk.GCValuesMask values_mask); + public static weak Gdk.GC get (int depth, Gdk.Colormap colormap, Gdk.GCValues values, Gdk.GCValuesMask values_mask); public static void release (Gdk.GC gc); } [ReferenceType] diff --git a/vapi/packages/gdk-2.0/gdk-2.0.gidl b/vapi/packages/gdk-2.0/gdk-2.0.gidl index 390f9c8..93db23e 100644 --- a/vapi/packages/gdk-2.0/gdk-2.0.gidl +++ b/vapi/packages/gdk-2.0/gdk-2.0.gidl @@ -470,6 +470,7 @@ + @@ -4958,6 +4959,7 @@ + diff --git a/vapi/packages/gtk+-2.0/gtk+-2.0.gidl b/vapi/packages/gtk+-2.0/gtk+-2.0.gidl index 2eb2308..a7dad02 100644 --- a/vapi/packages/gtk+-2.0/gtk+-2.0.gidl +++ b/vapi/packages/gtk+-2.0/gtk+-2.0.gidl @@ -22358,6 +22358,12 @@ + + + + + + diff --git a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata index e009afe..ea5e00f 100644 --- a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata +++ b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata @@ -32,6 +32,7 @@ GtkItem::select has_emitter="1" GtkItem::toggle has_emitter="1" gtk_list_store_new ellipsis="1" gtk_list_store_insert_with_values ellipsis="1" +gtk_list_store_set ellipsis="1" GtkMenuItem::activate has_emitter="1" GtkMenuItem::toggle_size_allocate has_emitter="1" GtkMenuItem::toggle_size_request has_emitter="1" @@ -64,6 +65,7 @@ GtkTreeModel::row_has_child_toggled has_emitter="1" GtkTreeModel::row_inserted has_emitter="1" GtkTreeModel::rows_reordered has_emitter="1" GtkTreePath is_value_type="0" +gtk_tree_store_set ellipsis="1" GtkTreeSortable::sort_column_changed has_emitter="1" gtk_tree_view_insert_column_with_attributes ellipsis="1" GtkTreeView::row_activated has_emitter="1" -- 2.7.4