un Oct 28 09:15:39 2001 Owen Taylor <otaylor@redhat.com>

        * gtk/gtkimcontext.h (struct _GtkIMContext): Fixed
        structure to have GObject not GtkObject as
        parent_instance. (Jeff Franks.)

diff --git a/ChangeLog b/ChangeLog
index e99ebced8400a3a68a61c7e58e714a56f17f7a11..d70b6d271248ba274166d93f9a6a73d4dc77d7ef 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Oct 28 09:15:39 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkimcontext.h (struct _GtkIMContext): Fixed
+       structure to have GObject not GtkObject as
+       parent_instance. (Jeff Franks.)
+
 2001-10-27  Matthias Clasen  <matthiasc@poet.de>
 
        * gdk/x11/gdkinput.c: Typo fix.

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index e99ebced8400a3a68a61c7e58e714a56f17f7a11..d70b6d271248ba274166d93f9a6a73d4dc77d7ef 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Sun Oct 28 09:15:39 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkimcontext.h (struct _GtkIMContext): Fixed
+       structure to have GObject not GtkObject as
+       parent_instance. (Jeff Franks.)
+
 2001-10-27  Matthias Clasen  <matthiasc@poet.de>
 
        * gdk/x11/gdkinput.c: Typo fix.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e99ebced8400a3a68a61c7e58e714a56f17f7a11..d70b6d271248ba274166d93f9a6a73d4dc77d7ef 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Sun Oct 28 09:15:39 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkimcontext.h (struct _GtkIMContext): Fixed
+       structure to have GObject not GtkObject as
+       parent_instance. (Jeff Franks.)
+
 2001-10-27  Matthias Clasen  <matthiasc@poet.de>
 
        * gdk/x11/gdkinput.c: Typo fix.

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index e99ebced8400a3a68a61c7e58e714a56f17f7a11..d70b6d271248ba274166d93f9a6a73d4dc77d7ef 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Sun Oct 28 09:15:39 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkimcontext.h (struct _GtkIMContext): Fixed
+       structure to have GObject not GtkObject as
+       parent_instance. (Jeff Franks.)
+
 2001-10-27  Matthias Clasen  <matthiasc@poet.de>
 
        * gdk/x11/gdkinput.c: Typo fix.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index e99ebced8400a3a68a61c7e58e714a56f17f7a11..d70b6d271248ba274166d93f9a6a73d4dc77d7ef 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Sun Oct 28 09:15:39 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkimcontext.h (struct _GtkIMContext): Fixed
+       structure to have GObject not GtkObject as
+       parent_instance. (Jeff Franks.)
+
 2001-10-27  Matthias Clasen  <matthiasc@poet.de>
 
        * gdk/x11/gdkinput.c: Typo fix.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index e99ebced8400a3a68a61c7e58e714a56f17f7a11..d70b6d271248ba274166d93f9a6a73d4dc77d7ef 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Sun Oct 28 09:15:39 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkimcontext.h (struct _GtkIMContext): Fixed
+       structure to have GObject not GtkObject as
+       parent_instance. (Jeff Franks.)
+
 2001-10-27  Matthias Clasen  <matthiasc@poet.de>
 
        * gdk/x11/gdkinput.c: Typo fix.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e99ebced8400a3a68a61c7e58e714a56f17f7a11..d70b6d271248ba274166d93f9a6a73d4dc77d7ef 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Sun Oct 28 09:15:39 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkimcontext.h (struct _GtkIMContext): Fixed
+       structure to have GObject not GtkObject as
+       parent_instance. (Jeff Franks.)
+
 2001-10-27  Matthias Clasen  <matthiasc@poet.de>
 
        * gdk/x11/gdkinput.c: Typo fix.

diff --git a/gtk/gtkimcontext.h b/gtk/gtkimcontext.h
index a31e8542fdbd6bffd55edf16eed52ba21ace9723..0b5d8f37596781aadd1f6a463adcc44d7162c2fa 100644 (file)
--- a/gtk/gtkimcontext.h
+++ b/gtk/gtkimcontext.h
@@ -42,7 +42,7 @@ typedef struct _GtkIMContextClass  GtkIMContextClass;
 
 struct _GtkIMContext
 {
-  GtkObject object;
+  GObject parent_instance;
 };
 
 struct _GtkIMContextClass