[Gtk-sharp-list] GtkMozEmbed# update

John Luke jluke@users.sourceforge.net
Mon, 01 Dec 2003 16:03:49 -0500


--=-FfK7AuEBC/OosoH2dPX2
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

Hello,
	I attempted to send this to Mark directly, but he doesn't seem to be
around right now or I used the wrong address.  Anyways, the attached
patch updates gtkmozembed# to work with current gtk#.  I had to comment
out Single.custom to get it to work for now.

Anyone know if I should commit this or wait for Mark to ok it?

--=-FfK7AuEBC/OosoH2dPX2
Content-Disposition: attachment; filename=update.diff
Content-Type: text/x-patch; name=update.diff; charset=
Content-Transfer-Encoding: 7bit

? api.diff
? libtool
? update.diff
? doc/gtkmozembed-sharp-docs.tree
? doc/gtkmozembed-sharp-docs.zip
? doc/update.diff
? doc/en/GtkSharp.GtkmozembedSharp
? gtkmozembed/generated-stamp
? sources/update.diff
Index: ChangeLog
===================================================================
RCS file: /cvs/public/gtkmozembed-sharp/ChangeLog,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 ChangeLog
--- ChangeLog	3 Apr 2003 18:37:13 -0000	1.1.1.1
+++ ChangeLog	1 Dec 2003 20:49:20 -0000
@@ -0,0 +1,16 @@
+2003-11-23  John Luke  <jluke@cfl.rr.com>
+
+	* Makefile.am: remove sources from SUBDIRS
+	* autogen.sh: run configure by default
+	* configure.in: no need to output api/Makefile
+	* api/*: no longer used
+	* gtkmozembed/Single.custom: comment out signals temporarily
+	* gtkmozembed/GtkMozEmbed.metadata: add here, and port to XPath style
+	* gtkmozembed/Makefile.am: update to use gapi-fixup
+		and generate the sources
+	* gtkmozembed/gtkmozembed-api.xml: add here
+	* sources/GtkMozEmbed.metadata: remove
+	* sources/Makefile.am: run gapi-parser unconditionally
+	* sources/gtkmozembed-sharp-sources.xml: add sources file
+	* sources/gtkmozembed-sharp.sources: remove
+	
Index: Makefile.am
===================================================================
RCS file: /cvs/public/gtkmozembed-sharp/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- Makefile.am	17 Jun 2003 14:12:58 -0000	1.3
+++ Makefile.am	1 Dec 2003 20:49:20 -0000
@@ -1 +1 @@
-SUBDIRS = sources api gtkmozembed sample
+SUBDIRS = gtkmozembed sample
Index: autogen.sh
===================================================================
RCS file: /cvs/public/gtkmozembed-sharp/autogen.sh,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 autogen.sh
--- autogen.sh	3 Apr 2003 18:37:13 -0000	1.1.1.1
+++ autogen.sh	1 Dec 2003 20:49:20 -0000
@@ -6,3 +6,4 @@
 automake --add-missing --gnu
 autoconf
 
+./configure $@
Index: configure.in
===================================================================
RCS file: /cvs/public/gtkmozembed-sharp/configure.in,v
retrieving revision 1.4
diff -u -r1.4 configure.in
--- configure.in	17 Jun 2003 14:14:48 -0000	1.4
+++ configure.in	1 Dec 2003 20:49:20 -0000
@@ -76,7 +76,6 @@
 
 AC_OUTPUT([
 Makefile
-api/Makefile
 gtkmozembed/Makefile
 sample/Makefile
 sources/Makefile
Index: api/Makefile.am
===================================================================
RCS file: api/Makefile.am
diff -N api/Makefile.am
--- api/Makefile.am	3 Apr 2003 18:37:14 -0000	1.1.1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,23 +0,0 @@
-APIS = \
-	$(srcdir)/gtkmozembed-api.xml 
-                                                                                
-API_INCLUDES = \
-	$(GTKSHARP_PREFIX)/share/gapi/gdk-api.xml \
-	$(GTKSHARP_PREFIX)/share/gapi/gtk-api.xml \
-	$(GTKSHARP_PREFIX)/share/gapi/atk-api.xml
-                                                                                
-RUNTIME=mono
-                                                                                
-if USE_GAPI_CODEGEN
-                                                                                
-all: generated-stamp
-                                                                                
-generated-stamp: $(APIS)
-	$(RUNTIME) @GTKSHARP_PREFIX@/bin/gapi_codegen.exe --generate $(APIS) --include $(API_INCLUDES) && touch generated-stamp
-                                                                                
-clean:
-	rm -f generated-stamp
-                                                                                
-endif
-                                                                                
-EXTRA_DIST = $(APIS)
Index: api/gtkmozembed-api.xml
===================================================================
RCS file: api/gtkmozembed-api.xml
diff -N api/gtkmozembed-api.xml
--- api/gtkmozembed-api.xml	23 Jun 2003 16:08:24 -0000	1.5
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,360 +0,0 @@
-<?xml version="1.0"?>
-<api>
-<!--
-
-        This file was automatically generated.
-        Please DO NOT MODIFY THIS FILE, modify .metadata files instead.
-
--->
-  <namespace name="GtkMozEmbed" library="gtkembedmoz">
-    <enum name="ChromeFlags" cname="GtkMozEmbedChromeFlags" type="enum">
-      <member cname="GTK_MOZ_EMBED_FLAG_DEFAULTCHROME" name="Defaultchrome" value="1U"/>
-      <member cname="GTK_MOZ_EMBED_FLAG_WINDOWBORDERSON" name="Windowborderson" value="2U"/>
-      <member cname="GTK_MOZ_EMBED_FLAG_WINDOWCLOSEON" name="Windowcloseon" value="4U"/>
-      <member cname="GTK_MOZ_EMBED_FLAG_WINDOWRESIZEON" name="Windowresizeon" value="8U"/>
-      <member cname="GTK_MOZ_EMBED_FLAG_MENUBARON" name="Menubaron" value="16U"/>
-      <member cname="GTK_MOZ_EMBED_FLAG_TOOLBARON" name="Toolbaron" value="32U"/>
-      <member cname="GTK_MOZ_EMBED_FLAG_LOCATIONBARON" name="Locationbaron" value="64U"/>
-      <member cname="GTK_MOZ_EMBED_FLAG_STATUSBARON" name="Statusbaron" value="128U"/>
-      <member cname="GTK_MOZ_EMBED_FLAG_PERSONALTOOLBARON" name="Personaltoolbaron" value="256U"/>
-      <member cname="GTK_MOZ_EMBED_FLAG_SCROLLBARSON" name="Scrollbarson" value="512U"/>
-      <member cname="GTK_MOZ_EMBED_FLAG_TITLEBARON" name="Titlebaron" value="1024U"/>
-      <member cname="GTK_MOZ_EMBED_FLAG_EXTRACHROMEON" name="Extrachromeon" value="2048U"/>
-      <member cname="GTK_MOZ_EMBED_FLAG_ALLCHROME" name="Allchrome" value="4094U"/>
-      <member cname="GTK_MOZ_EMBED_FLAG_WINDOWRAISED" name="Windowraised" value="33554432U"/>
-      <member cname="GTK_MOZ_EMBED_FLAG_WINDOWLOWERED" name="Windowlowered" value="67108864U"/>
-      <member cname="GTK_MOZ_EMBED_FLAG_CENTERSCREEN" name="Centerscreen" value="134217728U"/>
-      <member cname="GTK_MOZ_EMBED_FLAG_DEPENDENT" name="Dependent" value="268435456U"/>
-      <member cname="GTK_MOZ_EMBED_FLAG_MODAL" name="Modal" value="536870912U"/>
-      <member cname="GTK_MOZ_EMBED_FLAG_OPENASDIALOG" name="Openasdialog" value="1073741824U"/>
-      <member cname="GTK_MOZ_EMBED_FLAG_OPENASCHROME" name="Openaschrome" value="2147483648U"/>
-    </enum>
-    <enum name="ProgressFlags" cname="GtkMozEmbedProgressFlags" type="enum">
-      <member cname="GTK_MOZ_EMBED_FLAG_START" name="Start" value="1"/>
-      <member cname="GTK_MOZ_EMBED_FLAG_REDIRECTING" name="Redirecting" value="2"/>
-      <member cname="GTK_MOZ_EMBED_FLAG_TRANSFERRING" name="Transferring" value="4"/>
-      <member cname="GTK_MOZ_EMBED_FLAG_NEGOTIATING" name="Negotiating" value="8"/>
-      <member cname="GTK_MOZ_EMBED_FLAG_STOP" name="Stop" value="16"/>
-      <member cname="GTK_MOZ_EMBED_FLAG_IS_REQUEST" name="IsRequest" value="65536"/>
-      <member cname="GTK_MOZ_EMBED_FLAG_IS_DOCUMENT" name="IsDocument" value="131072"/>
-      <member cname="GTK_MOZ_EMBED_FLAG_IS_NETWORK" name="IsNetwork" value="262144"/>
-      <member cname="GTK_MOZ_EMBED_FLAG_IS_WINDOW" name="IsWindow" value="524288"/>
-    </enum>
-    <enum name="ReloadFlags" cname="GtkMozEmbedReloadFlags" type="enum">
-      <member cname="GTK_MOZ_EMBED_FLAG_RELOADNORMAL" name="Reloadnormal"/>
-      <member cname="GTK_MOZ_EMBED_FLAG_RELOADBYPASSCACHE" name="Reloadbypasscache" value="1"/>
-      <member cname="GTK_MOZ_EMBED_FLAG_RELOADBYPASSPROXY" name="Reloadbypassproxy" value="2"/>
-      <member cname="GTK_MOZ_EMBED_FLAG_RELOADBYPASSPROXYANDCACHE" name="Reloadbypassproxyandcache" value="3"/>
-      <member cname="GTK_MOZ_EMBED_FLAG_RELOADCHARSETCHANGE" name="Reloadcharsetchange" value="4"/>
-    </enum>
-    <enum name="StatusFlags" cname="GtkMozEmbedStatusFlags" type="enum">
-      <member cname="GTK_MOZ_EMBED_STATUS_FAILED_DNS" name="Dns" value="2152398878U"/>
-      <member cname="GTK_MOZ_EMBED_STATUS_FAILED_CONNECT" name="Connect" value="2152398861U"/>
-      <member cname="GTK_MOZ_EMBED_STATUS_FAILED_TIMEOUT" name="Timeout" value="2152398862U"/>
-      <member cname="GTK_MOZ_EMBED_STATUS_FAILED_USERCANCELED" name="Usercanceled" value="2152398850U"/>
-    </enum>
-    <object name="EmbedWidget" cname="GtkMozEmbed" parent="GtkBin" disabledefaultconstructor="1">
-      <field cname="data" type="void*"/>
-      <signal name="LinkMessage" cname="link_message" when="FIRST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkMozEmbed*" name="embed"/>
-        </parameters>
-      </signal>
-      <signal name="JsStatus" cname="js_status" when="FIRST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkMozEmbed*" name="embed"/>
-        </parameters>
-      </signal>
-      <signal name="Location" cname="location" when="FIRST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkMozEmbed*" name="embed"/>
-        </parameters>
-      </signal>
-      <signal name="Title" cname="title" when="FIRST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkMozEmbed*" name="embed"/>
-        </parameters>
-      </signal>
-      <signal name="Progress" cname="progress" when="FIRST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkMozEmbed*" name="embed"/>
-          <parameter type="gint" name="curprogress"/>
-          <parameter type="gint" name="maxprogress"/>
-        </parameters>
-      </signal>
-      <signal name="ProgressAll" cname="progress_all" when="FIRST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkMozEmbed*" name="embed"/>
-          <parameter type="const-char*" name="aURI"/>
-          <parameter type="gint" name="curprogress"/>
-          <parameter type="gint" name="maxprogress"/>
-        </parameters>
-      </signal>
-      <signal name="NetState" cname="net_state" when="FIRST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkMozEmbed*" name="embed"/>
-          <parameter type="gint" name="state"/>
-          <parameter type="guint" name="status"/>
-        </parameters>
-      </signal>
-      <signal name="NetStateAll" cname="net_state_all" when="FIRST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkMozEmbed*" name="embed"/>
-          <parameter type="const-char*" name="aURI"/>
-          <parameter type="gint" name="state"/>
-          <parameter type="guint" name="status"/>
-        </parameters>
-      </signal>
-      <signal name="NetStart" cname="net_start" when="FIRST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkMozEmbed*" name="embed"/>
-        </parameters>
-      </signal>
-      <signal name="NetStop" cname="net_stop" when="FIRST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkMozEmbed*" name="embed"/>
-        </parameters>
-      </signal>
-      <signal name="NewWindow" cname="new_window" when="FIRST" hidden="1">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkMozEmbed*" name="embed"/>
-          <parameter type="GtkMozEmbed**" name="newEmbed"/>
-          <parameter type="guint" name="chromemask"/>
-        </parameters>
-      </signal>
-      <signal name="Visibility" cname="visibility" when="FIRST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkMozEmbed*" name="embed"/>
-          <parameter type="gboolean" name="visibility"/>
-        </parameters>
-      </signal>
-      <signal name="DestroyBrowser" cname="destroy_browser" when="FIRST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkMozEmbed*" name="embed"/>
-        </parameters>
-      </signal>
-      <signal name="OpenUri" cname="open_uri" when="LAST">
-        <return-type type="gint"/>
-        <parameters>
-          <parameter type="GtkMozEmbed*" name="embed"/>
-          <parameter type="const-char*" name="aURI"/>
-        </parameters>
-      </signal>
-      <signal name="SizeTo" cname="size_to" when="LAST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkMozEmbed*" name="embed"/>
-          <parameter type="gint" name="width"/>
-          <parameter type="gint" name="height"/>
-        </parameters>
-      </signal>
-      <signal name="DomKeyDown" cname="dom_key_down" when="LAST">
-        <return-type type="gint"/>
-        <parameters>
-          <parameter type="GtkMozEmbed*" name="embed"/>
-          <parameter type="gpointer" name="dom_event"/>
-        </parameters>
-      </signal>
-      <signal name="DomKeyPress" cname="dom_key_press" when="LAST">
-        <return-type type="gint"/>
-        <parameters>
-          <parameter type="GtkMozEmbed*" name="embed"/>
-          <parameter type="gpointer" name="dom_event"/>
-        </parameters>
-      </signal>
-      <signal name="DomKeyUp" cname="dom_key_up" when="LAST">
-        <return-type type="gint"/>
-        <parameters>
-          <parameter type="GtkMozEmbed*" name="embed"/>
-          <parameter type="gpointer" name="dom_event"/>
-        </parameters>
-      </signal>
-      <signal name="DomMouseDown" cname="dom_mouse_down" when="LAST">
-        <return-type type="gint"/>
-        <parameters>
-          <parameter type="GtkMozEmbed*" name="embed"/>
-          <parameter type="gpointer" name="dom_event"/>
-        </parameters>
-      </signal>
-      <signal name="DomMouseUp" cname="dom_mouse_up" when="LAST">
-        <return-type type="gint"/>
-        <parameters>
-          <parameter type="GtkMozEmbed*" name="embed"/>
-          <parameter type="gpointer" name="dom_event"/>
-        </parameters>
-      </signal>
-      <signal name="DomMouseClick" cname="dom_mouse_click" when="LAST">
-        <return-type type="gint"/>
-        <parameters>
-          <parameter type="GtkMozEmbed*" name="embed"/>
-          <parameter type="gpointer" name="dom_event"/>
-        </parameters>
-      </signal>
-      <signal name="DomMouseDblClick" cname="dom_mouse_dbl_click" when="LAST">
-        <return-type type="gint"/>
-        <parameters>
-          <parameter type="GtkMozEmbed*" name="embed"/>
-          <parameter type="gpointer" name="dom_event"/>
-        </parameters>
-      </signal>
-      <signal name="DomMouseOver" cname="dom_mouse_over" when="LAST">
-        <return-type type="gint"/>
-        <parameters>
-          <parameter type="GtkMozEmbed*" name="embed"/>
-          <parameter type="gpointer" name="dom_event"/>
-        </parameters>
-      </signal>
-      <signal name="DomMouseOut" cname="dom_mouse_out" when="LAST">
-        <return-type type="gint"/>
-        <parameters>
-          <parameter type="GtkMozEmbed*" name="embed"/>
-          <parameter type="gpointer" name="dom_event"/>
-        </parameters>
-      </signal>
-      <signal name="SecurityChange" cname="security_change" when="LAST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkMozEmbed*" name="embed"/>
-          <parameter type="gpointer" name="request"/>
-          <parameter type="guint" name="state"/>
-        </parameters>
-      </signal>
-      <signal name="StatusChange" cname="status_change" when="LAST">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkMozEmbed*" name="embed"/>
-          <parameter type="gpointer" name="request"/>
-          <parameter type="gint" name="status"/>
-          <parameter type="gpointer" name="message"/>
-        </parameters>
-      </signal>
-      <method name="AppendData" cname="gtk_moz_embed_append_data">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="const-char*" name="data"/>
-          <parameter type="guint32" name="len"/>
-        </parameters>
-      </method>
-      <method name="CanGoBack" cname="gtk_moz_embed_can_go_back">
-        <return-type type="gboolean"/>
-      </method>
-      <method name="CanGoForward" cname="gtk_moz_embed_can_go_forward">
-        <return-type type="gboolean"/>
-      </method>
-      <method name="CloseStream" cname="gtk_moz_embed_close_stream">
-        <return-type type="void"/>
-      </method>
-      <method name="GetChromeMask" cname="gtk_moz_embed_get_chrome_mask">
-        <return-type type="guint32"/>
-      </method>
-      <method name="GetGeckoJsStatus" cname="gtk_moz_embed_get_js_status">
-        <return-type type="char*"/>
-      </method>
-      <method name="GetGeckoLinkMessage" cname="gtk_moz_embed_get_link_message">
-        <return-type type="char*"/>
-      </method>
-      <method name="GetGeckoLocation" cname="gtk_moz_embed_get_location">
-        <return-type type="char*"/>
-      </method>
-      <method name="GetGeckoTitle" cname="gtk_moz_embed_get_title">
-        <return-type type="char*"/>
-      </method>
-      <method name="GetType" cname="gtk_moz_embed_get_type" shared="true">
-        <return-type type="GtkType"/>
-      </method>
-      <method name="GoBack" cname="gtk_moz_embed_go_back">
-        <return-type type="void"/>
-      </method>
-      <method name="GoForward" cname="gtk_moz_embed_go_forward">
-        <return-type type="void"/>
-      </method>
-      <method name="LoadUrl" cname="gtk_moz_embed_load_url">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="const-char*" name="url"/>
-        </parameters>
-      </method>
-      <constructor cname="gtk_moz_embed_new" hidden="1"/>
-      <method name="OpenStream" cname="gtk_moz_embed_open_stream">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="const-char*" name="base_uri"/>
-          <parameter type="const-char*" name="mime_type"/>
-        </parameters>
-      </method>
-      <method name="PopStartup" cname="gtk_moz_embed_pop_startup" shared="true">
-        <return-type type="void"/>
-      </method>
-      <method name="PushStartup" cname="gtk_moz_embed_push_startup" shared="true">
-        <return-type type="void"/>
-      </method>
-      <method name="Reload" cname="gtk_moz_embed_reload">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="gint32" name="flags"/>
-        </parameters>
-      </method>
-      <method name="RenderData" cname="gtk_moz_embed_render_data">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="const-char*" name="data"/>
-          <parameter type="guint32" name="len"/>
-          <parameter type="const-char*" name="base_uri"/>
-          <parameter type="const-char*" name="mime_type"/>
-        </parameters>
-      </method>
-      <method name="SetChromeMask" cname="gtk_moz_embed_set_chrome_mask">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="guint32" name="flags"/>
-        </parameters>
-      </method>
-      <method name="SetCompPath" cname="gtk_moz_embed_set_comp_path" shared="true">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="char*" name="aPath"/>
-        </parameters>
-      </method>
-      <method name="SetProfilePath" cname="gtk_moz_embed_set_profile_path" shared="true">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="char*" name="aDir"/>
-          <parameter type="char*" name="aName"/>
-        </parameters>
-      </method>
-      <method name="StatusEnumsGetType" cname="gtk_moz_embed_status_enums_get_type" shared="true" hidden="1">
-        <return-type type="GtkType"/>
-      </method>
-      <method name="StopLoad" cname="gtk_moz_embed_stop_load">
-        <return-type type="void"/>
-      </method>
-    </object>
-    <object name="Single" cname="GtkMozEmbedSingle" parent="GtkObject">
-      <field cname="data" type="void*"/>
-      <signal name="NewWindowOrphan" cname="new_window_orphan" when="FIRST" hidden="1">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GtkMozEmbedSingle*" name="embed"/>
-          <parameter type="GtkMozEmbed**" name="newEmbed"/>
-          <parameter type="guint" name="chromemask"/>
-        </parameters>
-      </signal>
-      <method name="Get" cname="gtk_moz_embed_single_get" shared="true">
-        <return-type type="GtkMozEmbedSingle*"/>
-      </method>
-    </object>
-  </namespace>
-</api>
Index: gtkmozembed/GtkMozEmbed.metadata
===================================================================
RCS file: gtkmozembed/GtkMozEmbed.metadata
diff -N gtkmozembed/GtkMozEmbed.metadata
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gtkmozembed/GtkMozEmbed.metadata	1 Dec 2003 20:49:20 -0000
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<metadata>
+  <attr path="/api/namespace/object[@cname='GtkMozEmbed']" name="name">EmbedWidget</attr>
+  <attr path="/api/namespace/object[@cname='GtkMozEmbed']" name="disabledefaultconstructor">1</attr>
+  <attr path="/api/namespace/object[@cname='GtkMozEmbed']/constructor[@cname='gtk_moz_embed_new']" name="hidden">1</attr>
+  <attr path="/api/namespace/object[@cname='GtkMozEmbed']/method[@name='ReloadFlagsGetType']" name="hidden">1</attr>
+  <attr path="/api/namespace/object[@cname='GtkMozEmbed']/method[@name='ProgressFlagsGetType']" name="hidden">1</attr>
+  <attr path="/api/namespace/object[@cname='GtkMozEmbed']/method[@name='StatusEnumsGetType']" name="hidden">1</attr>
+  <attr path="/api/namespace/object[@cname='GtkMozEmbed']/method[@name='ChromeFlagsGetType']" name="hidden">1</attr>
+  <attr path="/api/namespace/object[@cname='GtkMozEmbed']/method[@name='GetTitle']" name="name">GetGeckoTitle</attr>
+  <attr path="/api/namespace/object[@cname='GtkMozEmbed']/method[@name='GetLocation']" name="name">GetGeckoLocation</attr>
+  <attr path="/api/namespace/object[@cname='GtkMozEmbed']/method[@name='GetJsStatus']" name="name">GetGeckoJsStatus</attr>
+  <attr path="/api/namespace/object[@cname='GtkMozEmbed']/method[@name='GetLinkMessage']" name="name">GetGeckoLinkMessage</attr>
+  <attr path="/api/namespace/object[@cname='GtkMozEmbed']/signal[@cname='new_window']" name="hidden">1</attr>
+  <attr path="/api/namespace/object[@cname='GtkMozEmbedSingle']/signal[@cname='new_window_orphan']" name="hidden">1</attr>
+</metadata>
Index: gtkmozembed/Makefile.am
===================================================================
RCS file: /cvs/public/gtkmozembed-sharp/gtkmozembed/Makefile.am,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile.am
--- gtkmozembed/Makefile.am	3 Apr 2003 18:37:14 -0000	1.1.1.1
+++ gtkmozembed/Makefile.am	1 Dec 2003 20:49:20 -0000
@@ -1,14 +1,26 @@
-all: gtkmozembed-sharp.dll
+
+INCLUDE_APIS = \
+	$(GTKSHARP_PREFIX)/share/gapi/gdk-api.xml \
+	$(GTKSHARP_PREFIX)/share/gapi/gtk-api.xml \
+	$(GTKSHARP_PREFIX)/share/gapi/atk-api.xml
+			
+all: generated-stamp gtkmozembed-sharp.dll
+
+generated-stamp: gtkmozembed-api.xml
+	$(GTKSHARP_PREFIX)/bin/gapi-fixup.exe --api=gtkmozembed-api.xml --metadata=GtkMozEmbed.metadata && \
+	 	$(GTKSHARP_PREFIX)/bin/gapi_codegen.exe --generate gtkmozembed-api.xml --include $(INCLUDE_APIS) --outdir=generated --customdir=. --assembly-name=gtkmozembed-sharp && touch generated-stamp
  
-gtkmozembed-sharp.dll: @srcdir@/generated/*.cs
+gtkmozembed-sharp.dll: generated-stamp
 	$(MCS) --unsafe --target library -L $(GTKSHARP_PREFIX)/lib \
 	-r glib-sharp.dll -r gtk-sharp.dll -r gdk-sharp.dll \
 	--recurse '@srcdir@/*.cs' -o gtkmozembed-sharp.dll
  
 clean:
 	rm -f *.dll
+	rm -f generated-stamp
+	rm -f generated/*.cs
  
-maintainerclean:
+maintainerclean: clean
 	rm -rf generated
  
 install: all
Index: gtkmozembed/Single.custom
===================================================================
RCS file: /cvs/public/gtkmozembed-sharp/gtkmozembed/Single.custom,v
retrieving revision 1.1
diff -u -r1.1 Single.custom
--- gtkmozembed/Single.custom	24 Jun 2003 14:25:25 -0000	1.1
+++ gtkmozembed/Single.custom	1 Dec 2003 20:49:20 -0000
@@ -1,4 +1,5 @@
-		[GLib.Signal("new_window_orphan")]
+/*
+	[GLib.Signal("new_window_orphan")]
 		public event GtkMozEmbedSharp.NewWindowOrphanHandler NewWindowOrphan {
 			add {
 				if (EventList["new_window_orphan"] == null)
@@ -21,3 +22,4 @@
 				}
 			}
 		}
+*/
Index: gtkmozembed/gtkmozembed-api.xml
===================================================================
RCS file: gtkmozembed/gtkmozembed-api.xml
diff -N gtkmozembed/gtkmozembed-api.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gtkmozembed/gtkmozembed-api.xml	1 Dec 2003 20:49:20 -0000
@@ -0,0 +1,360 @@
+<?xml version="1.0"?>
+<api><!--
+
+        This file was automatically generated.
+        Please DO NOT MODIFY THIS FILE, modify .metadata files instead.
+
+-->
+  <namespace name="GtkMozEmbed" library="gtkembedmoz">
+    <enum name="ChromeFlags" cname="GtkMozEmbedChromeFlags" type="enum">
+      <member cname="GTK_MOZ_EMBED_FLAG_DEFAULTCHROME" name="Defaultchrome" value="1U" />
+      <member cname="GTK_MOZ_EMBED_FLAG_WINDOWBORDERSON" name="Windowborderson" value="2U" />
+      <member cname="GTK_MOZ_EMBED_FLAG_WINDOWCLOSEON" name="Windowcloseon" value="4U" />
+      <member cname="GTK_MOZ_EMBED_FLAG_WINDOWRESIZEON" name="Windowresizeon" value="8U" />
+      <member cname="GTK_MOZ_EMBED_FLAG_MENUBARON" name="Menubaron" value="16U" />
+      <member cname="GTK_MOZ_EMBED_FLAG_TOOLBARON" name="Toolbaron" value="32U" />
+      <member cname="GTK_MOZ_EMBED_FLAG_LOCATIONBARON" name="Locationbaron" value="64U" />
+      <member cname="GTK_MOZ_EMBED_FLAG_STATUSBARON" name="Statusbaron" value="128U" />
+      <member cname="GTK_MOZ_EMBED_FLAG_PERSONALTOOLBARON" name="Personaltoolbaron" value="256U" />
+      <member cname="GTK_MOZ_EMBED_FLAG_SCROLLBARSON" name="Scrollbarson" value="512U" />
+      <member cname="GTK_MOZ_EMBED_FLAG_TITLEBARON" name="Titlebaron" value="1024U" />
+      <member cname="GTK_MOZ_EMBED_FLAG_EXTRACHROMEON" name="Extrachromeon" value="2048U" />
+      <member cname="GTK_MOZ_EMBED_FLAG_ALLCHROME" name="Allchrome" value="4094U" />
+      <member cname="GTK_MOZ_EMBED_FLAG_WINDOWRAISED" name="Windowraised" value="33554432U" />
+      <member cname="GTK_MOZ_EMBED_FLAG_WINDOWLOWERED" name="Windowlowered" value="67108864U" />
+      <member cname="GTK_MOZ_EMBED_FLAG_CENTERSCREEN" name="Centerscreen" value="134217728U" />
+      <member cname="GTK_MOZ_EMBED_FLAG_DEPENDENT" name="Dependent" value="268435456U" />
+      <member cname="GTK_MOZ_EMBED_FLAG_MODAL" name="Modal" value="536870912U" />
+      <member cname="GTK_MOZ_EMBED_FLAG_OPENASDIALOG" name="Openasdialog" value="1073741824U" />
+      <member cname="GTK_MOZ_EMBED_FLAG_OPENASCHROME" name="Openaschrome" value="2147483648U " />
+    </enum>
+    <enum name="ProgressFlags" cname="GtkMozEmbedProgressFlags" type="enum">
+      <member cname="GTK_MOZ_EMBED_FLAG_START" name="Start" value="1" />
+      <member cname="GTK_MOZ_EMBED_FLAG_REDIRECTING" name="Redirecting" value="2" />
+      <member cname="GTK_MOZ_EMBED_FLAG_TRANSFERRING" name="Transferring" value="4" />
+      <member cname="GTK_MOZ_EMBED_FLAG_NEGOTIATING" name="Negotiating" value="8" />
+      <member cname="GTK_MOZ_EMBED_FLAG_STOP" name="Stop" value="16" />
+      <member cname="GTK_MOZ_EMBED_FLAG_IS_REQUEST" name="IsRequest" value="65536" />
+      <member cname="GTK_MOZ_EMBED_FLAG_IS_DOCUMENT" name="IsDocument" value="131072" />
+      <member cname="GTK_MOZ_EMBED_FLAG_IS_NETWORK" name="IsNetwork" value="262144" />
+      <member cname="GTK_MOZ_EMBED_FLAG_IS_WINDOW" name="IsWindow" value="524288 " />
+    </enum>
+    <enum name="ReloadFlags" cname="GtkMozEmbedReloadFlags" type="enum">
+      <member cname="GTK_MOZ_EMBED_FLAG_RELOADNORMAL" name="Reloadnormal" />
+      <member cname="GTK_MOZ_EMBED_FLAG_RELOADBYPASSCACHE" name="Reloadbypasscache" value="1" />
+      <member cname="GTK_MOZ_EMBED_FLAG_RELOADBYPASSPROXY" name="Reloadbypassproxy" value="2" />
+      <member cname="GTK_MOZ_EMBED_FLAG_RELOADBYPASSPROXYANDCACHE" name="Reloadbypassproxyandcache" value="3" />
+      <member cname="GTK_MOZ_EMBED_FLAG_RELOADCHARSETCHANGE" name="Reloadcharsetchange" value="4" />
+    </enum>
+    <enum name="StatusFlags" cname="GtkMozEmbedStatusFlags" type="enum">
+      <member cname="GTK_MOZ_EMBED_STATUS_FAILED_DNS" name="Dns" value="2152398878U" />
+      <member cname="GTK_MOZ_EMBED_STATUS_FAILED_CONNECT" name="Connect" value="2152398861U" />
+      <member cname="GTK_MOZ_EMBED_STATUS_FAILED_TIMEOUT" name="Timeout" value="2152398862U" />
+      <member cname="GTK_MOZ_EMBED_STATUS_FAILED_USERCANCELED" name="Usercanceled" value="2152398850U" />
+    </enum>
+    <object cname="GtkMozEmbed" parent="GtkBin" name="EmbedWidget" disabledefaultconstructor="1">
+      <field cname="data" type="void*" />
+      <method name="AppendData" cname="gtk_moz_embed_append_data">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="const-char*" name="data" />
+          <parameter type="guint32" name="len" />
+        </parameters>
+      </method>
+      <method name="CanGoBack" cname="gtk_moz_embed_can_go_back">
+        <return-type type="gboolean" />
+      </method>
+      <method name="CanGoForward" cname="gtk_moz_embed_can_go_forward">
+        <return-type type="gboolean" />
+      </method>
+      <method name="CloseStream" cname="gtk_moz_embed_close_stream">
+        <return-type type="void" />
+      </method>
+      <method name="GetChromeMask" cname="gtk_moz_embed_get_chrome_mask">
+        <return-type type="guint32" />
+      </method>
+      <method cname="gtk_moz_embed_get_js_status" name="GetGeckoJsStatus">
+        <return-type type="char*" />
+      </method>
+      <method cname="gtk_moz_embed_get_link_message" name="GetGeckoLinkMessage">
+        <return-type type="char*" />
+      </method>
+      <method cname="gtk_moz_embed_get_location" name="GetGeckoLocation">
+        <return-type type="char*" />
+      </method>
+      <method cname="gtk_moz_embed_get_title" name="GetGeckoTitle">
+        <return-type type="char*" />
+      </method>
+      <method name="GetType" cname="gtk_moz_embed_get_type" shared="true">
+        <return-type type="GtkType" />
+      </method>
+      <method name="GoBack" cname="gtk_moz_embed_go_back">
+        <return-type type="void" />
+      </method>
+      <method name="GoForward" cname="gtk_moz_embed_go_forward">
+        <return-type type="void" />
+      </method>
+      <method name="LoadUrl" cname="gtk_moz_embed_load_url">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="const-char*" name="url" />
+        </parameters>
+      </method>
+      <constructor cname="gtk_moz_embed_new" hidden="1" />
+      <method name="OpenStream" cname="gtk_moz_embed_open_stream">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="const-char*" name="base_uri" />
+          <parameter type="const-char*" name="mime_type" />
+        </parameters>
+      </method>
+      <method name="PopStartup" cname="gtk_moz_embed_pop_startup" shared="true">
+        <return-type type="void" />
+      </method>
+      <method name="PushStartup" cname="gtk_moz_embed_push_startup" shared="true">
+        <return-type type="void" />
+      </method>
+      <method name="Reload" cname="gtk_moz_embed_reload">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="gint32" name="flags" />
+        </parameters>
+      </method>
+      <method name="RenderData" cname="gtk_moz_embed_render_data">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="const-char*" name="data" />
+          <parameter type="guint32" name="len" />
+          <parameter type="const-char*" name="base_uri" />
+          <parameter type="const-char*" name="mime_type" />
+        </parameters>
+      </method>
+      <method name="SetChromeMask" cname="gtk_moz_embed_set_chrome_mask">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="guint32" name="flags" />
+        </parameters>
+      </method>
+      <method name="SetCompPath" cname="gtk_moz_embed_set_comp_path" shared="true">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="char*" name="aPath" />
+        </parameters>
+      </method>
+      <method name="SetProfilePath" cname="gtk_moz_embed_set_profile_path" shared="true">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="char*" name="aDir" />
+          <parameter type="char*" name="aName" />
+        </parameters>
+      </method>
+      <method name="StatusEnumsGetType" cname="gtk_moz_embed_status_enums_get_type" shared="true" hidden="1">
+        <return-type type="GtkType" />
+      </method>
+      <method name="StopLoad" cname="gtk_moz_embed_stop_load">
+        <return-type type="void" />
+      </method>
+      <signal name="LinkMessage" cname="link_message" when="FIRST">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GtkMozEmbed*" name="embed" />
+        </parameters>
+      </signal>
+      <signal name="JsStatus" cname="js_status" when="FIRST">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GtkMozEmbed*" name="embed" />
+        </parameters>
+      </signal>
+      <signal name="Location" cname="location" when="FIRST">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GtkMozEmbed*" name="embed" />
+        </parameters>
+      </signal>
+      <signal name="Title" cname="title" when="FIRST">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GtkMozEmbed*" name="embed" />
+        </parameters>
+      </signal>
+      <signal name="Progress" cname="progress" when="FIRST">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GtkMozEmbed*" name="embed" />
+          <parameter type="gint" name="curprogress" />
+          <parameter type="gint" name="maxprogress" />
+        </parameters>
+      </signal>
+      <signal name="ProgressAll" cname="progress_all" when="FIRST">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GtkMozEmbed*" name="embed" />
+          <parameter type="const-char*" name="aURI" />
+          <parameter type="gint" name="curprogress" />
+          <parameter type="gint" name="maxprogress" />
+        </parameters>
+      </signal>
+      <signal name="NetState" cname="net_state" when="FIRST">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GtkMozEmbed*" name="embed" />
+          <parameter type="gint" name="state" />
+          <parameter type="guint" name="status" />
+        </parameters>
+      </signal>
+      <signal name="NetStateAll" cname="net_state_all" when="FIRST">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GtkMozEmbed*" name="embed" />
+          <parameter type="const-char*" name="aURI" />
+          <parameter type="gint" name="state" />
+          <parameter type="guint" name="status" />
+        </parameters>
+      </signal>
+      <signal name="NetStart" cname="net_start" when="FIRST">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GtkMozEmbed*" name="embed" />
+        </parameters>
+      </signal>
+      <signal name="NetStop" cname="net_stop" when="FIRST">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GtkMozEmbed*" name="embed" />
+        </parameters>
+      </signal>
+      <signal name="NewWindow" cname="new_window" when="FIRST" hidden="1">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GtkMozEmbed*" name="embed" />
+          <parameter type="GtkMozEmbed**" name="newEmbed" />
+          <parameter type="guint" name="chromemask" />
+        </parameters>
+      </signal>
+      <signal name="Visibility" cname="visibility" when="FIRST">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GtkMozEmbed*" name="embed" />
+          <parameter type="gboolean" name="visibility" />
+        </parameters>
+      </signal>
+      <signal name="DestroyBrowser" cname="destroy_browser" when="FIRST">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GtkMozEmbed*" name="embed" />
+        </parameters>
+      </signal>
+      <signal name="OpenUri" cname="open_uri" when="LAST">
+        <return-type type="gint" />
+        <parameters>
+          <parameter type="GtkMozEmbed*" name="embed" />
+          <parameter type="const-char*" name="aURI" />
+        </parameters>
+      </signal>
+      <signal name="SizeTo" cname="size_to" when="LAST">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GtkMozEmbed*" name="embed" />
+          <parameter type="gint" name="width" />
+          <parameter type="gint" name="height" />
+        </parameters>
+      </signal>
+      <signal name="DomKeyDown" cname="dom_key_down" when="LAST">
+        <return-type type="gint" />
+        <parameters>
+          <parameter type="GtkMozEmbed*" name="embed" />
+          <parameter type="gpointer" name="dom_event" />
+        </parameters>
+      </signal>
+      <signal name="DomKeyPress" cname="dom_key_press" when="LAST">
+        <return-type type="gint" />
+        <parameters>
+          <parameter type="GtkMozEmbed*" name="embed" />
+          <parameter type="gpointer" name="dom_event" />
+        </parameters>
+      </signal>
+      <signal name="DomKeyUp" cname="dom_key_up" when="LAST">
+        <return-type type="gint" />
+        <parameters>
+          <parameter type="GtkMozEmbed*" name="embed" />
+          <parameter type="gpointer" name="dom_event" />
+        </parameters>
+      </signal>
+      <signal name="DomMouseDown" cname="dom_mouse_down" when="LAST">
+        <return-type type="gint" />
+        <parameters>
+          <parameter type="GtkMozEmbed*" name="embed" />
+          <parameter type="gpointer" name="dom_event" />
+        </parameters>
+      </signal>
+      <signal name="DomMouseUp" cname="dom_mouse_up" when="LAST">
+        <return-type type="gint" />
+        <parameters>
+          <parameter type="GtkMozEmbed*" name="embed" />
+          <parameter type="gpointer" name="dom_event" />
+        </parameters>
+      </signal>
+      <signal name="DomMouseClick" cname="dom_mouse_click" when="LAST">
+        <return-type type="gint" />
+        <parameters>
+          <parameter type="GtkMozEmbed*" name="embed" />
+          <parameter type="gpointer" name="dom_event" />
+        </parameters>
+      </signal>
+      <signal name="DomMouseDblClick" cname="dom_mouse_dbl_click" when="LAST">
+        <return-type type="gint" />
+        <parameters>
+          <parameter type="GtkMozEmbed*" name="embed" />
+          <parameter type="gpointer" name="dom_event" />
+        </parameters>
+      </signal>
+      <signal name="DomMouseOver" cname="dom_mouse_over" when="LAST">
+        <return-type type="gint" />
+        <parameters>
+          <parameter type="GtkMozEmbed*" name="embed" />
+          <parameter type="gpointer" name="dom_event" />
+        </parameters>
+      </signal>
+      <signal name="DomMouseOut" cname="dom_mouse_out" when="LAST">
+        <return-type type="gint" />
+        <parameters>
+          <parameter type="GtkMozEmbed*" name="embed" />
+          <parameter type="gpointer" name="dom_event" />
+        </parameters>
+      </signal>
+      <signal name="SecurityChange" cname="security_change" when="LAST">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GtkMozEmbed*" name="embed" />
+          <parameter type="gpointer" name="request" />
+          <parameter type="guint" name="state" />
+        </parameters>
+      </signal>
+      <signal name="StatusChange" cname="status_change" when="LAST">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GtkMozEmbed*" name="embed" />
+          <parameter type="gpointer" name="request" />
+          <parameter type="gint" name="status" />
+          <parameter type="gpointer" name="message" />
+        </parameters>
+      </signal>
+    </object>
+    <object name="Single" cname="GtkMozEmbedSingle" parent="GtkObject">
+      <field cname="parent_class" type="GtkObjectClass" />
+      <field cname="data" type="void*" />
+      <method name="Get" cname="gtk_moz_embed_single_get" shared="true">
+        <return-type type="GtkMozEmbedSingle*" />
+      </method>
+      <signal name="NewWindowOrphan" cname="new_window_orphan" when="FIRST" hidden="1">
+        <return-type type="void" />
+        <parameters>
+          <parameter type="GtkMozEmbedSingle*" name="embed" />
+          <parameter type="GtkMozEmbed**" name="newEmbed" />
+          <parameter type="guint" name="chromemask" />
+        </parameters>
+      </signal>
+    </object>
+  </namespace>
+</api>
\ No newline at end of file
Index: sources/GtkMozEmbed.metadata
===================================================================
RCS file: sources/GtkMozEmbed.metadata
diff -N sources/GtkMozEmbed.metadata
--- sources/GtkMozEmbed.metadata	23 Jun 2003 16:08:26 -0000	1.4
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,157 +0,0 @@
-<?xml version="1.0"?>
-<metadata>
-
-<rule>
-  <class name="GtkMozEmbed" />
-  <data>
-    <attribute target="class">
-      <name>name</name>
-      <value>EmbedWidget</value>
-    </attribute>
-  </data>
-</rule>
-
-<rule>
-  <class name="GtkMozEmbed" />
-  <data>
-    <attribute target="class">
-      <name>disabledefaultconstructor</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-
-<rule>
-  <class name="GtkMozEmbed">
-    <constructor>gtk_moz_embed_new</constructor>
-  </class>
-  <data>
-    <attribute target="method">
-      <name>hidden</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-
-<rule>
-  <class name="GtkMozEmbed">
-    <method>ReloadFlagsGetType</method>
-  </class>
-  <data>
-    <attribute target="method">
-      <name>hidden</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-
-<rule>
-  <class name="GtkMozEmbed">
-    <method>ProgressFlagsGetType</method>
-  </class>
-  <data>
-    <attribute target="method">
-      <name>hidden</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-
-<rule>
-  <class name="GtkMozEmbed">
-    <method>StatusEnumsGetType</method>
-  </class>
-  <data>
-    <attribute target="method">
-      <name>hidden</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-
-<rule>
-  <class name="GtkMozEmbed">
-    <method>ChromeFlagsGetType</method>
-  </class>
-  <data>
-    <attribute target="method">
-      <name>hidden</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-
-
-<rule>
-  <class name="GtkMozEmbed">
-    <method>GetTitle</method>
-  </class>
-  <data>
-    <attribute target="method">
-      <name>name</name>
-      <value>GetGeckoTitle</value>
-    </attribute>
-  </data>
-</rule>
-
-<rule>
-  <class name="GtkMozEmbed">
-    <method>GetLocation</method>
-  </class>
-  <data>
-    <attribute target="method">
-      <name>name</name>
-      <value>GetGeckoLocation</value>
-    </attribute>
-  </data>
-</rule>
-
-<rule>
-  <class name="GtkMozEmbed">
-    <method>GetJsStatus</method>
-  </class>
-  <data>
-    <attribute target="method">
-      <name>name</name>
-      <value>GetGeckoJsStatus</value>
-    </attribute>
-  </data>
-</rule>
-
-<rule>
-  <class name="GtkMozEmbed">
-    <method>GetLinkMessage</method>
-  </class>
-  <data>
-    <attribute target="method">
-      <name>name</name>
-      <value>GetGeckoLinkMessage</value>
-    </attribute>
-  </data>
-</rule>
-
-<rule>
-  <class name="GtkMozEmbed">
-    <signal>NewWindow</signal>
-  </class>
-  <data>
-    <attribute target="method">
-      <name>hidden</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-
-<rule>
-  <class name="GtkMozEmbedSingle">
-    <signal>NewWindowOrphan</signal>
-  </class>
-  <data>
-    <attribute target="method">
-      <name>hidden</name>
-      <value>1</value>
-    </attribute>
-  </data>
-</rule>
-
-</metadata>
Index: sources/Makefile.am
===================================================================
RCS file: /cvs/public/gtkmozembed-sharp/sources/Makefile.am,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile.am
--- sources/Makefile.am	3 Apr 2003 18:37:13 -0000	1.1.1.1
+++ sources/Makefile.am	1 Dec 2003 20:49:20 -0000
@@ -1,15 +1,5 @@
-if MAINTAINER_MODE
- 
-api:
+all: gtkmozembed/*.h
 	PERLLIB=$(GTKSHARP_PREFIX)/share/perl5  \
 	PATH=$(GTKSHARP_PREFIX)/bin:$$PATH \
-	gapi.pl gtkmozembed.sources @top_srcdir@/api
-
-else
-
-api:
-
-endif
-
-all: api
+	gapi-parser gtkmozembed-sharp-sources.xml
 
Index: sources/gtkmozembed-sharp-sources.xml
===================================================================
RCS file: sources/gtkmozembed-sharp-sources.xml
diff -N sources/gtkmozembed-sharp-sources.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources/gtkmozembed-sharp-sources.xml	1 Dec 2003 20:49:20 -0000
@@ -0,0 +1,9 @@
+<gapi-parser-input>
+  <api filename="../gtkmozembed/gtkmozembed-api.xml">
+    <library name="gtkembedmoz">
+      <namespace name="GtkMozEmbed">
+        <dir>gtkmozembed</dir>
+      </namespace>
+    </library>
+  </api>
+</gapi-parser-input>
Index: sources/gtkmozembed.sources
===================================================================
RCS file: sources/gtkmozembed.sources
diff -N sources/gtkmozembed.sources
--- sources/gtkmozembed.sources	29 May 2003 17:14:01 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1 +0,0 @@
-gtkmozembed GtkMozEmbed gtkembedmoz

--=-FfK7AuEBC/OosoH2dPX2--