GNOME.org
 

vala r1126 - in trunk: . vapi vapi/packages/gdk-2.0 vapi/packages/gtk+-2.0

Author: juergbi
Date: Fri Mar 14 15:36:05 2008
New Revision: 1126
URL: http://svn.gnome.org/viewvc/vala?rev=1126&view=rev

Log:
2008-03-14  Juerg Billeter  <j bitron ch>

	* vapi/packages/gdk-2.0/, vapi/packages/gtk+-2.0/: fix gdk/gtk_init
	  bindings, fixes bug 521842

	* vapi/gdk-2.0.vapi, vapi/gtk+-2.0.vapi: regenerated


Modified:
   trunk/ChangeLog
   trunk/vapi/gdk-2.0.vapi
   trunk/vapi/gtk+-2.0.vapi
   trunk/vapi/packages/gdk-2.0/gdk-2.0.metadata
   trunk/vapi/packages/gtk+-2.0/gtk+-2.0-custom.vala
   trunk/vapi/packages/gtk+-2.0/gtk+-2.0.metadata

Modified: trunk/vapi/gdk-2.0.vapi
==============================================================================
--- trunk/vapi/gdk-2.0.vapi	(original)
+++ trunk/vapi/gdk-2.0.vapi	Fri Mar 14 15:36:05 2008
@@ -855,7 +855,7 @@
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public class RgbCmap {
 		[NoArrayLength]
-		public weak uint[] colors;
+		public uint[] colors;
 		public int n_colors;
 		public weak GLib.SList info_list;
 		public RgbCmap (uint[] colors);
@@ -877,7 +877,7 @@
 	public class TimeCoord {
 		public uint time;
 		[NoArrayLength]
-		public weak double[] axes;
+		public double[] axes;
 	}
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public class Trapezoid {
@@ -991,19 +991,19 @@
 		public weak GLib.List queued_events;
 		public weak GLib.List queued_tail;
 		[NoArrayLength]
-		public weak uint[] button_click_time;
+		public uint[] button_click_time;
 		[NoArrayLength]
-		public weak Gdk.Window[] button_window;
+		public Gdk.Window[] button_window;
 		[NoArrayLength]
-		public weak int[] button_number;
+		public int[] button_number;
 		public uint double_click_time;
 		public weak Gdk.Device core_pointer;
 		public weak Gdk.DisplayPointerHooks pointer_hooks;
 		public uint double_click_distance;
 		[NoArrayLength]
-		public weak int[] button_x;
+		public int[] button_x;
 		[NoArrayLength]
-		public weak int[] button_y;
+		public int[] button_y;
 		public void add_client_message_filter (Gdk.Atom message_type, Gdk.FilterFunc func, pointer data);
 		public void beep ();
 		public void close ();
@@ -1214,9 +1214,9 @@
 	public class Screen : GLib.Object {
 		public uint closed;
 		[NoArrayLength]
-		public weak Gdk.GC[] normal_gcs;
+		public Gdk.GC[] normal_gcs;
 		[NoArrayLength]
-		public weak Gdk.GC[] exposure_gcs;
+		public Gdk.GC[] exposure_gcs;
 		public void broadcast_client_message (Gdk.Event event);
 		public weak Gdk.Window get_active_window ();
 		public static weak Gdk.Screen get_default ();
@@ -1577,7 +1577,7 @@
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static bool get_show_events ();
 	[CCode (cheader_filename = "gdk/gdk.h")]
-	public static void init (int argc, string argv);
+	public static void init ([CCode (array_length_pos = 0.9)] ref string[] argv);
 	[CCode (cheader_filename = "gdk/gdk.h")]
 	public static bool init_check (int argc, string argv);
 	[CCode (cheader_filename = "gdk/gdk.h")]

Modified: trunk/vapi/gtk+-2.0.vapi
==============================================================================
--- trunk/vapi/gtk+-2.0.vapi	(original)
+++ trunk/vapi/gtk+-2.0.vapi	Fri Mar 14 15:36:05 2008
@@ -1349,9 +1349,9 @@
 		public weak string abbrev;
 		public double pixels_per_unit;
 		[NoArrayLength]
-		public weak double[] ruler_scale;
+		public double[] ruler_scale;
 		[NoArrayLength]
-		public weak int[] subdivide;
+		public int[] subdivide;
 	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class SettingsPropertyValue {
@@ -1556,7 +1556,7 @@
 		public Gdk.Atom type;
 		public int format;
 		[NoArrayLength]
-		public weak uchar[] data;
+		public uchar[] data;
 		public int length;
 		public weak Gdk.Display display;
 		public weak Gtk.SelectionData copy ();
@@ -2058,13 +2058,13 @@
 		public weak Gtk.Style label_style;
 		public int selected_day;
 		[NoArrayLength]
-		public weak int[] day_month;
+		public int[] day_month;
 		public int num_marked_dates;
 		[NoArrayLength]
-		public weak int[] marked_date;
+		public int[] marked_date;
 		public Gtk.CalendarDisplayOptions display_flags;
 		[NoArrayLength]
-		public weak Gdk.Color[] marked_date_color;
+		public Gdk.Color[] marked_date_color;
 		public weak Gdk.GC gc;
 		public weak Gdk.GC xor_gc;
 		public int focus_row;
@@ -2072,7 +2072,7 @@
 		public int highlight_row;
 		public int highlight_col;
 		[NoArrayLength]
-		public weak char[] grow_space;
+		public char[] grow_space;
 		public void clear_marks ();
 		public void get_date (uint year, uint month, uint day);
 		public Gtk.CalendarDisplayOptions get_display_options ();
@@ -2589,7 +2589,7 @@
 		public weak Gdk.Point point;
 		public int num_ctlpoints;
 		[NoArrayLength]
-		public weak float[] ctlpoint;
+		public float[] ctlpoint;
 		public void get_vector (int veclen, float[] vector);
 		public Curve ();
 		public void reset ();
@@ -2949,7 +2949,7 @@
 		public weak Gtk.Widget table;
 		public weak Gtk.Widget curve;
 		[NoArrayLength]
-		public weak Gtk.Widget[] button;
+		public Gtk.Widget[] button;
 		public float gamma;
 		public weak Gtk.Widget gamma_dialog;
 		public weak Gtk.Widget gamma_text;
@@ -3036,7 +3036,7 @@
 	public class IMContextSimple : Gtk.IMContext {
 		public weak GLib.SList tables;
 		[NoArrayLength]
-		public weak uint[] compose_buffer;
+		public uint[] compose_buffer;
 		public unichar tentative_match;
 		public int tentative_match_len;
 		public uint in_hex_sequence;
@@ -3236,7 +3236,7 @@
 		public weak Gtk.Widget close_button;
 		public weak Gtk.Widget save_button;
 		[NoArrayLength]
-		public weak Gtk.Widget[] axis_items;
+		public Gtk.Widget[] axis_items;
 		public weak Gdk.Device current_device;
 		public weak Gtk.Widget keys_list;
 		public weak Gtk.Widget keys_listbox;
@@ -3384,7 +3384,7 @@
 		public int sort_column_id;
 		public Gtk.SortType order;
 		[NoArrayLength]
-		public weak GLib.Type[] column_headers;
+		public GLib.Type[] column_headers;
 		public int length;
 		public Gtk.TreeIterCompareFunc default_sort_func;
 		public pointer default_sort_data;
@@ -4072,18 +4072,18 @@
 	public class RcStyle : GLib.Object {
 		public weak string name;
 		[NoArrayLength]
-		public weak string[] bg_pixmap_name;
+		public string[] bg_pixmap_name;
 		public weak Pango.FontDescription font_desc;
 		[NoArrayLength]
-		public weak Gtk.RcFlags[] color_flags;
+		public Gtk.RcFlags[] color_flags;
 		[NoArrayLength]
-		public weak Gdk.Color[] fg;
+		public Gdk.Color[] fg;
 		[NoArrayLength]
-		public weak Gdk.Color[] bg;
+		public Gdk.Color[] bg;
 		[NoArrayLength]
-		public weak Gdk.Color[] text;
+		public Gdk.Color[] text;
 		[NoArrayLength]
-		public weak Gdk.Color[] @base;
+		public Gdk.Color[] @base;
 		public int xthickness;
 		public int ythickness;
 		public weak GLib.Array rc_properties;
@@ -5331,7 +5331,7 @@
 		public weak GLib.List sort_list;
 		public Gtk.SortType order;
 		[NoArrayLength]
-		public weak GLib.Type[] column_headers;
+		public GLib.Type[] column_headers;
 		public Gtk.TreeIterCompareFunc default_sort_func;
 		public pointer default_sort_data;
 		public Gtk.DestroyNotify default_sort_destroy;
@@ -6528,8 +6528,6 @@
 	public const int TEXT_VIEW_PRIORITY_VALIDATE;
 	public const int TYPE_FUNDAMENTAL_LAST;
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static void init ([CCode (array_length_pos = 0.9)] ref string[] args);
-	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static bool accel_groups_activate (GLib.Object object, uint accel_key, Gdk.ModifierType accel_mods);
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static weak GLib.SList accel_groups_from_object (GLib.Object object);
@@ -6666,11 +6664,13 @@
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static GLib.Type identifier_get_type ();
 	[CCode (cheader_filename = "gtk/gtk.h")]
+	public static void init ([CCode (array_length_pos = 0.9)] ref string[] argv);
+	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static void init_add (Gtk.Function function, pointer data);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static bool init_check (int argc, string[] argv);
+	public static bool init_check ([CCode (array_length_pos = 0.9)] ref string[] argv);
 	[CCode (cheader_filename = "gtk/gtk.h")]
-	public static bool init_with_args (int argc, string[] argv, string parameter_string, GLib.OptionEntry[] entries, string translation_domain) throws GLib.Error;
+	public static bool init_with_args ([CCode (array_length_pos = 0.9)] ref string[] argv, string parameter_string, GLib.OptionEntry[] entries, string translation_domain) throws GLib.Error;
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public static uint key_snooper_install (Gtk.KeySnoopFunc snooper, pointer func_data);
 	[CCode (cheader_filename = "gtk/gtk.h")]

Modified: trunk/vapi/packages/gdk-2.0/gdk-2.0.metadata
==============================================================================
--- trunk/vapi/packages/gdk-2.0/gdk-2.0.metadata	(original)
+++ trunk/vapi/packages/gdk-2.0/gdk-2.0.metadata	Fri Mar 14 15:36:05 2008
@@ -10,6 +10,10 @@
 GdkDisplay.closed hidden="1"
 gdk_drawable_get_size.width is_out="1"
 gdk_drawable_get_size.height is_out="1"
+gdk_init.argc hidden="1"
+gdk_init.argv is_array="1" is_ref="1" array_length_pos="0.9"
+gdk_init_check.argc hidden="1"
+gdk_init_check.argv is_array="1" is_ref="1" array_length_pos="0.9"
 GdkPixmapObject hidden="1"
 GdkPixmapObjectClass hidden="1"
 gdk_property_get.actual_property_type is_out="1"

Modified: trunk/vapi/packages/gtk+-2.0/gtk+-2.0-custom.vala
==============================================================================
--- trunk/vapi/packages/gtk+-2.0/gtk+-2.0-custom.vala	(original)
+++ trunk/vapi/packages/gtk+-2.0/gtk+-2.0-custom.vala	Fri Mar 14 15:36:05 2008
@@ -21,9 +21,6 @@
  */
 
 namespace Gtk {
-	[Import]
-	public void init ([CCode (array_length_pos = 0.9)] ref string[] args);
-
 	public struct Allocation {
 		public int x;
 		public int y;

Modified: trunk/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
==============================================================================
--- trunk/vapi/packages/gtk+-2.0/gtk+-2.0.metadata	(original)
+++ trunk/vapi/packages/gtk+-2.0/gtk+-2.0.metadata	Fri Mar 14 15:36:05 2008
@@ -68,11 +68,14 @@
 gtk_icon_view_unselect_all hidden="1" experimental="1"
 GtkImage.data hidden="1"
 GtkIMContext::delete_surrounding has_emitter="1"
-gtk_init hidden="1"
-gtk_init_abi_check.argv is_array="1"
-gtk_init_check.argv is_array="1"
-gtk_init_check_abi_check.argv is_array="1"
-gtk_init_with_args.argv is_array="1"
+gtk_init.argc hidden="1"
+gtk_init.argv is_array="1" is_ref="1" array_length_pos="0.9"
+gtk_init_check.argc hidden="1"
+gtk_init_check.argv is_array="1" is_ref="1" array_length_pos="0.9"
+gtk_init_check_abi_check.argc hidden="1"
+gtk_init_check_abi_check.argv is_array="1" is_ref="1" array_length_pos="0.9"
+gtk_init_with_args.argc hidden="1"
+gtk_init_with_args.argv is_array="1" is_ref="1" array_length_pos="0.9"
 gtk_init_with_args.entries is_array="1"
 GtkItem::deselect has_emitter="1"
 GtkItem::select has_emitter="1"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]