From 217c4a84293f0874a4910e13ec0d954480743bde Mon Sep 17 00:00:00 2001
From: Dan Winship <danw@mono-cvs.ximian.com>
Date: Wed, 23 Feb 2005 20:22:19 +0000
Subject: [PATCH] 	* sources/gnomedb.patch: Patch over a bug in
 gnome-db-editor.h

	* gnomedb/gnomedb-api.raw: Regen

svn path=/trunk/gtk-sharp/; revision=41114
---
 ChangeLog                      | 10 +++++--
 doc/ChangeLog                  |  2 ++
 doc/en/GnomeDb/EditorClass.xml | 52 ----------------------------------
 gnomedb/gnomedb-api.raw        | 15 ++++------
 sources/gnomedb.patch          | 11 +++++++
 5 files changed, 27 insertions(+), 63 deletions(-)
 delete mode 100644 doc/en/GnomeDb/EditorClass.xml

diff --git a/ChangeLog b/ChangeLog
index 61d1150af..85ee94a75 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,13 @@
+2005-02-23  Dan Winship  <danw@novell.com>
+
+	* sources/gnomedb.patch: Patch over a bug in gnome-db-editor.h
+
+	* gnomedb/gnomedb-api.raw: Regen
+
 2005-02-23  Dan Winship  <danw@novell.com>
 
 	* parser/gapi2xml.pl (parseTypeToken): don't parse punctuation
-	into the type name
+	into the type name. [Fixes #72925]
 
 	* gtk/gtk-api.raw: Regen, exposing the previously-broken
 	AccelGroup.AccelActivate, AccelMap.Changed,
@@ -12,7 +18,7 @@
 	* gtk/Gtk.metadata: Give proper names to the parameters of those
 	signals
 
-2005-02-17  Dan Winship  <danw@novell.com>
+2005-02-23  Dan Winship  <danw@novell.com>
 
 	* generator/Field.cs (Validate): new, to check that a field has a
 	valid type (or is hidden).
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 7f70f658b..cb498b6dc 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,5 +1,7 @@
 2005-02-23  Dan Winship  <danw@novell.com>
 
+	* en/GnomeDb/EditorClass.xml: gone
+	
 	* en/Gtk/AccelActivateArgs.xml:
 	* en/Gtk/AccelActivateHandler.xml:
 	* en/Gtk/AccelGroup.xml:
diff --git a/doc/en/GnomeDb/EditorClass.xml b/doc/en/GnomeDb/EditorClass.xml
deleted file mode 100644
index d11a618dc..000000000
--- a/doc/en/GnomeDb/EditorClass.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<Type Name="EditorClass" FullName="GnomeDb.EditorClass">
-  <TypeSignature Language="C#" Value="public sealed struct EditorClass" Maintainer="auto" />
-  <AssemblyInfo>
-    <AssemblyName>gnomedb-sharp</AssemblyName>
-    <AssemblyPublicKey>
-    </AssemblyPublicKey>
-    <AssemblyVersion>0.0.0.0</AssemblyVersion>
-    <AssemblyCulture>neutral</AssemblyCulture>
-    <Attributes />
-  </AssemblyInfo>
-  <ThreadSafetyStatement>Gtk# is thread aware, but not thread safe; See the <link location="node:gtk-sharp/programming/threads">Gtk# Thread Programming</link> for details.</ThreadSafetyStatement>
-  <Docs>
-    <summary>To be added</summary>
-    <remarks>To be added</remarks>
-  </Docs>
-  <Base>
-    <BaseTypeName>System.ValueType</BaseTypeName>
-  </Base>
-  <Interfaces />
-  <Attributes />
-  <Members>
-    <Member MemberName="Zero">
-      <MemberSignature Language="C#" Value="public static GnomeDb.EditorClass Zero;" />
-      <MemberType>Field</MemberType>
-      <ReturnValue>
-        <ReturnType>GnomeDb.EditorClass</ReturnType>
-      </ReturnValue>
-      <Parameters>
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-    <Member MemberName="New">
-      <MemberSignature Language="C#" Value="public static GnomeDb.EditorClass New (IntPtr raw);" />
-      <MemberType>Method</MemberType>
-      <ReturnValue>
-        <ReturnType>GnomeDb.EditorClass</ReturnType>
-      </ReturnValue>
-      <Parameters>
-        <Parameter Name="raw" Type="System.IntPtr" />
-      </Parameters>
-      <Docs>
-        <summary>To be added</summary>
-        <param name="raw">a <see cref="T:System.IntPtr" /></param>
-        <returns>a <see cref="T:GnomeDb.EditorClass" /></returns>
-        <remarks>To be added</remarks>
-      </Docs>
-    </Member>
-  </Members>
-</Type>
\ No newline at end of file
diff --git a/gnomedb/gnomedb-api.raw b/gnomedb/gnomedb-api.raw
index f07df27c9..2b881a3af 100644
--- a/gnomedb/gnomedb-api.raw
+++ b/gnomedb/gnomedb-api.raw
@@ -256,6 +256,12 @@
     </object>
     <object name="Editor" cname="GnomeDbEditor" parent="GtkVBox">
       <field name="Priv" cname="priv" type="GnomeDbEditorPrivate*"/>
+      <virtual_method name="TextChanged" cname="text_changed">
+        <return-type type="void"/>
+        <parameters>
+          <parameter type="GnomeDbEditor" name="editor"/>
+        </parameters>
+      </virtual_method>
       <method name="CopyClipboard" cname="gnome_db_editor_copy_clipboard">
         <return-type type="void"/>
       </method>
@@ -831,15 +837,6 @@
       <field name="Domain" cname="domain" type="gchar*"/>
       <field name="Properties" cname="properties" type="GdaParameterList*"/>
     </struct>
-    <struct name="EditorClass" cname="GnomeDbEditorClass">
-      <field name="ParentClass" cname="parent_class" type="GtkVBoxClass"/>
-      <callback cname="text_changed">
-        <return-type type="void"/>
-        <parameters>
-          <parameter type="GnomeDbEditor" name="editor"/>
-        </parameters>
-      </callback>
-    </struct>
     <class name="Config" cname="GnomeDbConfig_">
       <method name="AddListener" cname="gnome_db_config_add_listener" shared="true">
         <return-type type="guint"/>
diff --git a/sources/gnomedb.patch b/sources/gnomedb.patch
index a6430284e..cbd964ec5 100644
--- a/sources/gnomedb.patch
+++ b/sources/gnomedb.patch
@@ -9,3 +9,14 @@
  			      NULL, NULL,
  			      g_cclosure_marshal_VOID__VOID,
  			      G_TYPE_NONE, 0);
+--- libgnomedb-1.0.0/libgnomedb/gnome-db-editor.h.orig	2005-02-23 13:50:59.509288486 -0500
++++ libgnomedb-1.0.0/libgnomedb/gnome-db-editor.h	2005-02-23 13:50:51.247345662 -0500
+@@ -29,7 +29,7 @@
+ 
+ #define GNOME_DB_TYPE_EDITOR            (gnome_db_editor_get_type())
+ #define GNOME_DB_EDITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST (obj, GNOME_DB_TYPE_EDITOR, GnomeDbEditor))
+-#define GNOME_DB_EDITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST (klass, GNOME_DB_TYPE_EDITOR, GnomeDbEditor))
++#define GNOME_DB_EDITOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST (klass, GNOME_DB_TYPE_EDITOR, GnomeDbEditorClass))
+ #define GNOME_DB_IS_EDITOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE (obj, GNOME_DB_TYPE_EDITOR))
+ #define GNOME_DB_IS_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_DB_TYPE_EDITOR))
+