[vala/0.26] gtk+-3.0: Fix lost special includes for GtkIMContext/GtkPlug/GtkSocket

[Rico Tzschichholz <ricotz src gnome org>]

commit 0f7e0bc3e1069af448cc81473337c4f98042f4aa
Author: Rico Tzschichholz <ricotz ubuntu com>
Date:   Fri Oct 3 11:47:47 2014 +0200

    gtk+-3.0: Fix lost special includes for GtkIMContext/GtkPlug/GtkSocket
    
    (cherry picked from commit 68f670a6cef5355227854b6dfdfd52a87d5c58dc)

 vapi/gtk+-3.0.vapi                       |    6 +++---
 vapi/packages/gtk+-3.0/gtk+-3.0.metadata |    9 +++------
 2 files changed, 6 insertions(+), 9 deletions(-)
---
diff --git a/vapi/gtk+-3.0.vapi b/vapi/gtk+-3.0.vapi
index 8b76d5b..4a20e9f 100644
--- a/vapi/gtk+-3.0.vapi
+++ b/vapi/gtk+-3.0.vapi
@@ -2539,7 +2539,7 @@ namespace Gtk {
                public string subtitle { get; set; }
                public string title { get; set; }
        }
-       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_im_context_get_type ()")]
+       [CCode (cheader_filename = "gtk/gtk.h,gtk/gtkimmodule.h", type_id = "gtk_im_context_get_type ()")]
        public abstract class IMContext : GLib.Object {
                [CCode (has_construct_function = false)]
                protected IMContext ();
@@ -3687,7 +3687,7 @@ namespace Gtk {
                public virtual signal void populate_popup (Gtk.Menu p0, GLib.File? p1, GLib.Volume? p2);
                public virtual signal void show_error_message (string p0, string p1);
        }
-       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_plug_get_type ()")]
+       [CCode (cheader_filename = "gtk/gtkx.h", type_id = "gtk_plug_get_type ()")]
        public class Plug : Gtk.Window, Atk.Implementor, Gtk.Buildable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public Plug (X.Window socket_id);
@@ -4596,7 +4596,7 @@ namespace Gtk {
                public bool ignore_hidden { get; set; }
                public Gtk.SizeGroupMode mode { get; set; }
        }
-       [CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_socket_get_type ()")]
+       [CCode (cheader_filename = "gtk/gtkx.h", type_id = "gtk_socket_get_type ()")]
        public class Socket : Gtk.Container, Atk.Implementor, Gtk.Buildable {
                [CCode (has_construct_function = false, type = "GtkWidget*")]
                public Socket ();
diff --git a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
index 4f7c8fa..7a8fda1 100644
--- a/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
+++ b/vapi/packages/gtk+-3.0/gtk+-3.0.metadata
@@ -530,7 +530,6 @@ gtk_image_get_stock.size is_out="1"
 gtk_image_menu_item_new_from_stock.accel_group nullable="1"
 gtk_image_set_from_pixmap.pixmap nullable="1"
 gtk_image_set_from_pixmap.mask nullable="1"
-GtkIMContext cheader_filename="gtk/gtk.h,gtk/gtkimmodule.h"
 GtkIMContext::delete_surrounding has_emitter="1"
 gtk_im_context_get_preedit_string.str is_out="1" transfer_ownership="1"
 gtk_im_context_get_preedit_string.attrs transfer_ownership="1"
@@ -783,7 +782,6 @@ GtkPlacesSidebar::populate_popup.p1 type_name="GLib.File?"
 GtkPlacesSidebar::populate_popup.p2 type_name="GLib.Volume?"
 GtkPlacesSidebar::show_enter_location hidden="1"
 GtkPlacesSidebar::show_connect_to_server hidden="1"
-GtkPlug cheader_filename="gtk/gtkx.h"
 GtkPlug::embedded hidden="1"
 gtk_popover_get_pointing_to.rect is_out="1"
 gtk_print_context_create_pango_context transfer_ownership="1"
@@ -929,7 +927,6 @@ gtk_show_about_dialog ellipsis="1"
 gtk_show_about_dialog.parent nullable="1"
 gtk_show_uri.screen nullable="1"
 gtk_size_group_get_widgets type_arguments="Widget"
-GtkSocket cheader_filename="gtk/gtkx.h"
 GtkSpinButton::input.new_value type_name="double" is_out="1"
 gtk_spin_button_get_increments.step is_out="1"
 gtk_spin_button_get_increments.page is_out="1"
@@ -1728,7 +1725,7 @@ GtkHScrollbar type_id="gtk_hscrollbar_get_type ()" deprecated_since="3.2" replac
 GtkHSeparator type_id="gtk_hseparator_get_type ()" deprecated_since="3.2" replacement="Separator"
 GtkHandleBox type_id="gtk_handle_box_get_type ()" deprecated_since="3.4"
 GtkHeaderBar type_id="gtk_header_bar_get_type ()"
-GtkIMContext type_id="gtk_im_context_get_type ()" abstract="1"
+GtkIMContext type_id="gtk_im_context_get_type ()" cheader_filename="gtk/gtk.h,gtk/gtkimmodule.h" abstract="1"
 GtkIMContextSimple type_id="gtk_im_context_simple_get_type ()"
 GtkIMMulticontext type_id="gtk_im_multicontext_get_type ()"
 GtkIconFactory type_id="gtk_icon_factory_get_type ()" deprecated_since="3.10" replacement="Gtk.IconTheme"
@@ -1781,7 +1778,7 @@ GtkPaned type_id="gtk_paned_get_type ()"
 GtkPanedAccessible type_id="gtk_paned_accessible_get_type ()"
 GtkPaperSize type_id="gtk_paper_size_get_type ()"
 GtkPlacesSidebar type_id="gtk_places_sidebar_get_type ()"
-GtkPlug type_id="gtk_plug_get_type ()"
+GtkPlug type_id="gtk_plug_get_type ()" cheader_filename="gtk/gtkx.h"
 GtkPopover type_id="gtk_popover_get_type ()"
 GtkPopoverAccessible type_id="gtk_popover_accessible_get_type ()"
 GtkPrintContext type_id="gtk_print_context_get_type ()"
@@ -1821,7 +1818,7 @@ GtkSeparatorMenuItem type_id="gtk_separator_menu_item_get_type ()"
 GtkSeparatorToolItem type_id="gtk_separator_tool_item_get_type ()"
 GtkSettings type_id="gtk_settings_get_type ()"
 GtkSizeGroup type_id="gtk_size_group_get_type ()"
-GtkSocket type_id="gtk_socket_get_type ()"
+GtkSocket type_id="gtk_socket_get_type ()" cheader_filename="gtk/gtkx.h"
 GtkSpinButton type_id="gtk_spin_button_get_type ()"
 GtkSpinButtonAccessible type_id="gtk_spin_button_accessible_get_type ()"
 GtkSpinner type_id="gtk_spinner_get_type ()"