move global methods from Global struct to namespace, remove leading

2006-09-27  Jürg Billeter  <j@bitron.ch>

	* gidlgen/gapi2xml.pl: move global methods from Global struct to
	  namespace, remove leading underscore in names of global methods
	* vapigen/valagidlparser.vala: support namespace methods
	* packages/atk/atk.gidl, packages/gdk-2.0/gdk-2.0.gidl,
	  packages/pango/pango.gidl, packages/gtk+-2.0/gtk+-2.0.gidl:
	  regenerated
	* packages/gtk+-2.0/gtk+-2.0.metadata: mark GtkActionEntry as value type

svn path=/trunk/; revision=126

diff --git a/vapigen/ChangeLog b/vapigen/ChangeLog
index 61767b8..35b6514 100644 (file)
--- a/vapigen/ChangeLog
+++ b/vapigen/ChangeLog
@@ -1,3 +1,13 @@
+2006-09-27  Jürg Billeter  <j@bitron.ch>
+
+       * gidlgen/gapi2xml.pl: move global methods from Global struct to
+         namespace, remove leading underscore in names of global methods
+       * vapigen/valagidlparser.vala: support namespace methods
+       * packages/atk/atk.gidl, packages/gdk-2.0/gdk-2.0.gidl,
+         packages/pango/pango.gidl, packages/gtk+-2.0/gtk+-2.0.gidl:
+         regenerated
+       * packages/gtk+-2.0/gtk+-2.0.metadata: mark GtkActionEntry as value type
+
 2006-08-24  Jürg Billeter  <j@bitron.ch>
 
        * vapigen/valagidlparser.vala: mark virtual functions appropriately

diff --git a/vapigen/gidlgen/gapi2xml.pl b/vapigen/gidlgen/gapi2xml.pl
index 49964ae..fa9ccb2 100755 (executable)
--- a/vapigen/gidlgen/gapi2xml.pl
+++ b/vapigen/gidlgen/gapi2xml.pl
@@ -711,13 +711,7 @@ sub addStaticFuncElems
                        if ($cnt == 1) {
                                $mdef = delete $fdefs{$mname};
                                
-                               if (!$global_el) {
-                                       $global_el = $doc->createElement('struct');
-                                       $global_el->setAttribute('name', "Global");
-                                       $global_el->setAttribute('cname', $ns . "Global");
-                                       $ns_elem->appendChild($global_el);
-                               }
-                               $el = addMNameElem($global_el, 'method', $mname, $ns_prefix);
+                               $el = addMNameElem($ns_elem, 'function', $mname, $ns_prefix);
                                if ($mdef =~ /^deprecated/) {
                                        $el->setAttribute("deprecated", "1");
                                        $mdef =~ s/deprecated//g;
@@ -809,6 +803,7 @@ sub addMNameElem
                } else {
                        $name = $match;
                }
+               $name =~ s/^_//;
                $elem->setAttribute('name', $name);
        }
        if ($cname) {

diff --git a/vapigen/packages/atk/atk.gidl b/vapigen/packages/atk/atk.gidl
index 69463b8..0f4694f 100644 (file)
--- a/vapigen/packages/atk/atk.gidl
+++ b/vapigen/packages/atk/atk.gidl
@@ -804,7 +804,7 @@
     </interface>
     <interface get-type="" name="AtkHyperlinkImpl" type-name="AtkHyperlinkImpl">
       <vfunc name="get_hyperlink">
-        <return-type type="AtkHyperlink"/>
+        <return-type type="AtkHyperlink*"/>
         <parameters>
           <parameter name="impl" type="AtkHyperlinkImpl*"/>
         </parameters>
@@ -2889,85 +2889,26 @@
       <field name="width" readable="1" type="gint" writable="1"/>
       <field name="height" readable="1" type="gint" writable="1"/>
     </struct>
-    <struct cname="AtkGlobal" name="Global">
-      <method name="_add_focus_tracker" symbol="atk_add_focus_tracker">
-        <return-type type="guint"/>
-        <parameters>
-          <parameter name="focus_tracker" type="AtkEventListener"/>
-        </parameters>
-      </method>
-      <method name="_add_global_event_listener" symbol="atk_add_global_event_listener">
-        <return-type type="guint"/>
-        <parameters>
-          <parameter name="listener" type="GSignalEmissionHook"/>
-          <parameter name="event_type" type="const-gchar*"/>
-        </parameters>
-      </method>
-      <method name="_add_key_event_listener" symbol="atk_add_key_event_listener">
-        <return-type type="guint"/>
-        <parameters>
-          <parameter name="listener" type="AtkKeySnoopFunc"/>
-          <parameter name="data" type="gpointer"/>
-        </parameters>
-      </method>
-      <method name="_get_default_registry" symbol="atk_get_default_registry">
-        <return-type type="AtkRegistry*"/>
-      </method>
-      <method name="_get_focus_object" symbol="atk_get_focus_object">
-        <return-type type="AtkObject*"/>
-      </method>
-      <method name="_get_root" symbol="atk_get_root">
-        <return-type type="AtkObject*"/>
-      </method>
-      <method name="_get_toolkit_name" symbol="atk_get_toolkit_name">
-        <return-type type="const-gchar*"/>
-      </method>
-      <method name="_get_toolkit_version" symbol="atk_get_toolkit_version">
-        <return-type type="const-gchar*"/>
-      </method>
-      <method name="_remove_focus_tracker" symbol="atk_remove_focus_tracker">
-        <return-type type="void"/>
-        <parameters>
-          <parameter name="tracker_id" type="guint"/>
-        </parameters>
-      </method>
-      <method name="_remove_global_event_listener" symbol="atk_remove_global_event_listener">
-        <return-type type="void"/>
-        <parameters>
-          <parameter name="listener_id" type="guint"/>
-        </parameters>
-      </method>
-      <method name="_remove_key_event_listener" symbol="atk_remove_key_event_listener">
-        <return-type type="void"/>
-        <parameters>
-          <parameter name="listener_id" type="guint"/>
-        </parameters>
-      </method>
-      <method name="_role_for_name" symbol="atk_role_for_name">
-        <return-type type="AtkRole"/>
-        <parameters>
-          <parameter name="name" type="const-gchar*"/>
-        </parameters>
-      </method>
-      <method name="_role_get_localized_name" symbol="atk_role_get_localized_name">
-        <return-type type="const-gchar*"/>
-        <parameters>
-          <parameter name="role" type="AtkRole"/>
-        </parameters>
-      </method>
-      <method name="_role_get_name" symbol="atk_role_get_name">
-        <return-type type="const-gchar*"/>
-        <parameters>
-          <parameter name="role" type="AtkRole"/>
-        </parameters>
-      </method>
-      <method name="_role_register" symbol="atk_role_register">
-        <return-type type="AtkRole"/>
-        <parameters>
-          <parameter name="name" type="const-gchar*"/>
-        </parameters>
-      </method>
-    </struct>
+    <function name="add_focus_tracker" symbol="atk_add_focus_tracker">
+      <return-type type="guint"/>
+      <parameters>
+        <parameter name="focus_tracker" type="AtkEventListener"/>
+      </parameters>
+    </function>
+    <function name="add_global_event_listener" symbol="atk_add_global_event_listener">
+      <return-type type="guint"/>
+      <parameters>
+        <parameter name="listener" type="GSignalEmissionHook"/>
+        <parameter name="event_type" type="const-gchar*"/>
+      </parameters>
+    </function>
+    <function name="add_key_event_listener" symbol="atk_add_key_event_listener">
+      <return-type type="guint"/>
+      <parameters>
+        <parameter name="listener" type="AtkKeySnoopFunc"/>
+        <parameter name="data" type="gpointer"/>
+      </parameters>
+    </function>
     <struct name="AtkFocus">
       <method name="tracker_init" symbol="atk_focus_tracker_init">
         <return-type type="void"/>
@@ -2982,6 +2923,63 @@
         </parameters>
       </method>
     </struct>
+    <function name="get_default_registry" symbol="atk_get_default_registry">
+      <return-type type="AtkRegistry*"/>
+    </function>
+    <function name="get_focus_object" symbol="atk_get_focus_object">
+      <return-type type="AtkObject*"/>
+    </function>
+    <function name="get_root" symbol="atk_get_root">
+      <return-type type="AtkObject*"/>
+    </function>
+    <function name="get_toolkit_name" symbol="atk_get_toolkit_name">
+      <return-type type="const-gchar*"/>
+    </function>
+    <function name="get_toolkit_version" symbol="atk_get_toolkit_version">
+      <return-type type="const-gchar*"/>
+    </function>
+    <function name="remove_focus_tracker" symbol="atk_remove_focus_tracker">
+      <return-type type="void"/>
+      <parameters>
+        <parameter name="tracker_id" type="guint"/>
+      </parameters>
+    </function>
+    <function name="remove_global_event_listener" symbol="atk_remove_global_event_listener">
+      <return-type type="void"/>
+      <parameters>
+        <parameter name="listener_id" type="guint"/>
+      </parameters>
+    </function>
+    <function name="remove_key_event_listener" symbol="atk_remove_key_event_listener">
+      <return-type type="void"/>
+      <parameters>
+        <parameter name="listener_id" type="guint"/>
+      </parameters>
+    </function>
+    <function name="role_for_name" symbol="atk_role_for_name">
+      <return-type type="AtkRole"/>
+      <parameters>
+        <parameter name="name" type="const-gchar*"/>
+      </parameters>
+    </function>
+    <function name="role_get_localized_name" symbol="atk_role_get_localized_name">
+      <return-type type="const-gchar*"/>
+      <parameters>
+        <parameter name="role" type="AtkRole"/>
+      </parameters>
+    </function>
+    <function name="role_get_name" symbol="atk_role_get_name">
+      <return-type type="const-gchar*"/>
+      <parameters>
+        <parameter name="role" type="AtkRole"/>
+      </parameters>
+    </function>
+    <function name="role_register" symbol="atk_role_register">
+      <return-type type="AtkRole"/>
+      <parameters>
+        <parameter name="name" type="const-gchar*"/>
+      </parameters>
+    </function>
     <struct name="AtkState">
       <method name="type_for_name" symbol="atk_state_type_for_name">
         <return-type type="AtkStateType"/>

diff --git a/vapigen/packages/gdk-2.0/gdk-2.0.gidl b/vapigen/packages/gdk-2.0/gdk-2.0.gidl
index aa6faba..390f9c8 100644 (file)
--- a/vapigen/packages/gdk-2.0/gdk-2.0.gidl
+++ b/vapigen/packages/gdk-2.0/gdk-2.0.gidl
@@ -5021,187 +5021,20 @@
         <parameter name="data" type="gpointer"/>
       </parameters>
     </callback>
-    <struct cname="GdkGlobal" name="Global">
-      <method name="_add_client_message_filter" symbol="gdk_add_client_message_filter">
-        <return-type type="void"/>
-        <parameters>
-          <parameter name="message_type" type="GdkAtom"/>
-          <parameter name="func" type="GdkFilterFunc"/>
-          <parameter name="data" type="gpointer"/>
-        </parameters>
-      </method>
-      <method name="_add_option_entries_libgtk_only" symbol="gdk_add_option_entries_libgtk_only">
-        <return-type type="void"/>
-        <parameters>
-          <parameter name="group" type="GOptionGroup*"/>
-        </parameters>
-      </method>
-      <method name="_devices_list" symbol="gdk_devices_list">
-        <return-type type="GList*"/>
-      </method>
-      <method name="_events_pending" symbol="gdk_events_pending">
-        <return-type type="gboolean"/>
-      </method>
-      <method name="_free_compound_text" symbol="gdk_free_compound_text">
-        <return-type type="void"/>
-        <parameters>
-          <parameter name="ctext" type="guchar*"/>
-        </parameters>
-      </method>
-      <method name="_free_text_list" symbol="gdk_free_text_list">
-        <return-type type="void"/>
-        <parameters>
-          <parameter name="list" type="gchar**"/>
-        </parameters>
-      </method>
-      <method name="_get_default_root_window" symbol="gdk_get_default_root_window">
-        <return-type type="GdkWindow*"/>
-      </method>
-      <method name="_get_display" symbol="gdk_get_display">
-        <return-type type="gchar*"/>
-      </method>
-      <method name="_get_display_arg_name" symbol="gdk_get_display_arg_name">
-        <return-type type="const-gchar*"/>
-      </method>
-      <method name="_get_program_class" symbol="gdk_get_program_class">
-        <return-type type="const-char*"/>
-      </method>
-      <method name="_get_show_events" symbol="gdk_get_show_events">
-        <return-type type="gboolean"/>
-      </method>
-      <method deprecated="1" name="_get_use_xshm" symbol="gdk_get_use_xshm">
-        <return-type type="gboolean"/>
-      </method>
-      <method name="_init_check" symbol="gdk_init_check">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter name="argc" type="gint*"/>
-          <parameter name="argv" type="gchar***"/>
-        </parameters>
-      </method>
-      <method name="_list_visuals" symbol="gdk_list_visuals">
-        <return-type type="GList*"/>
-      </method>
-      <method name="_notify_startup_complete" symbol="gdk_notify_startup_complete">
-        <return-type type="void"/>
-      </method>
-      <method name="_parse_args" symbol="gdk_parse_args">
-        <return-type type="void"/>
-        <parameters>
-          <parameter name="argc" type="gint*"/>
-          <parameter name="argv" type="gchar***"/>
-        </parameters>
-      </method>
-      <method name="_pre_parse_libgtk_only" symbol="gdk_pre_parse_libgtk_only">
-        <return-type type="void"/>
-      </method>
-      <method name="_set_double_click_time" symbol="gdk_set_double_click_time">
-        <return-type type="void"/>
-        <parameters>
-          <parameter name="msec" type="guint"/>
-        </parameters>
-      </method>
-      <method name="_set_locale" symbol="gdk_set_locale">
-        <return-type type="gchar*"/>
-      </method>
-      <method name="_set_pointer_hooks" symbol="gdk_set_pointer_hooks">
-        <return-type type="GdkPointerHooks*"/>
-        <parameters>
-          <parameter name="new_hooks" type="const-GdkPointerHooks*"/>
-        </parameters>
-      </method>
-      <method name="_set_program_class" symbol="gdk_set_program_class">
-        <return-type type="void"/>
-        <parameters>
-          <parameter name="program_class" type="const-char*"/>
-        </parameters>
-      </method>
-      <method name="_set_show_events" symbol="gdk_set_show_events">
-        <return-type type="void"/>
-        <parameters>
-          <parameter name="show_events" type="gboolean"/>
-        </parameters>
-      </method>
-      <method name="_set_sm_client_id" symbol="gdk_set_sm_client_id">
-        <return-type type="void"/>
-        <parameters>
-          <parameter name="sm_client_id" type="const-gchar*"/>
-        </parameters>
-      </method>
-      <method deprecated="1" name="_set_use_xshm" symbol="gdk_set_use_xshm">
-        <return-type type="void"/>
-        <parameters>
-          <parameter name="use_xshm" type="gboolean"/>
-        </parameters>
-      </method>
-      <method name="_setting_get" symbol="gdk_setting_get">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter name="name" type="const-gchar*"/>
-          <parameter name="value" type="GValue*"/>
-        </parameters>
-      </method>
-      <method deprecated="1" name="_string_extents" symbol="gdk_string_extents">
-        <return-type type="void"/>
-        <parameters>
-          <parameter name="font" type="GdkFont*"/>
-          <parameter name="string" type="const-gchar*"/>
-          <parameter name="lbearing" type="gint*"/>
-          <parameter name="rbearing" type="gint*"/>
-          <parameter name="width" type="gint*"/>
-          <parameter name="ascent" type="gint*"/>
-          <parameter name="descent" type="gint*"/>
-        </parameters>
-      </method>
-      <method deprecated="1" name="_string_height" symbol="gdk_string_height">
-        <return-type type="gint"/>
-        <parameters>
-          <parameter name="font" type="GdkFont*"/>
-          <parameter name="string" type="const-gchar*"/>
-        </parameters>
-      </method>
-      <method deprecated="1" name="_string_measure" symbol="gdk_string_measure">
-        <return-type type="gint"/>
-        <parameters>
-          <parameter name="font" type="GdkFont*"/>
-          <parameter name="string" type="const-gchar*"/>
-        </parameters>
-      </method>
-      <method name="_string_to_compound_text" symbol="gdk_string_to_compound_text">
-        <return-type type="gint"/>
-        <parameters>
-          <parameter name="str" type="const-gchar*"/>
-          <parameter name="encoding" type="GdkAtom*"/>
-          <parameter name="format" type="gint*"/>
-          <parameter name="ctext" type="guchar**"/>
-          <parameter name="length" type="gint*"/>
-        </parameters>
-      </method>
-      <method name="_string_to_compound_text_for_display" symbol="gdk_string_to_compound_text_for_display">
-        <return-type type="gint"/>
-        <parameters>
-          <parameter name="display" type="GdkDisplay*"/>
-          <parameter name="str" type="const-gchar*"/>
-          <parameter name="encoding" type="GdkAtom*"/>
-          <parameter name="format" type="gint*"/>
-          <parameter name="ctext" type="guchar**"/>
-          <parameter name="length" type="gint*"/>
-        </parameters>
-      </method>
-      <method deprecated="1" name="_string_width" symbol="gdk_string_width">
-        <return-type type="gint"/>
-        <parameters>
-          <parameter name="font" type="GdkFont*"/>
-          <parameter name="string" type="const-gchar*"/>
-        </parameters>
-      </method>
-      <method name="_unicode_to_keyval" symbol="gdk_unicode_to_keyval">
-        <return-type type="guint"/>
-        <parameters>
-          <parameter name="wc" type="guint32"/>
-        </parameters>
-      </method>
-    </struct>
+    <function name="add_client_message_filter" symbol="gdk_add_client_message_filter">
+      <return-type type="void"/>
+      <parameters>
+        <parameter name="message_type" type="GdkAtom"/>
+        <parameter name="func" type="GdkFilterFunc"/>
+        <parameter name="data" type="gpointer"/>
+      </parameters>
+    </function>
+    <function name="add_option_entries_libgtk_only" symbol="gdk_add_option_entries_libgtk_only">
+      <return-type type="void"/>
+      <parameters>
+        <parameter name="group" type="GOptionGroup*"/>
+      </parameters>
+    </function>
     <struct name="GdkCairo">
       <method name="create" symbol="gdk_cairo_create">
         <return-type type="cairo_t*"/>
@@ -5309,6 +5142,9 @@
         </parameters>
       </method>
     </struct>
+    <function name="devices_list" symbol="gdk_devices_list">
+      <return-type type="GList*"/>
+    </function>
     <struct name="GdkDrag">
       <method name="abort" symbol="gdk_drag_abort">
         <return-type type="void"/>
@@ -5549,6 +5385,9 @@
         </parameters>
       </method>
     </struct>
+    <function name="events_pending" symbol="gdk_events_pending">
+      <return-type type="gboolean"/>
+    </function>
     <struct name="GdkFontset">
       <method deprecated="1" name="load" symbol="gdk_fontset_load">
         <return-type type="GdkFont*"/>
@@ -5564,6 +5403,43 @@
         </parameters>
       </method>
     </struct>
+    <function name="free_compound_text" symbol="gdk_free_compound_text">
+      <return-type type="void"/>
+      <parameters>
+        <parameter name="ctext" type="guchar*"/>
+      </parameters>
+    </function>
+    <function name="free_text_list" symbol="gdk_free_text_list">
+      <return-type type="void"/>
+      <parameters>
+        <parameter name="list" type="gchar**"/>
+      </parameters>
+    </function>
+    <function name="get_default_root_window" symbol="gdk_get_default_root_window">
+      <return-type type="GdkWindow*"/>
+    </function>
+    <function name="get_display" symbol="gdk_get_display">
+      <return-type type="gchar*"/>
+    </function>
+    <function name="get_display_arg_name" symbol="gdk_get_display_arg_name">
+      <return-type type="const-gchar*"/>
+    </function>
+    <function name="get_program_class" symbol="gdk_get_program_class">
+      <return-type type="const-char*"/>
+    </function>
+    <function name="get_show_events" symbol="gdk_get_show_events">
+      <return-type type="gboolean"/>
+    </function>
+    <function deprecated="1" name="get_use_xshm" symbol="gdk_get_use_xshm">
+      <return-type type="gboolean"/>
+    </function>
+    <function name="init_check" symbol="gdk_init_check">
+      <return-type type="gboolean"/>
+      <parameters>
+        <parameter name="argc" type="gint*"/>
+        <parameter name="argv" type="gchar***"/>
+      </parameters>
+    </function>
     <struct name="GdkInput">
       <method deprecated="1" name="add" symbol="gdk_input_add">
         <return-type type="gint"/>
@@ -5675,6 +5551,12 @@
         </parameters>
       </method>
     </struct>
+    <function name="list_visuals" symbol="gdk_list_visuals">
+      <return-type type="GList*"/>
+    </function>
+    <function name="notify_startup_complete" symbol="gdk_notify_startup_complete">
+      <return-type type="void"/>
+    </function>
     <struct name="GdkPango">
       <method name="context_get" symbol="gdk_pango_context_get">
         <return-type type="PangoContext*"/>
@@ -5713,6 +5595,13 @@
         </parameters>
       </method>
     </struct>
+    <function name="parse_args" symbol="gdk_parse_args">
+      <return-type type="void"/>
+      <parameters>
+        <parameter name="argc" type="gint*"/>
+        <parameter name="argv" type="gchar***"/>
+      </parameters>
+    </function>
     <struct name="GdkPointer">
       <method name="grab" symbol="gdk_pointer_grab">
         <return-type type="GdkGrabStatus"/>
@@ -5743,6 +5632,9 @@
         </parameters>
       </method>
     </struct>
+    <function name="pre_parse_libgtk_only" symbol="gdk_pre_parse_libgtk_only">
+      <return-type type="void"/>
+    </function>
     <struct name="GdkProperty">
       <method name="change" symbol="gdk_property_change">
         <return-type type="void"/>
@@ -5933,6 +5825,52 @@
         </parameters>
       </method>
     </struct>
+    <function name="set_double_click_time" symbol="gdk_set_double_click_time">
+      <return-type type="void"/>
+      <parameters>
+        <parameter name="msec" type="guint"/>
+      </parameters>
+    </function>
+    <function name="set_locale" symbol="gdk_set_locale">
+      <return-type type="gchar*"/>
+    </function>
+    <function name="set_pointer_hooks" symbol="gdk_set_pointer_hooks">
+      <return-type type="GdkPointerHooks*"/>
+      <parameters>
+        <parameter name="new_hooks" type="const-GdkPointerHooks*"/>
+      </parameters>
+    </function>
+    <function name="set_program_class" symbol="gdk_set_program_class">
+      <return-type type="void"/>
+      <parameters>
+        <parameter name="program_class" type="const-char*"/>
+      </parameters>
+    </function>
+    <function name="set_show_events" symbol="gdk_set_show_events">
+      <return-type type="void"/>
+      <parameters>
+        <parameter name="show_events" type="gboolean"/>
+      </parameters>
+    </function>
+    <function name="set_sm_client_id" symbol="gdk_set_sm_client_id">
+      <return-type type="void"/>
+      <parameters>
+        <parameter name="sm_client_id" type="const-gchar*"/>
+      </parameters>
+    </function>
+    <function deprecated="1" name="set_use_xshm" symbol="gdk_set_use_xshm">
+      <return-type type="void"/>
+      <parameters>
+        <parameter name="use_xshm" type="gboolean"/>
+      </parameters>
+    </function>
+    <function name="setting_get" symbol="gdk_setting_get">
+      <return-type type="gboolean"/>
+      <parameters>
+        <parameter name="name" type="const-gchar*"/>
+        <parameter name="value" type="GValue*"/>
+      </parameters>
+    </function>
     <struct name="GdkSpawn">
       <method name="command_line_on_screen" symbol="gdk_spawn_command_line_on_screen">
         <return-type type="gboolean"/>
@@ -5974,6 +5912,60 @@
         </parameters>
       </method>
     </struct>
+    <function deprecated="1" name="string_extents" symbol="gdk_string_extents">
+      <return-type type="void"/>
+      <parameters>
+        <parameter name="font" type="GdkFont*"/>
+        <parameter name="string" type="const-gchar*"/>
+        <parameter name="lbearing" type="gint*"/>
+        <parameter name="rbearing" type="gint*"/>
+        <parameter name="width" type="gint*"/>
+        <parameter name="ascent" type="gint*"/>
+        <parameter name="descent" type="gint*"/>
+      </parameters>
+    </function>
+    <function deprecated="1" name="string_height" symbol="gdk_string_height">
+      <return-type type="gint"/>
+      <parameters>
+        <parameter name="font" type="GdkFont*"/>
+        <parameter name="string" type="const-gchar*"/>
+      </parameters>
+    </function>
+    <function deprecated="1" name="string_measure" symbol="gdk_string_measure">
+      <return-type type="gint"/>
+      <parameters>
+        <parameter name="font" type="GdkFont*"/>
+        <parameter name="string" type="const-gchar*"/>
+      </parameters>
+    </function>
+    <function name="string_to_compound_text" symbol="gdk_string_to_compound_text">
+      <return-type type="gint"/>
+      <parameters>
+        <parameter name="str" type="const-gchar*"/>
+        <parameter name="encoding" type="GdkAtom*"/>
+        <parameter name="format" type="gint*"/>
+        <parameter name="ctext" type="guchar**"/>
+        <parameter name="length" type="gint*"/>
+      </parameters>
+    </function>
+    <function name="string_to_compound_text_for_display" symbol="gdk_string_to_compound_text_for_display">
+      <return-type type="gint"/>
+      <parameters>
+        <parameter name="display" type="GdkDisplay*"/>
+        <parameter name="str" type="const-gchar*"/>
+        <parameter name="encoding" type="GdkAtom*"/>
+        <parameter name="format" type="gint*"/>
+        <parameter name="ctext" type="guchar**"/>
+        <parameter name="length" type="gint*"/>
+      </parameters>
+    </function>
+    <function deprecated="1" name="string_width" symbol="gdk_string_width">
+      <return-type type="gint"/>
+      <parameters>
+        <parameter name="font" type="GdkFont*"/>
+        <parameter name="string" type="const-gchar*"/>
+      </parameters>
+    </function>
     <struct name="GdkText">
       <method deprecated="1" name="extents" symbol="gdk_text_extents">
         <return-type type="void"/>
@@ -6094,5 +6086,11 @@
         </parameters>
       </method>
     </struct>
+    <function name="unicode_to_keyval" symbol="gdk_unicode_to_keyval">
+      <return-type type="guint"/>
+      <parameters>
+        <parameter name="wc" type="guint32"/>
+      </parameters>
+    </function>
   </namespace>
 </api>

diff --git a/vapigen/packages/gtk+-2.0/gtk+-2.0.gidl b/vapigen/packages/gtk+-2.0/gtk+-2.0.gidl
index 4b8443f..ad88ebc 100644 (file)
--- a/vapigen/packages/gtk+-2.0/gtk+-2.0.gidl
+++ b/vapigen/packages/gtk+-2.0/gtk+-2.0.gidl
@@ -12169,7 +12169,7 @@
         <return-type type="GType"/>
       </method>
       <method name="get_value" symbol="gtk_printer_option_widget_get_value">
-        <return-type type="const-char*"/>
+        <return-type type="const-gchar*"/>
         <parameters>
           <parameter name="setting" type="GtkPrinterOptionWidget*"/>
         </parameters>
@@ -24556,629 +24556,195 @@
         </parameters>
       </method>
     </struct>
-    <struct cname="GtkGlobal" name="Global">
-      <method name="_alternative_dialog_button_order" symbol="gtk_alternative_dialog_button_order">
+    <function name="alternative_dialog_button_order" symbol="gtk_alternative_dialog_button_order">
+      <return-type type="gboolean"/>
+      <parameters>
+        <parameter name="screen" type="GdkScreen*"/>
+      </parameters>
+    </function>
+    <function name="binding_parse_binding" symbol="gtk_binding_parse_binding">
+      <return-type type="guint"/>
+      <parameters>
+        <parameter name="scanner" type="GScanner*"/>
+      </parameters>
+    </function>
+    <struct name="GtkBindings">
+      <method name="activate" symbol="gtk_bindings_activate">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="screen" type="GdkScreen*"/>
+          <parameter name="object" type="GtkObject*"/>
+          <parameter name="keyval" type="guint"/>
+          <parameter name="modifiers" type="GdkModifierType"/>
         </parameters>
       </method>
-      <method name="_binding_parse_binding" symbol="gtk_binding_parse_binding">
-        <return-type type="guint"/>
+      <method name="activate_event" symbol="gtk_bindings_activate_event">
+        <return-type type="gboolean"/>
         <parameters>
-          <parameter name="scanner" type="GScanner*"/>
+          <parameter name="object" type="GtkObject*"/>
+          <parameter name="event" type="GdkEventKey*"/>
         </parameters>
       </method>
-      <method name="_cell_type_get_type" symbol="gtk_cell_type_get_type">
+    </struct>
+    <function name="cell_type_get_type" symbol="gtk_cell_type_get_type">
+      <return-type type="GType"/>
+    </function>
+    <function name="check_version" symbol="gtk_check_version">
+      <return-type type="gchar*"/>
+      <parameters>
+        <parameter name="required_major" type="guint"/>
+        <parameter name="required_minor" type="guint"/>
+        <parameter name="required_micro" type="guint"/>
+      </parameters>
+    </function>
+    <function name="clist_drag_pos_get_type" symbol="gtk_clist_drag_pos_get_type">
+      <return-type type="GType"/>
+    </function>
+    <struct name="GtkCtree">
+      <method name="expander_style_get_type" symbol="gtk_ctree_expander_style_get_type">
         <return-type type="GType"/>
       </method>
-      <method name="_check_version" symbol="gtk_check_version">
-        <return-type type="gchar*"/>
-        <parameters>
-          <parameter name="required_major" type="guint"/>
-          <parameter name="required_minor" type="guint"/>
-          <parameter name="required_micro" type="guint"/>
-        </parameters>
+      <method name="expansion_type_get_type" symbol="gtk_ctree_expansion_type_get_type">
+        <return-type type="GType"/>
       </method>
-      <method name="_clist_drag_pos_get_type" symbol="gtk_clist_drag_pos_get_type">
+      <method name="line_style_get_type" symbol="gtk_ctree_line_style_get_type">
         <return-type type="GType"/>
       </method>
-      <method name="_disable_setlocale" symbol="gtk_disable_setlocale">
-        <return-type type="void"/>
+      <method name="pos_get_type" symbol="gtk_ctree_pos_get_type">
+        <return-type type="GType"/>
       </method>
-      <method name="_enumerate_printers" symbol="gtk_enumerate_printers">
-        <return-type type="void"/>
+    </struct>
+    <function name="disable_setlocale" symbol="gtk_disable_setlocale">
+      <return-type type="void"/>
+    </function>
+    <struct name="GtkDrag">
+      <method name="begin" symbol="gtk_drag_begin">
+        <return-type type="GdkDragContext*"/>
         <parameters>
-          <parameter name="func" type="GtkPrinterFunc"/>
-          <parameter name="data" type="gpointer"/>
-          <parameter name="destroy" type="GDestroyNotify"/>
-          <parameter name="wait" type="gboolean"/>
+          <parameter name="widget" type="GtkWidget*"/>
+          <parameter name="targets" type="GtkTargetList*"/>
+          <parameter name="actions" type="GdkDragAction"/>
+          <parameter name="button" type="gint"/>
+          <parameter name="event" type="GdkEvent*"/>
         </parameters>
       </method>
-      <method name="_events_pending" symbol="gtk_events_pending">
-        <return-type type="gboolean"/>
-      </method>
-      <method name="_get_current_event" symbol="gtk_get_current_event">
-        <return-type type="GdkEvent*"/>
-      </method>
-      <method name="_get_current_event_state" symbol="gtk_get_current_event_state">
+      <method name="check_threshold" symbol="gtk_drag_check_threshold">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="state" type="GdkModifierType*"/>
-        </parameters>
-      </method>
-      <method name="_get_current_event_time" symbol="gtk_get_current_event_time">
-        <return-type type="guint32"/>
-      </method>
-      <method name="_get_default_language" symbol="gtk_get_default_language">
-        <return-type type="PangoLanguage*"/>
-      </method>
-      <method name="_get_event_widget" symbol="gtk_get_event_widget">
-        <return-type type="GtkWidget*"/>
-        <parameters>
-          <parameter name="event" type="GdkEvent*"/>
+          <parameter name="widget" type="GtkWidget*"/>
+          <parameter name="start_x" type="gint"/>
+          <parameter name="start_y" type="gint"/>
+          <parameter name="current_x" type="gint"/>
+          <parameter name="current_y" type="gint"/>
         </parameters>
       </method>
-      <method name="_get_option_group" symbol="gtk_get_option_group">
-        <return-type type="GOptionGroup*"/>
+      <method name="dest_add_image_targets" symbol="gtk_drag_dest_add_image_targets">
+        <return-type type="void"/>
         <parameters>
-          <parameter name="open_default_display" type="gboolean"/>
+          <parameter name="widget" type="GtkWidget*"/>
         </parameters>
       </method>
-      <method name="_identifier_get_type" symbol="gtk_identifier_get_type">
-        <return-type type="GType"/>
-      </method>
-      <method name="_paint_arrow" symbol="gtk_paint_arrow">
+      <method name="dest_add_text_targets" symbol="gtk_drag_dest_add_text_targets">
         <return-type type="void"/>
         <parameters>
-          <parameter name="style" type="GtkStyle*"/>
-          <parameter name="window" type="GdkWindow*"/>
-          <parameter name="state_type" type="GtkStateType"/>
-          <parameter name="shadow_type" type="GtkShadowType"/>
-          <parameter name="area" type="GdkRectangle*"/>
           <parameter name="widget" type="GtkWidget*"/>
-          <parameter name="detail" type="const-gchar*"/>
-          <parameter name="arrow_type" type="GtkArrowType"/>
-          <parameter name="fill" type="gboolean"/>
-          <parameter name="x" type="gint"/>
-          <parameter name="y" type="gint"/>
-          <parameter name="width" type="gint"/>
-          <parameter name="height" type="gint"/>
         </parameters>
       </method>
-      <method name="_paint_box" symbol="gtk_paint_box">
+      <method name="dest_add_uri_targets" symbol="gtk_drag_dest_add_uri_targets">
         <return-type type="void"/>
         <parameters>
-          <parameter name="style" type="GtkStyle*"/>
-          <parameter name="window" type="GdkWindow*"/>
-          <parameter name="state_type" type="GtkStateType"/>
-          <parameter name="shadow_type" type="GtkShadowType"/>
-          <parameter name="area" type="GdkRectangle*"/>
           <parameter name="widget" type="GtkWidget*"/>
-          <parameter name="detail" type="const-gchar*"/>
-          <parameter name="x" type="gint"/>
-          <parameter name="y" type="gint"/>
-          <parameter name="width" type="gint"/>
-          <parameter name="height" type="gint"/>
         </parameters>
       </method>
-      <method name="_paint_box_gap" symbol="gtk_paint_box_gap">
-        <return-type type="void"/>
+      <method name="dest_find_target" symbol="gtk_drag_dest_find_target">
+        <return-type type="GdkAtom"/>
         <parameters>
-          <parameter name="style" type="GtkStyle*"/>
-          <parameter name="window" type="GdkWindow*"/>
-          <parameter name="state_type" type="GtkStateType"/>
-          <parameter name="shadow_type" type="GtkShadowType"/>
-          <parameter name="area" type="GdkRectangle*"/>
           <parameter name="widget" type="GtkWidget*"/>
-          <parameter name="detail" type="gchar*"/>
-          <parameter name="x" type="gint"/>
-          <parameter name="y" type="gint"/>
-          <parameter name="width" type="gint"/>
-          <parameter name="height" type="gint"/>
-          <parameter name="gap_side" type="GtkPositionType"/>
-          <parameter name="gap_x" type="gint"/>
-          <parameter name="gap_width" type="gint"/>
+          <parameter name="context" type="GdkDragContext*"/>
+          <parameter name="target_list" type="GtkTargetList*"/>
         </parameters>
       </method>
-      <method name="_paint_check" symbol="gtk_paint_check">
-        <return-type type="void"/>
+      <method name="dest_get_target_list" symbol="gtk_drag_dest_get_target_list">
+        <return-type type="GtkTargetList*"/>
         <parameters>
-          <parameter name="style" type="GtkStyle*"/>
-          <parameter name="window" type="GdkWindow*"/>
-          <parameter name="state_type" type="GtkStateType"/>
-          <parameter name="shadow_type" type="GtkShadowType"/>
-          <parameter name="area" type="GdkRectangle*"/>
           <parameter name="widget" type="GtkWidget*"/>
-          <parameter name="detail" type="const-gchar*"/>
-          <parameter name="x" type="gint"/>
-          <parameter name="y" type="gint"/>
-          <parameter name="width" type="gint"/>
-          <parameter name="height" type="gint"/>
         </parameters>
       </method>
-      <method name="_paint_diamond" symbol="gtk_paint_diamond">
-        <return-type type="void"/>
+      <method name="dest_get_track_motion" symbol="gtk_drag_dest_get_track_motion">
+        <return-type type="gboolean"/>
         <parameters>
-          <parameter name="style" type="GtkStyle*"/>
-          <parameter name="window" type="GdkWindow*"/>
-          <parameter name="state_type" type="GtkStateType"/>
-          <parameter name="shadow_type" type="GtkShadowType"/>
-          <parameter name="area" type="GdkRectangle*"/>
           <parameter name="widget" type="GtkWidget*"/>
-          <parameter name="detail" type="const-gchar*"/>
-          <parameter name="x" type="gint"/>
-          <parameter name="y" type="gint"/>
-          <parameter name="width" type="gint"/>
-          <parameter name="height" type="gint"/>
         </parameters>
       </method>
-      <method name="_paint_expander" symbol="gtk_paint_expander">
+      <method name="dest_set" symbol="gtk_drag_dest_set">
         <return-type type="void"/>
         <parameters>
-          <parameter name="style" type="GtkStyle*"/>
-          <parameter name="window" type="GdkWindow*"/>
-          <parameter name="state_type" type="GtkStateType"/>
-          <parameter name="area" type="GdkRectangle*"/>
           <parameter name="widget" type="GtkWidget*"/>
-          <parameter name="detail" type="const-gchar*"/>
-          <parameter name="x" type="gint"/>
-          <parameter name="y" type="gint"/>
-          <parameter name="expander_style" type="GtkExpanderStyle"/>
+          <parameter name="flags" type="GtkDestDefaults"/>
+          <parameter name="targets" type="const-GtkTargetEntry*"/>
+          <parameter name="n_targets" type="gint"/>
+          <parameter name="actions" type="GdkDragAction"/>
         </parameters>
       </method>
-      <method name="_paint_extension" symbol="gtk_paint_extension">
+      <method name="dest_set_proxy" symbol="gtk_drag_dest_set_proxy">
         <return-type type="void"/>
         <parameters>
-          <parameter name="style" type="GtkStyle*"/>
-          <parameter name="window" type="GdkWindow*"/>
-          <parameter name="state_type" type="GtkStateType"/>
-          <parameter name="shadow_type" type="GtkShadowType"/>
-          <parameter name="area" type="GdkRectangle*"/>
           <parameter name="widget" type="GtkWidget*"/>
-          <parameter name="detail" type="gchar*"/>
-          <parameter name="x" type="gint"/>
-          <parameter name="y" type="gint"/>
-          <parameter name="width" type="gint"/>
-          <parameter name="height" type="gint"/>
-          <parameter name="gap_side" type="GtkPositionType"/>
+          <parameter name="proxy_window" type="GdkWindow*"/>
+          <parameter name="protocol" type="GdkDragProtocol"/>
+          <parameter name="use_coordinates" type="gboolean"/>
         </parameters>
       </method>
-      <method name="_paint_flat_box" symbol="gtk_paint_flat_box">
+      <method name="dest_set_target_list" symbol="gtk_drag_dest_set_target_list">
         <return-type type="void"/>
         <parameters>
-          <parameter name="style" type="GtkStyle*"/>
-          <parameter name="window" type="GdkWindow*"/>
-          <parameter name="state_type" type="GtkStateType"/>
-          <parameter name="shadow_type" type="GtkShadowType"/>
-          <parameter name="area" type="GdkRectangle*"/>
           <parameter name="widget" type="GtkWidget*"/>
-          <parameter name="detail" type="const-gchar*"/>
-          <parameter name="x" type="gint"/>
-          <parameter name="y" type="gint"/>
-          <parameter name="width" type="gint"/>
-          <parameter name="height" type="gint"/>
+          <parameter name="target_list" type="GtkTargetList*"/>
         </parameters>
       </method>
-      <method name="_paint_focus" symbol="gtk_paint_focus">
+      <method name="dest_set_track_motion" symbol="gtk_drag_dest_set_track_motion">
         <return-type type="void"/>
         <parameters>
-          <parameter name="style" type="GtkStyle*"/>
-          <parameter name="window" type="GdkWindow*"/>
-          <parameter name="state_type" type="GtkStateType"/>
-          <parameter name="area" type="GdkRectangle*"/>
           <parameter name="widget" type="GtkWidget*"/>
-          <parameter name="detail" type="const-gchar*"/>
-          <parameter name="x" type="gint"/>
-          <parameter name="y" type="gint"/>
-          <parameter name="width" type="gint"/>
-          <parameter name="height" type="gint"/>
+          <parameter name="track_motion" type="gboolean"/>
         </parameters>
       </method>
-      <method name="_paint_handle" symbol="gtk_paint_handle">
+      <method name="dest_unset" symbol="gtk_drag_dest_unset">
         <return-type type="void"/>
         <parameters>
-          <parameter name="style" type="GtkStyle*"/>
-          <parameter name="window" type="GdkWindow*"/>
-          <parameter name="state_type" type="GtkStateType"/>
-          <parameter name="shadow_type" type="GtkShadowType"/>
-          <parameter name="area" type="GdkRectangle*"/>
           <parameter name="widget" type="GtkWidget*"/>
-          <parameter name="detail" type="const-gchar*"/>
-          <parameter name="x" type="gint"/>
-          <parameter name="y" type="gint"/>
-          <parameter name="width" type="gint"/>
-          <parameter name="height" type="gint"/>
-          <parameter name="orientation" type="GtkOrientation"/>
         </parameters>
       </method>
-      <method name="_paint_hline" symbol="gtk_paint_hline">
+      <method name="finish" symbol="gtk_drag_finish">
         <return-type type="void"/>
         <parameters>
-          <parameter name="style" type="GtkStyle*"/>
-          <parameter name="window" type="GdkWindow*"/>
-          <parameter name="state_type" type="GtkStateType"/>
-          <parameter name="area" type="GdkRectangle*"/>
-          <parameter name="widget" type="GtkWidget*"/>
-          <parameter name="detail" type="const-gchar*"/>
-          <parameter name="x1" type="gint"/>
-          <parameter name="x2" type="gint"/>
-          <parameter name="y" type="gint"/>
+          <parameter name="context" type="GdkDragContext*"/>
+          <parameter name="success" type="gboolean"/>
+          <parameter name="del" type="gboolean"/>
+          <parameter name="time_" type="guint32"/>
         </parameters>
       </method>
-      <method name="_paint_layout" symbol="gtk_paint_layout">
+      <method name="get_data" symbol="gtk_drag_get_data">
         <return-type type="void"/>
         <parameters>
-          <parameter name="style" type="GtkStyle*"/>
-          <parameter name="window" type="GdkWindow*"/>
-          <parameter name="state_type" type="GtkStateType"/>
-          <parameter name="use_text" type="gboolean"/>
-          <parameter name="area" type="GdkRectangle*"/>
           <parameter name="widget" type="GtkWidget*"/>
-          <parameter name="detail" type="const-gchar*"/>
-          <parameter name="x" type="gint"/>
-          <parameter name="y" type="gint"/>
-          <parameter name="layout" type="PangoLayout*"/>
+          <parameter name="context" type="GdkDragContext*"/>
+          <parameter name="target" type="GdkAtom"/>
+          <parameter name="time_" type="guint32"/>
         </parameters>
       </method>
-      <method name="_paint_option" symbol="gtk_paint_option">
-        <return-type type="void"/>
+      <method name="get_source_widget" symbol="gtk_drag_get_source_widget">
+        <return-type type="GtkWidget*"/>
         <parameters>
-          <parameter name="style" type="GtkStyle*"/>
-          <parameter name="window" type="GdkWindow*"/>
-          <parameter name="state_type" type="GtkStateType"/>
-          <parameter name="shadow_type" type="GtkShadowType"/>
-          <parameter name="area" type="GdkRectangle*"/>
-          <parameter name="widget" type="GtkWidget*"/>
-          <parameter name="detail" type="const-gchar*"/>
-          <parameter name="x" type="gint"/>
-          <parameter name="y" type="gint"/>
-          <parameter name="width" type="gint"/>
-          <parameter name="height" type="gint"/>
+          <parameter name="context" type="GdkDragContext*"/>
         </parameters>
       </method>
-      <method name="_paint_polygon" symbol="gtk_paint_polygon">
+      <method name="highlight" symbol="gtk_drag_highlight">
         <return-type type="void"/>
         <parameters>
-          <parameter name="style" type="GtkStyle*"/>
-          <parameter name="window" type="GdkWindow*"/>
-          <parameter name="state_type" type="GtkStateType"/>
-          <parameter name="shadow_type" type="GtkShadowType"/>
-          <parameter name="area" type="GdkRectangle*"/>
           <parameter name="widget" type="GtkWidget*"/>
-          <parameter name="detail" type="const-gchar*"/>
-          <parameter name="points" type="GdkPoint*"/>
-          <parameter name="npoints" type="gint"/>
-          <parameter name="fill" type="gboolean"/>
         </parameters>
       </method>
-      <method name="_paint_resize_grip" symbol="gtk_paint_resize_grip">
-        <return-type type="void"/>
-        <parameters>
-          <parameter name="style" type="GtkStyle*"/>
-          <parameter name="window" type="GdkWindow*"/>
-          <parameter name="state_type" type="GtkStateType"/>
-          <parameter name="area" type="GdkRectangle*"/>
-          <parameter name="widget" type="GtkWidget*"/>
-          <parameter name="detail" type="const-gchar*"/>
-          <parameter name="edge" type="GdkWindowEdge"/>
-          <parameter name="x" type="gint"/>
-          <parameter name="y" type="gint"/>
-          <parameter name="width" type="gint"/>
-          <parameter name="height" type="gint"/>
-        </parameters>
-      </method>
-      <method name="_paint_shadow" symbol="gtk_paint_shadow">
-        <return-type type="void"/>
-        <parameters>
-          <parameter name="style" type="GtkStyle*"/>
-          <parameter name="window" type="GdkWindow*"/>
-          <parameter name="state_type" type="GtkStateType"/>
-          <parameter name="shadow_type" type="GtkShadowType"/>
-          <parameter name="area" type="GdkRectangle*"/>
-          <parameter name="widget" type="GtkWidget*"/>
-          <parameter name="detail" type="const-gchar*"/>
-          <parameter name="x" type="gint"/>
-          <parameter name="y" type="gint"/>
-          <parameter name="width" type="gint"/>
-          <parameter name="height" type="gint"/>
-        </parameters>
-      </method>
-      <method name="_paint_shadow_gap" symbol="gtk_paint_shadow_gap">
-        <return-type type="void"/>
-        <parameters>
-          <parameter name="style" type="GtkStyle*"/>
-          <parameter name="window" type="GdkWindow*"/>
-          <parameter name="state_type" type="GtkStateType"/>
-          <parameter name="shadow_type" type="GtkShadowType"/>
-          <parameter name="area" type="GdkRectangle*"/>
-          <parameter name="widget" type="GtkWidget*"/>
-          <parameter name="detail" type="gchar*"/>
-          <parameter name="x" type="gint"/>
-          <parameter name="y" type="gint"/>
-          <parameter name="width" type="gint"/>
-          <parameter name="height" type="gint"/>
-          <parameter name="gap_side" type="GtkPositionType"/>
-          <parameter name="gap_x" type="gint"/>
-          <parameter name="gap_width" type="gint"/>
-        </parameters>
-      </method>
-      <method name="_paint_slider" symbol="gtk_paint_slider">
-        <return-type type="void"/>
-        <parameters>
-          <parameter name="style" type="GtkStyle*"/>
-          <parameter name="window" type="GdkWindow*"/>
-          <parameter name="state_type" type="GtkStateType"/>
-          <parameter name="shadow_type" type="GtkShadowType"/>
-          <parameter name="area" type="GdkRectangle*"/>
-          <parameter name="widget" type="GtkWidget*"/>
-          <parameter name="detail" type="const-gchar*"/>
-          <parameter name="x" type="gint"/>
-          <parameter name="y" type="gint"/>
-          <parameter name="width" type="gint"/>
-          <parameter name="height" type="gint"/>
-          <parameter name="orientation" type="GtkOrientation"/>
-        </parameters>
-      </method>
-      <method deprecated="1" name="_paint_string" symbol="gtk_paint_string">
-        <return-type type="void"/>
-        <parameters>
-          <parameter name="style" type="GtkStyle*"/>
-          <parameter name="window" type="GdkWindow*"/>
-          <parameter name="state_type" type="GtkStateType"/>
-          <parameter name="area" type="GdkRectangle*"/>
-          <parameter name="widget" type="GtkWidget*"/>
-          <parameter name="detail" type="const-gchar*"/>
-          <parameter name="x" type="gint"/>
-          <parameter name="y" type="gint"/>
-          <parameter name="string" type="const-gchar*"/>
-        </parameters>
-      </method>
-      <method name="_paint_tab" symbol="gtk_paint_tab">
-        <return-type type="void"/>
-        <parameters>
-          <parameter name="style" type="GtkStyle*"/>
-          <parameter name="window" type="GdkWindow*"/>
-          <parameter name="state_type" type="GtkStateType"/>
-          <parameter name="shadow_type" type="GtkShadowType"/>
-          <parameter name="area" type="GdkRectangle*"/>
-          <parameter name="widget" type="GtkWidget*"/>
-          <parameter name="detail" type="const-gchar*"/>
-          <parameter name="x" type="gint"/>
-          <parameter name="y" type="gint"/>
-          <parameter name="width" type="gint"/>
-          <parameter name="height" type="gint"/>
-        </parameters>
-      </method>
-      <method name="_paint_vline" symbol="gtk_paint_vline">
-        <return-type type="void"/>
-        <parameters>
-          <parameter name="style" type="GtkStyle*"/>
-          <parameter name="window" type="GdkWindow*"/>
-          <parameter name="state_type" type="GtkStateType"/>
-          <parameter name="area" type="GdkRectangle*"/>
-          <parameter name="widget" type="GtkWidget*"/>
-          <parameter name="detail" type="const-gchar*"/>
-          <parameter name="y1_" type="gint"/>
-          <parameter name="y2_" type="gint"/>
-          <parameter name="x" type="gint"/>
-        </parameters>
-      </method>
-      <method name="_parse_args" symbol="gtk_parse_args">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter name="argc" type="int*"/>
-          <parameter name="argv" type="char***"/>
-        </parameters>
-      </method>
-      <method name="_private_flags_get_type" symbol="gtk_private_flags_get_type">
-        <return-type type="GType"/>
-      </method>
-      <method name="_propagate_event" symbol="gtk_propagate_event">
-        <return-type type="void"/>
-        <parameters>
-          <parameter name="widget" type="GtkWidget*"/>
-          <parameter name="event" type="GdkEvent*"/>
-        </parameters>
-      </method>
-      <method name="_rgb_to_hsv" symbol="gtk_rgb_to_hsv">
-        <return-type type="void"/>
-        <parameters>
-          <parameter name="r" type="gdouble"/>
-          <parameter name="g" type="gdouble"/>
-          <parameter name="b" type="gdouble"/>
-          <parameter name="h" type="gdouble*"/>
-          <parameter name="s" type="gdouble*"/>
-          <parameter name="v" type="gdouble*"/>
-        </parameters>
-      </method>
-      <method name="_set_locale" symbol="gtk_set_locale">
-        <return-type type="gchar*"/>
-      </method>
-      <method name="_show_about_dialog" symbol="gtk_show_about_dialog">
-        <return-type type="void"/>
-        <parameters>
-          <parameter name="parent" type="GtkWindow*"/>
-          <parameter name="first_property_name" type="const-gchar*"/>
-        </parameters>
-      </method>
-      <method name="_text_layout_draw" symbol="gtk_text_layout_draw">
-        <return-type type="void"/>
-        <parameters>
-          <parameter name="layout" type="GtkTextLayout*"/>
-          <parameter name="widget" type="GtkWidget*"/>
-          <parameter name="drawable" type="GdkDrawable*"/>
-          <parameter name="cursor_gc" type="GdkGC*"/>
-          <parameter name="x_offset" type="gint"/>
-          <parameter name="y_offset" type="gint"/>
-          <parameter name="x" type="gint"/>
-          <parameter name="y" type="gint"/>
-          <parameter name="width" type="gint"/>
-          <parameter name="height" type="gint"/>
-          <parameter name="widgets" type="GList**"/>
-        </parameters>
-      </method>
-    </struct>
-    <struct name="GtkBindings">
-      <method name="activate" symbol="gtk_bindings_activate">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter name="object" type="GtkObject*"/>
-          <parameter name="keyval" type="guint"/>
-          <parameter name="modifiers" type="GdkModifierType"/>
-        </parameters>
-      </method>
-      <method name="activate_event" symbol="gtk_bindings_activate_event">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter name="object" type="GtkObject*"/>
-          <parameter name="event" type="GdkEventKey*"/>
-        </parameters>
-      </method>
-    </struct>
-    <struct name="GtkCtree">
-      <method name="expander_style_get_type" symbol="gtk_ctree_expander_style_get_type">
-        <return-type type="GType"/>
-      </method>
-      <method name="expansion_type_get_type" symbol="gtk_ctree_expansion_type_get_type">
-        <return-type type="GType"/>
-      </method>
-      <method name="line_style_get_type" symbol="gtk_ctree_line_style_get_type">
-        <return-type type="GType"/>
-      </method>
-      <method name="pos_get_type" symbol="gtk_ctree_pos_get_type">
-        <return-type type="GType"/>
-      </method>
-    </struct>
-    <struct name="GtkDrag">
-      <method name="begin" symbol="gtk_drag_begin">
-        <return-type type="GdkDragContext*"/>
-        <parameters>
-          <parameter name="widget" type="GtkWidget*"/>
-          <parameter name="targets" type="GtkTargetList*"/>
-          <parameter name="actions" type="GdkDragAction"/>
-          <parameter name="button" type="gint"/>
-          <parameter name="event" type="GdkEvent*"/>
-        </parameters>
-      </method>
-      <method name="check_threshold" symbol="gtk_drag_check_threshold">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter name="widget" type="GtkWidget*"/>
-          <parameter name="start_x" type="gint"/>
-          <parameter name="start_y" type="gint"/>
-          <parameter name="current_x" type="gint"/>
-          <parameter name="current_y" type="gint"/>
-        </parameters>
-      </method>
-      <method name="dest_add_image_targets" symbol="gtk_drag_dest_add_image_targets">
-        <return-type type="void"/>
-        <parameters>
-          <parameter name="widget" type="GtkWidget*"/>
-        </parameters>
-      </method>
-      <method name="dest_add_text_targets" symbol="gtk_drag_dest_add_text_targets">
-        <return-type type="void"/>
-        <parameters>
-          <parameter name="widget" type="GtkWidget*"/>
-        </parameters>
-      </method>
-      <method name="dest_add_uri_targets" symbol="gtk_drag_dest_add_uri_targets">
-        <return-type type="void"/>
-        <parameters>
-          <parameter name="widget" type="GtkWidget*"/>
-        </parameters>
-      </method>
-      <method name="dest_find_target" symbol="gtk_drag_dest_find_target">
-        <return-type type="GdkAtom"/>
-        <parameters>
-          <parameter name="widget" type="GtkWidget*"/>
-          <parameter name="context" type="GdkDragContext*"/>
-          <parameter name="target_list" type="GtkTargetList*"/>
-        </parameters>
-      </method>
-      <method name="dest_get_target_list" symbol="gtk_drag_dest_get_target_list">
-        <return-type type="GtkTargetList*"/>
-        <parameters>
-          <parameter name="widget" type="GtkWidget*"/>
-        </parameters>
-      </method>
-      <method name="dest_get_track_motion" symbol="gtk_drag_dest_get_track_motion">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter name="widget" type="GtkWidget*"/>
-        </parameters>
-      </method>
-      <method name="dest_set" symbol="gtk_drag_dest_set">
-        <return-type type="void"/>
-        <parameters>
-          <parameter name="widget" type="GtkWidget*"/>
-          <parameter name="flags" type="GtkDestDefaults"/>
-          <parameter name="targets" type="const-GtkTargetEntry*"/>
-          <parameter name="n_targets" type="gint"/>
-          <parameter name="actions" type="GdkDragAction"/>
-        </parameters>
-      </method>
-      <method name="dest_set_proxy" symbol="gtk_drag_dest_set_proxy">
-        <return-type type="void"/>
-        <parameters>
-          <parameter name="widget" type="GtkWidget*"/>
-          <parameter name="proxy_window" type="GdkWindow*"/>
-          <parameter name="protocol" type="GdkDragProtocol"/>
-          <parameter name="use_coordinates" type="gboolean"/>
-        </parameters>
-      </method>
-      <method name="dest_set_target_list" symbol="gtk_drag_dest_set_target_list">
-        <return-type type="void"/>
-        <parameters>
-          <parameter name="widget" type="GtkWidget*"/>
-          <parameter name="target_list" type="GtkTargetList*"/>
-        </parameters>
-      </method>
-      <method name="dest_set_track_motion" symbol="gtk_drag_dest_set_track_motion">
-        <return-type type="void"/>
-        <parameters>
-          <parameter name="widget" type="GtkWidget*"/>
-          <parameter name="track_motion" type="gboolean"/>
-        </parameters>
-      </method>
-      <method name="dest_unset" symbol="gtk_drag_dest_unset">
-        <return-type type="void"/>
-        <parameters>
-          <parameter name="widget" type="GtkWidget*"/>
-        </parameters>
-      </method>
-      <method name="finish" symbol="gtk_drag_finish">
-        <return-type type="void"/>
-        <parameters>
-          <parameter name="context" type="GdkDragContext*"/>
-          <parameter name="success" type="gboolean"/>
-          <parameter name="del" type="gboolean"/>
-          <parameter name="time_" type="guint32"/>
-        </parameters>
-      </method>
-      <method name="get_data" symbol="gtk_drag_get_data">
-        <return-type type="void"/>
-        <parameters>
-          <parameter name="widget" type="GtkWidget*"/>
-          <parameter name="context" type="GdkDragContext*"/>
-          <parameter name="target" type="GdkAtom"/>
-          <parameter name="time_" type="guint32"/>
-        </parameters>
-      </method>
-      <method name="get_source_widget" symbol="gtk_drag_get_source_widget">
-        <return-type type="GtkWidget*"/>
-        <parameters>
-          <parameter name="context" type="GdkDragContext*"/>
-        </parameters>
-      </method>
-      <method name="highlight" symbol="gtk_drag_highlight">
-        <return-type type="void"/>
-        <parameters>
-          <parameter name="widget" type="GtkWidget*"/>
-        </parameters>
-      </method>
-      <method deprecated="1" name="set_default_icon" symbol="gtk_drag_set_default_icon">
+      <method deprecated="1" name="set_default_icon" symbol="gtk_drag_set_default_icon">
         <return-type type="void"/>
         <parameters>
           <parameter name="colormap" type="GdkColormap*"/>
@@ -25611,6 +25177,18 @@
         </parameters>
       </method>
     </struct>
+    <function name="enumerate_printers" symbol="gtk_enumerate_printers">
+      <return-type type="void"/>
+      <parameters>
+        <parameter name="func" type="GtkPrinterFunc"/>
+        <parameter name="data" type="gpointer"/>
+        <parameter name="destroy" type="GDestroyNotify"/>
+        <parameter name="wait" type="gboolean"/>
+      </parameters>
+    </function>
+    <function name="events_pending" symbol="gtk_events_pending">
+      <return-type type="gboolean"/>
+    </function>
     <struct name="GtkGc">
       <method name="get" symbol="gtk_gc_get">
         <return-type type="GdkGC*"/>
@@ -25628,6 +25206,33 @@
         </parameters>
       </method>
     </struct>
+    <function name="get_current_event" symbol="gtk_get_current_event">
+      <return-type type="GdkEvent*"/>
+    </function>
+    <function name="get_current_event_state" symbol="gtk_get_current_event_state">
+      <return-type type="gboolean"/>
+      <parameters>
+        <parameter name="state" type="GdkModifierType*"/>
+      </parameters>
+    </function>
+    <function name="get_current_event_time" symbol="gtk_get_current_event_time">
+      <return-type type="guint32"/>
+    </function>
+    <function name="get_default_language" symbol="gtk_get_default_language">
+      <return-type type="PangoLanguage*"/>
+    </function>
+    <function name="get_event_widget" symbol="gtk_get_event_widget">
+      <return-type type="GtkWidget*"/>
+      <parameters>
+        <parameter name="event" type="GdkEvent*"/>
+      </parameters>
+    </function>
+    <function name="get_option_group" symbol="gtk_get_option_group">
+      <return-type type="GOptionGroup*"/>
+      <parameters>
+        <parameter name="open_default_display" type="gboolean"/>
+      </parameters>
+    </function>
     <struct name="GtkGrab">
       <method name="add" symbol="gtk_grab_add">
         <return-type type="void"/>
@@ -25691,6 +25296,9 @@
         </parameters>
       </method>
     </struct>
+    <function name="identifier_get_type" symbol="gtk_identifier_get_type">
+      <return-type type="GType"/>
+    </function>
     <struct name="GtkIdle">
       <method deprecated="1" name="add" symbol="gtk_idle_add">
         <return-type type="guint"/>
@@ -25834,6 +25442,349 @@
         <return-type type="void"/>
       </method>
     </struct>
+    <function name="paint_arrow" symbol="gtk_paint_arrow">
+      <return-type type="void"/>
+      <parameters>
+        <parameter name="style" type="GtkStyle*"/>
+        <parameter name="window" type="GdkWindow*"/>
+        <parameter name="state_type" type="GtkStateType"/>
+        <parameter name="shadow_type" type="GtkShadowType"/>
+        <parameter name="area" type="GdkRectangle*"/>
+        <parameter name="widget" type="GtkWidget*"/>
+        <parameter name="detail" type="const-gchar*"/>
+        <parameter name="arrow_type" type="GtkArrowType"/>
+        <parameter name="fill" type="gboolean"/>
+        <parameter name="x" type="gint"/>
+        <parameter name="y" type="gint"/>
+        <parameter name="width" type="gint"/>
+        <parameter name="height" type="gint"/>
+      </parameters>
+    </function>
+    <function name="paint_box" symbol="gtk_paint_box">
+      <return-type type="void"/>
+      <parameters>
+        <parameter name="style" type="GtkStyle*"/>
+        <parameter name="window" type="GdkWindow*"/>
+        <parameter name="state_type" type="GtkStateType"/>
+        <parameter name="shadow_type" type="GtkShadowType"/>
+        <parameter name="area" type="GdkRectangle*"/>
+        <parameter name="widget" type="GtkWidget*"/>
+        <parameter name="detail" type="const-gchar*"/>
+        <parameter name="x" type="gint"/>
+        <parameter name="y" type="gint"/>
+        <parameter name="width" type="gint"/>
+        <parameter name="height" type="gint"/>
+      </parameters>
+    </function>
+    <function name="paint_box_gap" symbol="gtk_paint_box_gap">
+      <return-type type="void"/>
+      <parameters>
+        <parameter name="style" type="GtkStyle*"/>
+        <parameter name="window" type="GdkWindow*"/>
+        <parameter name="state_type" type="GtkStateType"/>
+        <parameter name="shadow_type" type="GtkShadowType"/>
+        <parameter name="area" type="GdkRectangle*"/>
+        <parameter name="widget" type="GtkWidget*"/>
+        <parameter name="detail" type="gchar*"/>
+        <parameter name="x" type="gint"/>
+        <parameter name="y" type="gint"/>
+        <parameter name="width" type="gint"/>
+        <parameter name="height" type="gint"/>
+        <parameter name="gap_side" type="GtkPositionType"/>
+        <parameter name="gap_x" type="gint"/>
+        <parameter name="gap_width" type="gint"/>
+      </parameters>
+    </function>
+    <function name="paint_check" symbol="gtk_paint_check">
+      <return-type type="void"/>
+      <parameters>
+        <parameter name="style" type="GtkStyle*"/>
+        <parameter name="window" type="GdkWindow*"/>
+        <parameter name="state_type" type="GtkStateType"/>
+        <parameter name="shadow_type" type="GtkShadowType"/>
+        <parameter name="area" type="GdkRectangle*"/>
+        <parameter name="widget" type="GtkWidget*"/>
+        <parameter name="detail" type="const-gchar*"/>
+        <parameter name="x" type="gint"/>
+        <parameter name="y" type="gint"/>
+        <parameter name="width" type="gint"/>
+        <parameter name="height" type="gint"/>
+      </parameters>
+    </function>
+    <function name="paint_diamond" symbol="gtk_paint_diamond">
+      <return-type type="void"/>
+      <parameters>
+        <parameter name="style" type="GtkStyle*"/>
+        <parameter name="window" type="GdkWindow*"/>
+        <parameter name="state_type" type="GtkStateType"/>
+        <parameter name="shadow_type" type="GtkShadowType"/>
+        <parameter name="area" type="GdkRectangle*"/>
+        <parameter name="widget" type="GtkWidget*"/>
+        <parameter name="detail" type="const-gchar*"/>
+        <parameter name="x" type="gint"/>
+        <parameter name="y" type="gint"/>
+        <parameter name="width" type="gint"/>
+        <parameter name="height" type="gint"/>
+      </parameters>
+    </function>
+    <function name="paint_expander" symbol="gtk_paint_expander">
+      <return-type type="void"/>
+      <parameters>
+        <parameter name="style" type="GtkStyle*"/>
+        <parameter name="window" type="GdkWindow*"/>
+        <parameter name="state_type" type="GtkStateType"/>
+        <parameter name="area" type="GdkRectangle*"/>
+        <parameter name="widget" type="GtkWidget*"/>
+        <parameter name="detail" type="const-gchar*"/>
+        <parameter name="x" type="gint"/>
+        <parameter name="y" type="gint"/>
+        <parameter name="expander_style" type="GtkExpanderStyle"/>
+      </parameters>
+    </function>
+    <function name="paint_extension" symbol="gtk_paint_extension">
+      <return-type type="void"/>
+      <parameters>
+        <parameter name="style" type="GtkStyle*"/>
+        <parameter name="window" type="GdkWindow*"/>
+        <parameter name="state_type" type="GtkStateType"/>
+        <parameter name="shadow_type" type="GtkShadowType"/>
+        <parameter name="area" type="GdkRectangle*"/>
+        <parameter name="widget" type="GtkWidget*"/>
+        <parameter name="detail" type="gchar*"/>
+        <parameter name="x" type="gint"/>
+        <parameter name="y" type="gint"/>
+        <parameter name="width" type="gint"/>
+        <parameter name="height" type="gint"/>
+        <parameter name="gap_side" type="GtkPositionType"/>
+      </parameters>
+    </function>
+    <function name="paint_flat_box" symbol="gtk_paint_flat_box">
+      <return-type type="void"/>
+      <parameters>
+        <parameter name="style" type="GtkStyle*"/>
+        <parameter name="window" type="GdkWindow*"/>
+        <parameter name="state_type" type="GtkStateType"/>
+        <parameter name="shadow_type" type="GtkShadowType"/>
+        <parameter name="area" type="GdkRectangle*"/>
+        <parameter name="widget" type="GtkWidget*"/>
+        <parameter name="detail" type="const-gchar*"/>
+        <parameter name="x" type="gint"/>
+        <parameter name="y" type="gint"/>
+        <parameter name="width" type="gint"/>
+        <parameter name="height" type="gint"/>
+      </parameters>
+    </function>
+    <function name="paint_focus" symbol="gtk_paint_focus">
+      <return-type type="void"/>
+      <parameters>
+        <parameter name="style" type="GtkStyle*"/>
+        <parameter name="window" type="GdkWindow*"/>
+        <parameter name="state_type" type="GtkStateType"/>
+        <parameter name="area" type="GdkRectangle*"/>
+        <parameter name="widget" type="GtkWidget*"/>
+        <parameter name="detail" type="const-gchar*"/>
+        <parameter name="x" type="gint"/>
+        <parameter name="y" type="gint"/>
+        <parameter name="width" type="gint"/>
+        <parameter name="height" type="gint"/>
+      </parameters>
+    </function>
+    <function name="paint_handle" symbol="gtk_paint_handle">
+      <return-type type="void"/>
+      <parameters>
+        <parameter name="style" type="GtkStyle*"/>
+        <parameter name="window" type="GdkWindow*"/>
+        <parameter name="state_type" type="GtkStateType"/>
+        <parameter name="shadow_type" type="GtkShadowType"/>
+        <parameter name="area" type="GdkRectangle*"/>
+        <parameter name="widget" type="GtkWidget*"/>
+        <parameter name="detail" type="const-gchar*"/>
+        <parameter name="x" type="gint"/>
+        <parameter name="y" type="gint"/>
+        <parameter name="width" type="gint"/>
+        <parameter name="height" type="gint"/>
+        <parameter name="orientation" type="GtkOrientation"/>
+      </parameters>
+    </function>
+    <function name="paint_hline" symbol="gtk_paint_hline">
+      <return-type type="void"/>
+      <parameters>
+        <parameter name="style" type="GtkStyle*"/>
+        <parameter name="window" type="GdkWindow*"/>
+        <parameter name="state_type" type="GtkStateType"/>
+        <parameter name="area" type="GdkRectangle*"/>
+        <parameter name="widget" type="GtkWidget*"/>
+        <parameter name="detail" type="const-gchar*"/>
+        <parameter name="x1" type="gint"/>
+        <parameter name="x2" type="gint"/>
+        <parameter name="y" type="gint"/>
+      </parameters>
+    </function>
+    <function name="paint_layout" symbol="gtk_paint_layout">
+      <return-type type="void"/>
+      <parameters>
+        <parameter name="style" type="GtkStyle*"/>
+        <parameter name="window" type="GdkWindow*"/>
+        <parameter name="state_type" type="GtkStateType"/>
+        <parameter name="use_text" type="gboolean"/>
+        <parameter name="area" type="GdkRectangle*"/>
+        <parameter name="widget" type="GtkWidget*"/>
+        <parameter name="detail" type="const-gchar*"/>
+        <parameter name="x" type="gint"/>
+        <parameter name="y" type="gint"/>
+        <parameter name="layout" type="PangoLayout*"/>
+      </parameters>
+    </function>
+    <function name="paint_option" symbol="gtk_paint_option">
+      <return-type type="void"/>
+      <parameters>
+        <parameter name="style" type="GtkStyle*"/>
+        <parameter name="window" type="GdkWindow*"/>
+        <parameter name="state_type" type="GtkStateType"/>
+        <parameter name="shadow_type" type="GtkShadowType"/>
+        <parameter name="area" type="GdkRectangle*"/>
+        <parameter name="widget" type="GtkWidget*"/>
+        <parameter name="detail" type="const-gchar*"/>
+        <parameter name="x" type="gint"/>
+        <parameter name="y" type="gint"/>
+        <parameter name="width" type="gint"/>
+        <parameter name="height" type="gint"/>
+      </parameters>
+    </function>
+    <function name="paint_polygon" symbol="gtk_paint_polygon">
+      <return-type type="void"/>
+      <parameters>
+        <parameter name="style" type="GtkStyle*"/>
+        <parameter name="window" type="GdkWindow*"/>
+        <parameter name="state_type" type="GtkStateType"/>
+        <parameter name="shadow_type" type="GtkShadowType"/>
+        <parameter name="area" type="GdkRectangle*"/>
+        <parameter name="widget" type="GtkWidget*"/>
+        <parameter name="detail" type="const-gchar*"/>
+        <parameter name="points" type="GdkPoint*"/>
+        <parameter name="npoints" type="gint"/>
+        <parameter name="fill" type="gboolean"/>
+      </parameters>
+    </function>
+    <function name="paint_resize_grip" symbol="gtk_paint_resize_grip">
+      <return-type type="void"/>
+      <parameters>
+        <parameter name="style" type="GtkStyle*"/>
+        <parameter name="window" type="GdkWindow*"/>
+        <parameter name="state_type" type="GtkStateType"/>
+        <parameter name="area" type="GdkRectangle*"/>
+        <parameter name="widget" type="GtkWidget*"/>
+        <parameter name="detail" type="const-gchar*"/>
+        <parameter name="edge" type="GdkWindowEdge"/>
+        <parameter name="x" type="gint"/>
+        <parameter name="y" type="gint"/>
+        <parameter name="width" type="gint"/>
+        <parameter name="height" type="gint"/>
+      </parameters>
+    </function>
+    <function name="paint_shadow" symbol="gtk_paint_shadow">
+      <return-type type="void"/>
+      <parameters>
+        <parameter name="style" type="GtkStyle*"/>
+        <parameter name="window" type="GdkWindow*"/>
+        <parameter name="state_type" type="GtkStateType"/>
+        <parameter name="shadow_type" type="GtkShadowType"/>
+        <parameter name="area" type="GdkRectangle*"/>
+        <parameter name="widget" type="GtkWidget*"/>
+        <parameter name="detail" type="const-gchar*"/>
+        <parameter name="x" type="gint"/>
+        <parameter name="y" type="gint"/>
+        <parameter name="width" type="gint"/>
+        <parameter name="height" type="gint"/>
+      </parameters>
+    </function>
+    <function name="paint_shadow_gap" symbol="gtk_paint_shadow_gap">
+      <return-type type="void"/>
+      <parameters>
+        <parameter name="style" type="GtkStyle*"/>
+        <parameter name="window" type="GdkWindow*"/>
+        <parameter name="state_type" type="GtkStateType"/>
+        <parameter name="shadow_type" type="GtkShadowType"/>
+        <parameter name="area" type="GdkRectangle*"/>
+        <parameter name="widget" type="GtkWidget*"/>
+        <parameter name="detail" type="gchar*"/>
+        <parameter name="x" type="gint"/>
+        <parameter name="y" type="gint"/>
+        <parameter name="width" type="gint"/>
+        <parameter name="height" type="gint"/>
+        <parameter name="gap_side" type="GtkPositionType"/>
+        <parameter name="gap_x" type="gint"/>
+        <parameter name="gap_width" type="gint"/>
+      </parameters>
+    </function>
+    <function name="paint_slider" symbol="gtk_paint_slider">
+      <return-type type="void"/>
+      <parameters>
+        <parameter name="style" type="GtkStyle*"/>
+        <parameter name="window" type="GdkWindow*"/>
+        <parameter name="state_type" type="GtkStateType"/>
+        <parameter name="shadow_type" type="GtkShadowType"/>
+        <parameter name="area" type="GdkRectangle*"/>
+        <parameter name="widget" type="GtkWidget*"/>
+        <parameter name="detail" type="const-gchar*"/>
+        <parameter name="x" type="gint"/>
+        <parameter name="y" type="gint"/>
+        <parameter name="width" type="gint"/>
+        <parameter name="height" type="gint"/>
+        <parameter name="orientation" type="GtkOrientation"/>
+      </parameters>
+    </function>
+    <function deprecated="1" name="paint_string" symbol="gtk_paint_string">
+      <return-type type="void"/>
+      <parameters>
+        <parameter name="style" type="GtkStyle*"/>
+        <parameter name="window" type="GdkWindow*"/>
+        <parameter name="state_type" type="GtkStateType"/>
+        <parameter name="area" type="GdkRectangle*"/>
+        <parameter name="widget" type="GtkWidget*"/>
+        <parameter name="detail" type="const-gchar*"/>
+        <parameter name="x" type="gint"/>
+        <parameter name="y" type="gint"/>
+        <parameter name="string" type="const-gchar*"/>
+      </parameters>
+    </function>
+    <function name="paint_tab" symbol="gtk_paint_tab">
+      <return-type type="void"/>
+      <parameters>
+        <parameter name="style" type="GtkStyle*"/>
+        <parameter name="window" type="GdkWindow*"/>
+        <parameter name="state_type" type="GtkStateType"/>
+        <parameter name="shadow_type" type="GtkShadowType"/>
+        <parameter name="area" type="GdkRectangle*"/>
+        <parameter name="widget" type="GtkWidget*"/>
+        <parameter name="detail" type="const-gchar*"/>
+        <parameter name="x" type="gint"/>
+        <parameter name="y" type="gint"/>
+        <parameter name="width" type="gint"/>
+        <parameter name="height" type="gint"/>
+      </parameters>
+    </function>
+    <function name="paint_vline" symbol="gtk_paint_vline">
+      <return-type type="void"/>
+      <parameters>
+        <parameter name="style" type="GtkStyle*"/>
+        <parameter name="window" type="GdkWindow*"/>
+        <parameter name="state_type" type="GtkStateType"/>
+        <parameter name="area" type="GdkRectangle*"/>
+        <parameter name="widget" type="GtkWidget*"/>
+        <parameter name="detail" type="const-gchar*"/>
+        <parameter name="y1_" type="gint"/>
+        <parameter name="y2_" type="gint"/>
+        <parameter name="x" type="gint"/>
+      </parameters>
+    </function>
+    <function name="parse_args" symbol="gtk_parse_args">
+      <return-type type="gboolean"/>
+      <parameters>
+        <parameter name="argc" type="int*"/>
+        <parameter name="argv" type="char***"/>
+      </parameters>
+    </function>
     <struct name="GtkPrint">
       <method name="error_quark" symbol="gtk_print_error_quark">
         <return-type type="GQuark"/>
@@ -25857,6 +25808,16 @@
         </parameters>
       </method>
     </struct>
+    <function name="private_flags_get_type" symbol="gtk_private_flags_get_type">
+      <return-type type="GType"/>
+    </function>
+    <function name="propagate_event" symbol="gtk_propagate_event">
+      <return-type type="void"/>
+      <parameters>
+        <parameter name="widget" type="GtkWidget*"/>
+        <parameter name="event" type="GdkEvent*"/>
+      </parameters>
+    </function>
     <struct name="GtkQuit">
       <method name="add" symbol="gtk_quit_add">
         <return-type type="guint"/>
@@ -26027,6 +25988,17 @@
         </parameters>
       </method>
     </struct>
+    <function name="rgb_to_hsv" symbol="gtk_rgb_to_hsv">
+      <return-type type="void"/>
+      <parameters>
+        <parameter name="r" type="gdouble"/>
+        <parameter name="g" type="gdouble"/>
+        <parameter name="b" type="gdouble"/>
+        <parameter name="h" type="gdouble*"/>
+        <parameter name="s" type="gdouble*"/>
+        <parameter name="v" type="gdouble*"/>
+      </parameters>
+    </function>
     <struct name="GtkSelection">
       <method name="add_target" symbol="gtk_selection_add_target">
         <return-type type="void"/>
@@ -26093,6 +26065,16 @@
         </parameters>
       </method>
     </struct>
+    <function name="set_locale" symbol="gtk_set_locale">
+      <return-type type="gchar*"/>
+    </function>
+    <function name="show_about_dialog" symbol="gtk_show_about_dialog">
+      <return-type type="void"/>
+      <parameters>
+        <parameter name="parent" type="GtkWindow*"/>
+        <parameter name="first_property_name" type="const-gchar*"/>
+      </parameters>
+    </function>
     <struct name="GtkSignal">
       <method deprecated="1" name="compat_matched" symbol="gtk_signal_compat_matched">
         <return-type type="void"/>
@@ -26282,6 +26264,22 @@
         </parameters>
       </method>
     </struct>
+    <function name="text_layout_draw" symbol="gtk_text_layout_draw">
+      <return-type type="void"/>
+      <parameters>
+        <parameter name="layout" type="GtkTextLayout*"/>
+        <parameter name="widget" type="GtkWidget*"/>
+        <parameter name="drawable" type="GdkDrawable*"/>
+        <parameter name="cursor_gc" type="GdkGC*"/>
+        <parameter name="x_offset" type="gint"/>
+        <parameter name="y_offset" type="gint"/>
+        <parameter name="x" type="gint"/>
+        <parameter name="y" type="gint"/>
+        <parameter name="width" type="gint"/>
+        <parameter name="height" type="gint"/>
+        <parameter name="widgets" type="GList**"/>
+      </parameters>
+    </function>
     <struct name="GtkTimeout">
       <method deprecated="1" name="add" symbol="gtk_timeout_add">
         <return-type type="guint"/>

diff --git a/vapigen/packages/gtk+-2.0/gtk+-2.0.metadata b/vapigen/packages/gtk+-2.0/gtk+-2.0.metadata
index be96f0a..5b5f9f0 100644 (file)
--- a/vapigen/packages/gtk+-2.0/gtk+-2.0.metadata
+++ b/vapigen/packages/gtk+-2.0/gtk+-2.0.metadata
@@ -1,5 +1,6 @@
 Gtk cheader_filename="gtk/gtk.h"
 GtkAction::activate has_emitter="1"
+GtkActionEntry is_value_type="1"
 GtkAdjustment::changed has_emitter="1"
 GtkAdjustment::value_changed has_emitter="1"
 GtkButton::clicked has_emitter="1"
@@ -32,6 +33,7 @@ gtk_printer_accepts_pdf hidden="1" experimental="1"
 gtk_printer_accepts_ps hidden="1" experimental="1"
 gtk_printer_is_virtual hidden="1" experimental="1"
 gtk_quit_add_full hidden="1"
+GtkRadioActionEntry is_value_type="1"
 GtkTextBuffer::apply_tag has_emitter="1"
 GtkTextBuffer::begin_user_action has_emitter="1"
 GtkTextBuffer::end_user_action has_emitter="1"
@@ -40,6 +42,7 @@ GtkTextBuffer::insert_pixbuf has_emitter="1"
 GtkTextBuffer::remove_tag has_emitter="1"
 GtkTextTag::event has_emitter="1"
 GtkToggleAction::toggled has_emitter="1"
+GtkToggleActionEntry is_value_type="1"
 GtkToggleButton::toggled has_emitter="1"
 GtkToolItem::set_tooltip has_emitter="1"
 GtkTreeView::row_activated has_emitter="1"

diff --git a/vapigen/packages/pango/pango.gidl b/vapigen/packages/pango/pango.gidl
index 8c84c8e..7ef9626 100644 (file)
--- a/vapigen/packages/pango/pango.gidl
+++ b/vapigen/packages/pango/pango.gidl
@@ -2295,180 +2295,178 @@
         </parameters>
       </method>
     </struct>
-    <struct cname="PangoGlobal" name="Global">
-      <method name="_find_base_dir" symbol="pango_find_base_dir">
-        <return-type type="PangoDirection"/>
-        <parameters>
-          <parameter name="text" type="const-gchar*"/>
-          <parameter name="length" type="gint"/>
-        </parameters>
-      </method>
-      <method name="_find_paragraph_boundary" symbol="pango_find_paragraph_boundary">
-        <return-type type="void"/>
-        <parameters>
-          <parameter name="text" type="const-gchar*"/>
-          <parameter name="length" type="gint"/>
-          <parameter name="paragraph_delimiter_index" type="gint*"/>
-          <parameter name="next_paragraph_start" type="gint*"/>
-        </parameters>
-      </method>
-      <method name="_get_log_attrs" symbol="pango_get_log_attrs">
-        <return-type type="void"/>
-        <parameters>
-          <parameter name="text" type="const-char*"/>
-          <parameter name="length" type="int"/>
-          <parameter name="level" type="int"/>
-          <parameter name="language" type="PangoLanguage*"/>
-          <parameter name="log_attrs" type="PangoLogAttr*"/>
-          <parameter name="attrs_len" type="int"/>
-        </parameters>
-      </method>
-      <method deprecated="1" name="_get_mirror_char" symbol="pango_get_mirror_char">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter name="ch" type="gunichar"/>
-          <parameter name="mirrored_ch" type="gunichar*"/>
-        </parameters>
-      </method>
-      <method name="_is_zero_width" symbol="pango_is_zero_width">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter name="ch" type="gunichar"/>
-        </parameters>
-      </method>
-      <method name="_itemize_with_base_dir" symbol="pango_itemize_with_base_dir">
-        <return-type type="GList*"/>
-        <parameters>
-          <parameter name="context" type="PangoContext*"/>
-          <parameter name="base_dir" type="PangoDirection"/>
-          <parameter name="text" type="const-char*"/>
-          <parameter name="start_index" type="int"/>
-          <parameter name="length" type="int"/>
-          <parameter name="attrs" type="PangoAttrList*"/>
-          <parameter name="cached_iter" type="PangoAttrIterator*"/>
-        </parameters>
-      </method>
-      <method name="_parse_markup" symbol="pango_parse_markup">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter name="markup_text" type="const-char*"/>
-          <parameter name="length" type="int"/>
-          <parameter name="accel_marker" type="gunichar"/>
-          <parameter name="attr_list" type="PangoAttrList**"/>
-          <parameter name="text" type="char**"/>
-          <parameter name="accel_char" type="gunichar*"/>
-          <parameter name="error" type="GError**"/>
-        </parameters>
-      </method>
-      <method name="_parse_stretch" symbol="pango_parse_stretch">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter name="str" type="const-char*"/>
-          <parameter name="stretch" type="PangoStretch*"/>
-          <parameter name="warn" type="gboolean"/>
-        </parameters>
-      </method>
-      <method name="_parse_style" symbol="pango_parse_style">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter name="str" type="const-char*"/>
-          <parameter name="style" type="PangoStyle*"/>
-          <parameter name="warn" type="gboolean"/>
-        </parameters>
-      </method>
-      <method name="_parse_variant" symbol="pango_parse_variant">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter name="str" type="const-char*"/>
-          <parameter name="variant" type="PangoVariant*"/>
-          <parameter name="warn" type="gboolean"/>
-        </parameters>
-      </method>
-      <method name="_parse_weight" symbol="pango_parse_weight">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter name="str" type="const-char*"/>
-          <parameter name="weight" type="PangoWeight*"/>
-          <parameter name="warn" type="gboolean"/>
-        </parameters>
-      </method>
-      <method name="_quantize_line_geometry" symbol="pango_quantize_line_geometry">
-        <return-type type="void"/>
-        <parameters>
-          <parameter name="thickness" type="int*"/>
-          <parameter name="position" type="int*"/>
-        </parameters>
-      </method>
-      <method name="_read_line" symbol="pango_read_line">
-        <return-type type="gint"/>
-        <parameters>
-          <parameter name="stream" type="FILE*"/>
-          <parameter name="str" type="GString*"/>
-        </parameters>
-      </method>
-      <method name="_reorder_items" symbol="pango_reorder_items">
-        <return-type type="GList*"/>
-        <parameters>
-          <parameter name="logical_items" type="GList*"/>
-        </parameters>
-      </method>
-      <method name="_scan_int" symbol="pango_scan_int">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter name="pos" type="const-char**"/>
-          <parameter name="out" type="int*"/>
-        </parameters>
-      </method>
-      <method name="_scan_string" symbol="pango_scan_string">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter name="pos" type="const-char**"/>
-          <parameter name="out" type="GString*"/>
-        </parameters>
-      </method>
-      <method name="_scan_word" symbol="pango_scan_word">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter name="pos" type="const-char**"/>
-          <parameter name="out" type="GString*"/>
-        </parameters>
-      </method>
-      <method name="_script_for_unichar" symbol="pango_script_for_unichar">
-        <return-type type="PangoScript"/>
-        <parameters>
-          <parameter name="ch" type="gunichar"/>
-        </parameters>
-      </method>
-      <method name="_script_get_sample_language" symbol="pango_script_get_sample_language">
-        <return-type type="PangoLanguage*"/>
-        <parameters>
-          <parameter name="script" type="PangoScript"/>
-        </parameters>
-      </method>
-      <method name="_skip_space" symbol="pango_skip_space">
-        <return-type type="gboolean"/>
-        <parameters>
-          <parameter name="pos" type="const-char**"/>
-        </parameters>
-      </method>
-      <method name="_split_file_list" symbol="pango_split_file_list">
-        <return-type type="char**"/>
-        <parameters>
-          <parameter name="str" type="const-char*"/>
-        </parameters>
-      </method>
-      <method name="_trim_string" symbol="pango_trim_string">
-        <return-type type="char*"/>
-        <parameters>
-          <parameter name="str" type="const-char*"/>
-        </parameters>
-      </method>
-      <method name="_unichar_direction" symbol="pango_unichar_direction">
-        <return-type type="PangoDirection"/>
-        <parameters>
-          <parameter name="ch" type="gunichar"/>
-        </parameters>
-      </method>
-    </struct>
+    <function name="find_base_dir" symbol="pango_find_base_dir">
+      <return-type type="PangoDirection"/>
+      <parameters>
+        <parameter name="text" type="const-gchar*"/>
+        <parameter name="length" type="gint"/>
+      </parameters>
+    </function>
+    <function name="find_paragraph_boundary" symbol="pango_find_paragraph_boundary">
+      <return-type type="void"/>
+      <parameters>
+        <parameter name="text" type="const-gchar*"/>
+        <parameter name="length" type="gint"/>
+        <parameter name="paragraph_delimiter_index" type="gint*"/>
+        <parameter name="next_paragraph_start" type="gint*"/>
+      </parameters>
+    </function>
+    <function name="get_log_attrs" symbol="pango_get_log_attrs">
+      <return-type type="void"/>
+      <parameters>
+        <parameter name="text" type="const-char*"/>
+        <parameter name="length" type="int"/>
+        <parameter name="level" type="int"/>
+        <parameter name="language" type="PangoLanguage*"/>
+        <parameter name="log_attrs" type="PangoLogAttr*"/>
+        <parameter name="attrs_len" type="int"/>
+      </parameters>
+    </function>
+    <function deprecated="1" name="get_mirror_char" symbol="pango_get_mirror_char">
+      <return-type type="gboolean"/>
+      <parameters>
+        <parameter name="ch" type="gunichar"/>
+        <parameter name="mirrored_ch" type="gunichar*"/>
+      </parameters>
+    </function>
+    <function name="is_zero_width" symbol="pango_is_zero_width">
+      <return-type type="gboolean"/>
+      <parameters>
+        <parameter name="ch" type="gunichar"/>
+      </parameters>
+    </function>
+    <function name="itemize_with_base_dir" symbol="pango_itemize_with_base_dir">
+      <return-type type="GList*"/>
+      <parameters>
+        <parameter name="context" type="PangoContext*"/>
+        <parameter name="base_dir" type="PangoDirection"/>
+        <parameter name="text" type="const-char*"/>
+        <parameter name="start_index" type="int"/>
+        <parameter name="length" type="int"/>
+        <parameter name="attrs" type="PangoAttrList*"/>
+        <parameter name="cached_iter" type="PangoAttrIterator*"/>
+      </parameters>
+    </function>
+    <function name="parse_markup" symbol="pango_parse_markup">
+      <return-type type="gboolean"/>
+      <parameters>
+        <parameter name="markup_text" type="const-char*"/>
+        <parameter name="length" type="int"/>
+        <parameter name="accel_marker" type="gunichar"/>
+        <parameter name="attr_list" type="PangoAttrList**"/>
+        <parameter name="text" type="char**"/>
+        <parameter name="accel_char" type="gunichar*"/>
+        <parameter name="error" type="GError**"/>
+      </parameters>
+    </function>
+    <function name="parse_stretch" symbol="pango_parse_stretch">
+      <return-type type="gboolean"/>
+      <parameters>
+        <parameter name="str" type="const-char*"/>
+        <parameter name="stretch" type="PangoStretch*"/>
+        <parameter name="warn" type="gboolean"/>
+      </parameters>
+    </function>
+    <function name="parse_style" symbol="pango_parse_style">
+      <return-type type="gboolean"/>
+      <parameters>
+        <parameter name="str" type="const-char*"/>
+        <parameter name="style" type="PangoStyle*"/>
+        <parameter name="warn" type="gboolean"/>
+      </parameters>
+    </function>
+    <function name="parse_variant" symbol="pango_parse_variant">
+      <return-type type="gboolean"/>
+      <parameters>
+        <parameter name="str" type="const-char*"/>
+        <parameter name="variant" type="PangoVariant*"/>
+        <parameter name="warn" type="gboolean"/>
+      </parameters>
+    </function>
+    <function name="parse_weight" symbol="pango_parse_weight">
+      <return-type type="gboolean"/>
+      <parameters>
+        <parameter name="str" type="const-char*"/>
+        <parameter name="weight" type="PangoWeight*"/>
+        <parameter name="warn" type="gboolean"/>
+      </parameters>
+    </function>
+    <function name="quantize_line_geometry" symbol="pango_quantize_line_geometry">
+      <return-type type="void"/>
+      <parameters>
+        <parameter name="thickness" type="int*"/>
+        <parameter name="position" type="int*"/>
+      </parameters>
+    </function>
+    <function name="read_line" symbol="pango_read_line">
+      <return-type type="gint"/>
+      <parameters>
+        <parameter name="stream" type="FILE*"/>
+        <parameter name="str" type="GString*"/>
+      </parameters>
+    </function>
+    <function name="reorder_items" symbol="pango_reorder_items">
+      <return-type type="GList*"/>
+      <parameters>
+        <parameter name="logical_items" type="GList*"/>
+      </parameters>
+    </function>
+    <function name="scan_int" symbol="pango_scan_int">
+      <return-type type="gboolean"/>
+      <parameters>
+        <parameter name="pos" type="const-char**"/>
+        <parameter name="out" type="int*"/>
+      </parameters>
+    </function>
+    <function name="scan_string" symbol="pango_scan_string">
+      <return-type type="gboolean"/>
+      <parameters>
+        <parameter name="pos" type="const-char**"/>
+        <parameter name="out" type="GString*"/>
+      </parameters>
+    </function>
+    <function name="scan_word" symbol="pango_scan_word">
+      <return-type type="gboolean"/>
+      <parameters>
+        <parameter name="pos" type="const-char**"/>
+        <parameter name="out" type="GString*"/>
+      </parameters>
+    </function>
+    <function name="script_for_unichar" symbol="pango_script_for_unichar">
+      <return-type type="PangoScript"/>
+      <parameters>
+        <parameter name="ch" type="gunichar"/>
+      </parameters>
+    </function>
+    <function name="script_get_sample_language" symbol="pango_script_get_sample_language">
+      <return-type type="PangoLanguage*"/>
+      <parameters>
+        <parameter name="script" type="PangoScript"/>
+      </parameters>
+    </function>
+    <function name="skip_space" symbol="pango_skip_space">
+      <return-type type="gboolean"/>
+      <parameters>
+        <parameter name="pos" type="const-char**"/>
+      </parameters>
+    </function>
+    <function name="split_file_list" symbol="pango_split_file_list">
+      <return-type type="char**"/>
+      <parameters>
+        <parameter name="str" type="const-char*"/>
+      </parameters>
+    </function>
+    <function name="trim_string" symbol="pango_trim_string">
+      <return-type type="char*"/>
+      <parameters>
+        <parameter name="str" type="const-char*"/>
+      </parameters>
+    </function>
+    <function name="unichar_direction" symbol="pango_unichar_direction">
+      <return-type type="PangoDirection"/>
+      <parameters>
+        <parameter name="ch" type="gunichar"/>
+      </parameters>
+    </function>
   </namespace>
 </api>

diff --git a/vapigen/vapigen/valagidlparser.vala b/vapigen/vapigen/valagidlparser.vala
index 0635245..b0f941f 100644 (file)
--- a/vapigen/vapigen/valagidlparser.vala
+++ b/vapigen/vapigen/valagidlparser.vala
@@ -145,6 +145,12 @@ public class Vala.GIdlParser : CodeVisitor {
                                        c.name = c.name.offset (module.name.len () + 1);
                                }
                                ns.add_constant (c);
+                       } else if (node.type == IdlNodeTypeId.FUNCTION) {
+                               var m = parse_function ((IdlNodeFunction) node);
+                               if (m != null) {
+                                       m.instance = false;
+                                       ns.add_method (m);
+                               }
                        }
                }