From: Evan Nemerson <evan@coeus-group.com>
Date: Sun, 14 Mar 2010 04:12:03 +0000 (-0800)
Subject: libgnomeui-2.0: Update to 2.24.2.
X-Git-Tag: 0.8.0~175
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f00ea151341c3b7a481ed512e124349990fa8c15;p=thirdparty%2Fvala.git

libgnomeui-2.0: Update to 2.24.2.
---

diff --git a/vapi/libgnomeui-2.0.vapi b/vapi/libgnomeui-2.0.vapi
index 788397dfb..ea8c1c5d4 100644
--- a/vapi/libgnomeui-2.0.vapi
+++ b/vapi/libgnomeui-2.0.vapi
@@ -3,7 +3,7 @@
 [CCode (cprefix = "Gnome", lower_case_cprefix = "gnome_")]
 namespace Gnome {
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
-	public class App : Gtk.Window, Atk.Implementor, Gtk.Buildable {
+	public class App : Gtk.Window, Gtk.Buildable, Atk.Implementor {
 		public weak Gtk.AccelGroup accel_group;
 		public weak Gtk.Widget contents;
 		public weak Gtk.Widget dock;
@@ -51,7 +51,7 @@ namespace Gnome {
 		public string app_id { owned get; set construct; }
 	}
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
-	public class AppBar : Gtk.HBox, Atk.Implementor, Gtk.Buildable {
+	public class AppBar : Gtk.HBox, Gtk.Buildable, Gtk.Orientable, Atk.Implementor {
 		[CCode (cname = "gnome_appbar_new", type = "GtkWidget*", has_construct_function = false)]
 		public AppBar (bool has_progress, bool has_status, Gnome.PreferencesType interactivity);
 		[CCode (cname = "gnome_appbar_clear_stack")]
@@ -163,7 +163,7 @@ namespace Gnome {
 		public virtual signal void shutdown_cancelled ();
 	}
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
-	public class DateEdit : Gtk.HBox, Atk.Implementor, Gtk.Buildable {
+	public class DateEdit : Gtk.HBox, Gtk.Buildable, Gtk.Orientable, Atk.Implementor {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public DateEdit (ulong the_time, bool show_time, bool use_24_format);
 		public void @construct (ulong the_time, Gnome.DateEditFlags flags);
@@ -192,7 +192,7 @@ namespace Gnome {
 	public class GdkPixbufAsyncHandle {
 	}
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
-	public class IconEntry : Gtk.VBox, Atk.Implementor, Gtk.Buildable {
+	public class IconEntry : Gtk.VBox, Gtk.Buildable, Gtk.Orientable, Atk.Implementor {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public IconEntry (string history_id, string browse_dialog_title);
 		public void @construct (string history_id, string browse_dialog_title);
@@ -221,7 +221,7 @@ namespace Gnome {
 		public virtual signal void changed ();
 	}
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
-	public class IconSelection : Gtk.VBox, Atk.Implementor, Gtk.Buildable {
+	public class IconSelection : Gtk.VBox, Gtk.Buildable, Gtk.Orientable, Atk.Implementor {
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public IconSelection ();
 		public void add_defaults ();
@@ -235,7 +235,7 @@ namespace Gnome {
 		public void stop_loading ();
 	}
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
-	public class PasswordDialog : Gtk.Dialog, Atk.Implementor, Gtk.Buildable {
+	public class PasswordDialog : Gtk.Dialog, Gtk.Buildable, Atk.Implementor {
 		public weak Gnome.PasswordDialogDetails details;
 		[CCode (type = "GtkWidget*", has_construct_function = false)]
 		public PasswordDialog (string dialog_title, string message, string username, string password, bool readonly_username);
@@ -331,14 +331,14 @@ namespace Gnome {
 		public void* user_data;
 		public weak Gtk.Widget widget;
 	}
-	[CCode (cprefix = "GNOME_CLIENT_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
+	[CCode (cprefix = "GNOME_CLIENT_", cheader_filename = "libgnomeui/libgnomeui.h")]
 	[Flags]
 	public enum ClientFlags {
 		IS_CONNECTED,
 		RESTARTED,
 		RESTORED
 	}
-	[CCode (cprefix = "GNOME_CLIENT_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
+	[CCode (cprefix = "GNOME_CLIENT_", cheader_filename = "libgnomeui/libgnomeui.h")]
 	public enum ClientState {
 		IDLE,
 		SAVING_PHASE_1,
@@ -348,7 +348,7 @@ namespace Gnome {
 		DISCONNECTED,
 		REGISTERING
 	}
-	[CCode (cprefix = "GNOME_DATE_EDIT_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
+	[CCode (cprefix = "GNOME_DATE_EDIT_", cheader_filename = "libgnomeui/libgnomeui.h")]
 	[Flags]
 	public enum DateEditFlags {
 		SHOW_TIME,
@@ -356,32 +356,32 @@ namespace Gnome {
 		WEEK_STARTS_ON_MONDAY,
 		DISPLAY_SECONDS
 	}
-	[CCode (cprefix = "GNOME_DIALOG_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
+	[CCode (cprefix = "GNOME_DIALOG_", cheader_filename = "libgnomeui/libgnomeui.h")]
 	public enum DialogType {
 		ERROR,
 		NORMAL
 	}
-	[CCode (cprefix = "GNOME_EDGE_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
+	[CCode (cprefix = "GNOME_EDGE_", cheader_filename = "libgnomeui/libgnomeui.h")]
 	public enum EdgePosition {
 		START,
 		FINISH,
 		OTHER,
 		LAST
 	}
-	[CCode (cprefix = "GNOME_FONT_PICKER_MODE_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
+	[CCode (cprefix = "GNOME_FONT_PICKER_MODE_", cheader_filename = "libgnomeui/libgnomeui.h")]
 	public enum FontPickerMode {
 		PIXMAP,
 		FONT_INFO,
 		USER_WIDGET,
 		UNKNOWN
 	}
-	[CCode (cprefix = "GNOME_ICON_LIST_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
+	[CCode (cprefix = "GNOME_ICON_LIST_", cheader_filename = "libgnomeui/libgnomeui.h")]
 	public enum IconListMode {
 		ICONS,
 		TEXT_BELOW,
 		TEXT_RIGHT
 	}
-	[CCode (cprefix = "GNOME_ICON_LOOKUP_FLAGS_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
+	[CCode (cprefix = "GNOME_ICON_LOOKUP_FLAGS_", cheader_filename = "libgnomeui/libgnomeui.h")]
 	[Flags]
 	public enum IconLookupFlags {
 		NONE,
@@ -389,56 +389,56 @@ namespace Gnome {
 		SHOW_SMALL_IMAGES_AS_THEMSELVES,
 		ALLOW_SVG_AS_THEMSELVES
 	}
-	[CCode (cprefix = "GNOME_ICON_LOOKUP_RESULT_FLAGS_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
+	[CCode (cprefix = "GNOME_ICON_LOOKUP_RESULT_FLAGS_", cheader_filename = "libgnomeui/libgnomeui.h")]
 	[Flags]
 	public enum IconLookupResultFlags {
 		NONE,
 		THUMBNAIL
 	}
-	[CCode (cprefix = "GNOME_INTERACT_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
+	[CCode (cprefix = "GNOME_INTERACT_", cheader_filename = "libgnomeui/libgnomeui.h")]
 	public enum InteractStyle {
 		NONE,
 		ERRORS,
 		ANY
 	}
-	[CCode (cprefix = "GNOME_MDI_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
+	[CCode (cprefix = "GNOME_MDI_", cheader_filename = "libgnomeui/libgnomeui.h")]
 	public enum MDIMode {
 		NOTEBOOK,
 		TOPLEVEL,
 		MODAL,
 		DEFAULT_MODE
 	}
-	[CCode (cprefix = "GNOME_PASSWORD_DIALOG_REMEMBER_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
+	[CCode (cprefix = "GNOME_PASSWORD_DIALOG_REMEMBER_", cheader_filename = "libgnomeui/libgnomeui.h")]
 	public enum PasswordDialogRemember {
 		NOTHING,
 		SESSION,
 		FOREVER
 	}
-	[CCode (cprefix = "GNOME_PREFERENCES_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
+	[CCode (cprefix = "GNOME_PREFERENCES_", cheader_filename = "libgnomeui/libgnomeui.h")]
 	public enum PreferencesType {
 		NEVER,
 		USER,
 		ALWAYS
 	}
-	[CCode (cprefix = "GNOME_RESTART_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
+	[CCode (cprefix = "GNOME_RESTART_", cheader_filename = "libgnomeui/libgnomeui.h")]
 	public enum RestartStyle {
 		IF_RUNNING,
 		ANYWAY,
 		IMMEDIATELY,
 		NEVER
 	}
-	[CCode (cprefix = "GNOME_SAVE_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
+	[CCode (cprefix = "GNOME_SAVE_", cheader_filename = "libgnomeui/libgnomeui.h")]
 	public enum SaveStyle {
 		GLOBAL,
 		LOCAL,
 		BOTH
 	}
-	[CCode (cprefix = "GNOME_THUMBNAIL_SIZE_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
+	[CCode (cprefix = "GNOME_THUMBNAIL_SIZE_", cheader_filename = "libgnomeui/libgnomeui.h")]
 	public enum ThumbnailSize {
 		NORMAL,
 		LARGE
 	}
-	[CCode (cprefix = "GNOME_APP_CONFIGURABLE_ITEM_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
+	[CCode (cprefix = "GNOME_APP_CONFIGURABLE_ITEM_", cheader_filename = "libgnomeui/libgnomeui.h")]
 	public enum UIInfoConfigurableTypes {
 		NEW,
 		OPEN,
@@ -473,7 +473,7 @@ namespace Gnome {
 		SCORES,
 		END_GAME
 	}
-	[CCode (cprefix = "GNOME_APP_UI_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
+	[CCode (cprefix = "GNOME_APP_UI_", cheader_filename = "libgnomeui/libgnomeui.h")]
 	public enum UIInfoType {
 		ENDOFINFO,
 		ITEM,
@@ -487,7 +487,7 @@ namespace Gnome {
 		SUBTREE_STOCK,
 		INCLUDE
 	}
-	[CCode (cprefix = "GNOME_APP_PIXMAP_", has_type_id = "0", cheader_filename = "libgnomeui/libgnomeui.h")]
+	[CCode (cprefix = "GNOME_APP_PIXMAP_", cheader_filename = "libgnomeui/libgnomeui.h")]
 	public enum UIPixmapType {
 		NONE,
 		STOCK,
@@ -508,8 +508,6 @@ namespace Gnome {
 	public delegate void StringCallback (string str);
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h", has_target = false)]
 	public delegate void UISignalConnectFunc (Gnome.UIInfo uiinfo, string signal_name, Gnome.UIBuilderData uibdata);
-	[CCode (cname = "LIBGNOMEUI_MODULE", cheader_filename = "libgnomeui/libgnomeui.h")]
-	public static Gnome.ModuleInfo libgnomeui_module;
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
 	public const string APP_MENUBAR_NAME;
 	[CCode (cheader_filename = "libgnomeui/libgnomeui.h")]
diff --git a/vapi/packages/libgnomeui-2.0/libgnomeui-2.0.gi b/vapi/packages/libgnomeui-2.0/libgnomeui-2.0.gi
index 93d4fdcd3..34f63ccf5 100644
--- a/vapi/packages/libgnomeui-2.0/libgnomeui-2.0.gi
+++ b/vapi/packages/libgnomeui-2.0/libgnomeui-2.0.gi
@@ -232,7 +232,7 @@
 			<field name="data" type="gpointer"/>
 			<field name="is_interp" type="gboolean"/>
 			<field name="relay_func" type="GtkCallbackMarshal"/>
-			<field name="destroy_func" type="GtkDestroyNotify"/>
+			<field name="destroy_func" type="GDestroyNotify"/>
 		</struct>
 		<struct name="GnomeUIInfo">
 			<field name="type" type="GnomeUIInfoType"/>
@@ -247,7 +247,7 @@
 			<field name="ac_mods" type="GdkModifierType"/>
 			<field name="widget" type="GtkWidget*"/>
 		</struct>
-		<enum name="GnomeClientState">
+		<enum name="GnomeClientState" type-name="GnomeClientState" get-type="gnome_client_state_get_type">
 			<member name="GNOME_CLIENT_IDLE" value="0"/>
 			<member name="GNOME_CLIENT_SAVING_PHASE_1" value="1"/>
 			<member name="GNOME_CLIENT_WAITING_FOR_PHASE_2" value="2"/>
@@ -256,64 +256,64 @@
 			<member name="GNOME_CLIENT_DISCONNECTED" value="5"/>
 			<member name="GNOME_CLIENT_REGISTERING" value="6"/>
 		</enum>
-		<enum name="GnomeDialogType">
+		<enum name="GnomeDialogType" type-name="GnomeDialogType" get-type="gnome_dialog_type_get_type">
 			<member name="GNOME_DIALOG_ERROR" value="0"/>
 			<member name="GNOME_DIALOG_NORMAL" value="1"/>
 		</enum>
-		<enum name="GnomeEdgePosition">
+		<enum name="GnomeEdgePosition" type-name="GnomeEdgePosition" get-type="gnome_edge_position_get_type">
 			<member name="GNOME_EDGE_START" value="0"/>
 			<member name="GNOME_EDGE_FINISH" value="1"/>
 			<member name="GNOME_EDGE_OTHER" value="2"/>
 			<member name="GNOME_EDGE_LAST" value="3"/>
 		</enum>
-		<enum name="GnomeFontPickerMode">
+		<enum name="GnomeFontPickerMode" type-name="GnomeFontPickerMode" get-type="gnome_font_picker_mode_get_type">
 			<member name="GNOME_FONT_PICKER_MODE_PIXMAP" value="0"/>
 			<member name="GNOME_FONT_PICKER_MODE_FONT_INFO" value="1"/>
 			<member name="GNOME_FONT_PICKER_MODE_USER_WIDGET" value="2"/>
 			<member name="GNOME_FONT_PICKER_MODE_UNKNOWN" value="3"/>
 		</enum>
-		<enum name="GnomeIconListMode">
+		<enum name="GnomeIconListMode" type-name="GnomeIconListMode" get-type="gnome_icon_list_mode_get_type">
 			<member name="GNOME_ICON_LIST_ICONS" value="0"/>
 			<member name="GNOME_ICON_LIST_TEXT_BELOW" value="1"/>
 			<member name="GNOME_ICON_LIST_TEXT_RIGHT" value="2"/>
 		</enum>
-		<enum name="GnomeInteractStyle">
+		<enum name="GnomeInteractStyle" type-name="GnomeInteractStyle" get-type="gnome_interact_style_get_type">
 			<member name="GNOME_INTERACT_NONE" value="0"/>
 			<member name="GNOME_INTERACT_ERRORS" value="1"/>
 			<member name="GNOME_INTERACT_ANY" value="2"/>
 		</enum>
-		<enum name="GnomeMDIMode">
+		<enum name="GnomeMDIMode" type-name="GnomeMDIMode" get-type="gnome_mdi_mode_get_type">
 			<member name="GNOME_MDI_NOTEBOOK" value="0"/>
 			<member name="GNOME_MDI_TOPLEVEL" value="1"/>
 			<member name="GNOME_MDI_MODAL" value="2"/>
 			<member name="GNOME_MDI_DEFAULT_MODE" value="42"/>
 		</enum>
-		<enum name="GnomePasswordDialogRemember">
+		<enum name="GnomePasswordDialogRemember" type-name="GnomePasswordDialogRemember" get-type="gnome_password_dialog_remember_get_type">
 			<member name="GNOME_PASSWORD_DIALOG_REMEMBER_NOTHING" value="0"/>
 			<member name="GNOME_PASSWORD_DIALOG_REMEMBER_SESSION" value="1"/>
 			<member name="GNOME_PASSWORD_DIALOG_REMEMBER_FOREVER" value="2"/>
 		</enum>
-		<enum name="GnomePreferencesType">
+		<enum name="GnomePreferencesType" type-name="GnomePreferencesType" get-type="gnome_preferences_type_get_type">
 			<member name="GNOME_PREFERENCES_NEVER" value="0"/>
 			<member name="GNOME_PREFERENCES_USER" value="1"/>
 			<member name="GNOME_PREFERENCES_ALWAYS" value="2"/>
 		</enum>
-		<enum name="GnomeRestartStyle">
+		<enum name="GnomeRestartStyle" type-name="GnomeRestartStyle" get-type="gnome_restart_style_get_type">
 			<member name="GNOME_RESTART_IF_RUNNING" value="0"/>
 			<member name="GNOME_RESTART_ANYWAY" value="1"/>
 			<member name="GNOME_RESTART_IMMEDIATELY" value="2"/>
 			<member name="GNOME_RESTART_NEVER" value="3"/>
 		</enum>
-		<enum name="GnomeSaveStyle">
+		<enum name="GnomeSaveStyle" type-name="GnomeSaveStyle" get-type="gnome_save_style_get_type">
 			<member name="GNOME_SAVE_GLOBAL" value="0"/>
 			<member name="GNOME_SAVE_LOCAL" value="1"/>
 			<member name="GNOME_SAVE_BOTH" value="2"/>
 		</enum>
-		<enum name="GnomeThumbnailSize">
+		<enum name="GnomeThumbnailSize" type-name="GnomeThumbnailSize" get-type="gnome_thumbnail_size_get_type">
 			<member name="GNOME_THUMBNAIL_SIZE_NORMAL" value="0"/>
 			<member name="GNOME_THUMBNAIL_SIZE_LARGE" value="1"/>
 		</enum>
-		<enum name="GnomeUIInfoConfigurableTypes">
+		<enum name="GnomeUIInfoConfigurableTypes" type-name="GnomeUIInfoConfigurableTypes" get-type="gnome_ui_info_configurable_types_get_type">
 			<member name="GNOME_APP_CONFIGURABLE_ITEM_NEW" value="0"/>
 			<member name="GNOME_APP_CONFIGURABLE_ITEM_OPEN" value="1"/>
 			<member name="GNOME_APP_CONFIGURABLE_ITEM_SAVE" value="2"/>
@@ -347,7 +347,7 @@
 			<member name="GNOME_APP_CONFIGURABLE_ITEM_SCORES" value="30"/>
 			<member name="GNOME_APP_CONFIGURABLE_ITEM_END_GAME" value="31"/>
 		</enum>
-		<enum name="GnomeUIInfoType">
+		<enum name="GnomeUIInfoType" type-name="GnomeUIInfoType" get-type="gnome_ui_info_type_get_type">
 			<member name="GNOME_APP_UI_ENDOFINFO" value="0"/>
 			<member name="GNOME_APP_UI_ITEM" value="1"/>
 			<member name="GNOME_APP_UI_TOGGLEITEM" value="2"/>
@@ -360,37 +360,37 @@
 			<member name="GNOME_APP_UI_SUBTREE_STOCK" value="9"/>
 			<member name="GNOME_APP_UI_INCLUDE" value="10"/>
 		</enum>
-		<enum name="GnomeUIPixmapType">
+		<enum name="GnomeUIPixmapType" type-name="GnomeUIPixmapType" get-type="gnome_ui_pixmap_type_get_type">
 			<member name="GNOME_APP_PIXMAP_NONE" value="0"/>
 			<member name="GNOME_APP_PIXMAP_STOCK" value="1"/>
 			<member name="GNOME_APP_PIXMAP_DATA" value="2"/>
 			<member name="GNOME_APP_PIXMAP_FILENAME" value="3"/>
 		</enum>
-		<flags name="GnomeClientFlags">
+		<flags name="GnomeClientFlags" type-name="GnomeClientFlags" get-type="gnome_client_flags_get_type">
 			<member name="GNOME_CLIENT_IS_CONNECTED" value="1"/>
 			<member name="GNOME_CLIENT_RESTARTED" value="2"/>
 			<member name="GNOME_CLIENT_RESTORED" value="4"/>
 		</flags>
-		<flags name="GnomeDateEditFlags">
+		<flags name="GnomeDateEditFlags" type-name="GnomeDateEditFlags" get-type="gnome_date_edit_flags_get_type">
 			<member name="GNOME_DATE_EDIT_SHOW_TIME" value="1"/>
 			<member name="GNOME_DATE_EDIT_24_HR" value="2"/>
 			<member name="GNOME_DATE_EDIT_WEEK_STARTS_ON_MONDAY" value="4"/>
 			<member name="GNOME_DATE_EDIT_DISPLAY_SECONDS" value="8"/>
 		</flags>
-		<flags name="GnomeIconLookupFlags">
+		<flags name="GnomeIconLookupFlags" type-name="GnomeIconLookupFlags" get-type="gnome_icon_lookup_flags_get_type">
 			<member name="GNOME_ICON_LOOKUP_FLAGS_NONE" value="0"/>
 			<member name="GNOME_ICON_LOOKUP_FLAGS_EMBEDDING_TEXT" value="1"/>
 			<member name="GNOME_ICON_LOOKUP_FLAGS_SHOW_SMALL_IMAGES_AS_THEMSELVES" value="2"/>
 			<member name="GNOME_ICON_LOOKUP_FLAGS_ALLOW_SVG_AS_THEMSELVES" value="4"/>
 		</flags>
-		<flags name="GnomeIconLookupResultFlags">
+		<flags name="GnomeIconLookupResultFlags" type-name="GnomeIconLookupResultFlags" get-type="gnome_icon_lookup_result_flags_get_type">
 			<member name="GNOME_ICON_LOOKUP_RESULT_FLAGS_NONE" value="0"/>
 			<member name="GNOME_ICON_LOOKUP_RESULT_FLAGS_THUMBNAIL" value="1"/>
 		</flags>
 		<object name="GnomeApp" parent="GtkWindow" type-name="GnomeApp" get-type="gnome_app_get_type">
 			<implements>
-				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
+				<interface name="AtkImplementor"/>
 			</implements>
 			<method name="add_dock_item" symbol="gnome_app_add_dock_item">
 				<return-type type="void"/>
@@ -459,7 +459,7 @@
 					<parameter name="uiinfo" type="GnomeUIInfo*"/>
 					<parameter name="relay_func" type="GtkCallbackMarshal"/>
 					<parameter name="data" type="gpointer"/>
-					<parameter name="destroy_func" type="GtkDestroyNotify"/>
+					<parameter name="destroy_func" type="GDestroyNotify"/>
 				</parameters>
 			</method>
 			<method name="create_menus_with_data" symbol="gnome_app_create_menus_with_data">
@@ -492,7 +492,7 @@
 					<parameter name="uiinfo" type="GnomeUIInfo*"/>
 					<parameter name="relay_func" type="GtkCallbackMarshal"/>
 					<parameter name="data" type="gpointer"/>
-					<parameter name="destroy_func" type="GtkDestroyNotify"/>
+					<parameter name="destroy_func" type="GDestroyNotify"/>
 				</parameters>
 			</method>
 			<method name="create_toolbar_with_data" symbol="gnome_app_create_toolbar_with_data">
@@ -620,7 +620,7 @@
 					<parameter name="menuinfo" type="GnomeUIInfo*"/>
 					<parameter name="relay_func" type="GtkCallbackMarshal"/>
 					<parameter name="data" type="gpointer"/>
-					<parameter name="destroy_func" type="GtkDestroyNotify"/>
+					<parameter name="destroy_func" type="GDestroyNotify"/>
 				</parameters>
 			</method>
 			<method name="insert_menus_with_data" symbol="gnome_app_insert_menus_with_data">
@@ -740,8 +740,9 @@
 		</object>
 		<object name="GnomeAppBar" parent="GtkHBox" type-name="GnomeAppBar" get-type="gnome_appbar_get_type">
 			<implements>
-				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
+				<interface name="GtkOrientable"/>
+				<interface name="AtkImplementor"/>
 			</implements>
 			<method name="clear_prompt" symbol="gnome_appbar_clear_prompt">
 				<return-type type="void"/>
@@ -931,7 +932,7 @@
 					<parameter name="dialog_type" type="GnomeDialogType"/>
 					<parameter name="function" type="GtkCallbackMarshal"/>
 					<parameter name="data" type="gpointer"/>
-					<parameter name="destroy" type="GtkDestroyNotify"/>
+					<parameter name="destroy" type="GDestroyNotify"/>
 				</parameters>
 			</method>
 			<method name="request_phase_2" symbol="gnome_client_request_phase_2">
@@ -1142,8 +1143,9 @@
 		</object>
 		<object name="GnomeDateEdit" parent="GtkHBox" type-name="GnomeDateEdit" get-type="gnome_date_edit_get_type">
 			<implements>
-				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
+				<interface name="GtkOrientable"/>
+				<interface name="AtkImplementor"/>
 			</implements>
 			<method name="construct" symbol="gnome_date_edit_construct">
 				<return-type type="void"/>
@@ -1228,8 +1230,9 @@
 		</object>
 		<object name="GnomeIconEntry" parent="GtkVBox" type-name="GnomeIconEntry" get-type="gnome_icon_entry_get_type">
 			<implements>
-				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
+				<interface name="GtkOrientable"/>
+				<interface name="AtkImplementor"/>
 			</implements>
 			<method name="construct" symbol="gnome_icon_entry_construct">
 				<return-type type="void"/>
@@ -1338,8 +1341,9 @@
 		</object>
 		<object name="GnomeIconSelection" parent="GtkVBox" type-name="GnomeIconSelection" get-type="gnome_icon_selection_get_type">
 			<implements>
-				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
+				<interface name="GtkOrientable"/>
+				<interface name="AtkImplementor"/>
 			</implements>
 			<method name="add_defaults" symbol="gnome_icon_selection_add_defaults">
 				<return-type type="void"/>
@@ -1405,8 +1409,8 @@
 		</object>
 		<object name="GnomePasswordDialog" parent="GtkDialog" type-name="GnomePasswordDialog" get-type="gnome_password_dialog_get_type">
 			<implements>
-				<interface name="AtkImplementor"/>
 				<interface name="GtkBuildable"/>
+				<interface name="AtkImplementor"/>
 			</implements>
 			<method name="anon_selected" symbol="gnome_password_dialog_anon_selected">
 				<return-type type="gboolean"/>
diff --git a/vapi/packages/libgnomeui-2.0/libgnomeui-2.0.metadata b/vapi/packages/libgnomeui-2.0/libgnomeui-2.0.metadata
index 13fd25c31..61429c105 100644
--- a/vapi/packages/libgnomeui-2.0/libgnomeui-2.0.metadata
+++ b/vapi/packages/libgnomeui-2.0/libgnomeui-2.0.metadata
@@ -29,4 +29,3 @@ GnomeMDI::add_child has_emitter="1"
 GnomeMDI::add_view has_emitter="1"
 GnomeMDI::remove_child has_emitter="1"
 GnomeMDI::remove_view has_emitter="1"
-GtkDestroyNotify namespace="GLib" name="DestroyNotify"