[vala] gtk+-2.0: Fix several GtkIMContext-related bindings

[Evan Nemerson <evann src gnome org>]

commit 34cab689ebead817a7f6b960ef8fca91f4d0d1d1
Author: Evan Nemerson <evan coeus-group com>
Date:   Sat Mar 13 18:50:41 2010 -0800

    gtk+-2.0: Fix several GtkIMContext-related bindings
    
    Fixes bug 611533.

 vapi/gtk+-2.0.vapi                       |   21 ++++++++++-----------
 vapi/packages/gtk+-2.0/gtk+-2.0.metadata |    6 ++++++
 2 files changed, 16 insertions(+), 11 deletions(-)
---
diff --git a/vapi/gtk+-2.0.vapi b/vapi/gtk+-2.0.vapi
index d944636..8b3b951 100644
--- a/vapi/gtk+-2.0.vapi
+++ b/vapi/gtk+-2.0.vapi
@@ -1712,8 +1712,8 @@ namespace Gtk {
 		public virtual bool filter_keypress (Gdk.EventKey event);
 		public virtual void focus_in ();
 		public virtual void focus_out ();
-		public virtual void get_preedit_string (string str, out unowned Pango.AttrList attrs, int cursor_pos);
-		public virtual bool get_surrounding (string text, int cursor_index);
+		public virtual void get_preedit_string (out unowned string str, out Pango.AttrList attrs, out int cursor_pos);
+		public virtual bool get_surrounding (out unowned string text, out int cursor_index);
 		public virtual void reset ();
 		public virtual void set_client_window (Gdk.Window window);
 		public virtual void set_cursor_location (Gdk.Rectangle area);
@@ -1727,15 +1727,6 @@ namespace Gtk {
 		public virtual signal void preedit_start ();
 		public virtual signal bool retrieve_surrounding ();
 	}
-	[Compact]
-	[CCode (cheader_filename = "gtk/gtk.h")]
-	public class IMContextInfo {
-		public weak string context_id;
-		public weak string context_name;
-		public weak string default_locales;
-		public weak string domain;
-		public weak string domain_dirname;
-	}
 	[CCode (cheader_filename = "gtk/gtk.h")]
 	public class IMContextSimple : Gtk.IMContext {
 		[CCode (array_length = false)]
@@ -5858,6 +5849,14 @@ namespace Gtk {
 		public Gtk.Border copy ();
 		public void free ();
 	}
+	[CCode (type_id = "GTK_TYPE_IM_CONTEXT_INFO", cheader_filename = "gtk/gtk.h")]
+	public struct IMContextInfo {
+		public weak string context_id;
+		public weak string context_name;
+		public weak string domain;
+		public weak string domain_dirname;
+		public weak string default_locales;
+	}
 	[CCode (type_id = "GTK_TYPE_RADIO_ACTION_ENTRY", cheader_filename = "gtk/gtk.h")]
 	public struct RadioActionEntry {
 		public weak string name;
diff --git a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
index 59db8f1..ada4ef5 100644
--- a/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
+++ b/vapi/packages/gtk+-2.0/gtk+-2.0.metadata
@@ -209,6 +209,12 @@ gtk_image_get_stock.stock_id is_out="1" transfer_ownership="1"
 gtk_image_get_stock.size is_out="1"
 gtk_image_menu_item_new_from_stock.accel_group nullable="1"
 GtkIMContext::delete_surrounding has_emitter="1"
+gtk_im_context_get_preedit_string.str is_out="1"
+gtk_im_context_get_preedit_string.attrs transfer_ownership="1"
+gtk_im_context_get_preedit_string.cursor_pos is_out="1"
+gtk_im_context_get_surrounding.text is_out="1"
+gtk_im_context_get_surrounding.cursor_index is_out="1"
+GtkIMContextInfo is_value_type="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"