Fix a problem with referring to the wrong buffer.

Tue Apr 25 19:40:18 2000  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtktextlayout.c (gtk_text_layout_set_buffer): Fix
	a problem with referring to the wrong buffer.

	* gtk/gtkentry.c: Fix focus-in/focus-out confusion.

9 files changed, 142 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 067dc736b3..9c32da20c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+Tue Apr 25 19:40:18 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtktextlayout.c (gtk_text_layout_set_buffer): Fix
+	a problem with referring to the wrong buffer.
+
+	* gtk/gtkentry.c: Fix focus-in/focus-out confusion.
+
+	* gtk/gtkrc.c gtk/gtkstyle.c: Moving setting default
+	font description to gtk_style_new() - otherwise things
+	don't work without a .gtkrc file.
+
+	* gtk/gtktextbuffer.c (gtk_text_buffer_new): Sink the
+	tags table if we create it ourself, too.
+
+	* gdk/gdktypes.h (enum): Move GDK_RELEASE_MASK, since
+	it was conflicting with XKB modifiers.
+
+	* gtk/gtktextview.[ch]: Add simple support for 
+	GtkIMContext.
+
 Mon Apr 24 19:34:18 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkentry.c (gtk_entry_move_cursor_visually): Fix problem
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 067dc736b3..9c32da20c6 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,23 @@
+Tue Apr 25 19:40:18 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtktextlayout.c (gtk_text_layout_set_buffer): Fix
+	a problem with referring to the wrong buffer.
+
+	* gtk/gtkentry.c: Fix focus-in/focus-out confusion.
+
+	* gtk/gtkrc.c gtk/gtkstyle.c: Moving setting default
+	font description to gtk_style_new() - otherwise things
+	don't work without a .gtkrc file.
+
+	* gtk/gtktextbuffer.c (gtk_text_buffer_new): Sink the
+	tags table if we create it ourself, too.
+
+	* gdk/gdktypes.h (enum): Move GDK_RELEASE_MASK, since
+	it was conflicting with XKB modifiers.
+
+	* gtk/gtktextview.[ch]: Add simple support for 
+	GtkIMContext.
+
 Mon Apr 24 19:34:18 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkentry.c (gtk_entry_move_cursor_visually): Fix problem
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 067dc736b3..9c32da20c6 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,23 @@
+Tue Apr 25 19:40:18 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtktextlayout.c (gtk_text_layout_set_buffer): Fix
+	a problem with referring to the wrong buffer.
+
+	* gtk/gtkentry.c: Fix focus-in/focus-out confusion.
+
+	* gtk/gtkrc.c gtk/gtkstyle.c: Moving setting default
+	font description to gtk_style_new() - otherwise things
+	don't work without a .gtkrc file.
+
+	* gtk/gtktextbuffer.c (gtk_text_buffer_new): Sink the
+	tags table if we create it ourself, too.
+
+	* gdk/gdktypes.h (enum): Move GDK_RELEASE_MASK, since
+	it was conflicting with XKB modifiers.
+
+	* gtk/gtktextview.[ch]: Add simple support for 
+	GtkIMContext.
+
 Mon Apr 24 19:34:18 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkentry.c (gtk_entry_move_cursor_visually): Fix problem
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 067dc736b3..9c32da20c6 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,23 @@
+Tue Apr 25 19:40:18 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtktextlayout.c (gtk_text_layout_set_buffer): Fix
+	a problem with referring to the wrong buffer.
+
+	* gtk/gtkentry.c: Fix focus-in/focus-out confusion.
+
+	* gtk/gtkrc.c gtk/gtkstyle.c: Moving setting default
+	font description to gtk_style_new() - otherwise things
+	don't work without a .gtkrc file.
+
+	* gtk/gtktextbuffer.c (gtk_text_buffer_new): Sink the
+	tags table if we create it ourself, too.
+
+	* gdk/gdktypes.h (enum): Move GDK_RELEASE_MASK, since
+	it was conflicting with XKB modifiers.
+
+	* gtk/gtktextview.[ch]: Add simple support for 
+	GtkIMContext.
+
 Mon Apr 24 19:34:18 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkentry.c (gtk_entry_move_cursor_visually): Fix problem
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 067dc736b3..9c32da20c6 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,23 @@
+Tue Apr 25 19:40:18 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtktextlayout.c (gtk_text_layout_set_buffer): Fix
+	a problem with referring to the wrong buffer.
+
+	* gtk/gtkentry.c: Fix focus-in/focus-out confusion.
+
+	* gtk/gtkrc.c gtk/gtkstyle.c: Moving setting default
+	font description to gtk_style_new() - otherwise things
+	don't work without a .gtkrc file.
+
+	* gtk/gtktextbuffer.c (gtk_text_buffer_new): Sink the
+	tags table if we create it ourself, too.
+
+	* gdk/gdktypes.h (enum): Move GDK_RELEASE_MASK, since
+	it was conflicting with XKB modifiers.
+
+	* gtk/gtktextview.[ch]: Add simple support for 
+	GtkIMContext.
+
 Mon Apr 24 19:34:18 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkentry.c (gtk_entry_move_cursor_visually): Fix problem
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 067dc736b3..9c32da20c6 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,23 @@
+Tue Apr 25 19:40:18 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtktextlayout.c (gtk_text_layout_set_buffer): Fix
+	a problem with referring to the wrong buffer.
+
+	* gtk/gtkentry.c: Fix focus-in/focus-out confusion.
+
+	* gtk/gtkrc.c gtk/gtkstyle.c: Moving setting default
+	font description to gtk_style_new() - otherwise things
+	don't work without a .gtkrc file.
+
+	* gtk/gtktextbuffer.c (gtk_text_buffer_new): Sink the
+	tags table if we create it ourself, too.
+
+	* gdk/gdktypes.h (enum): Move GDK_RELEASE_MASK, since
+	it was conflicting with XKB modifiers.
+
+	* gtk/gtktextview.[ch]: Add simple support for 
+	GtkIMContext.
+
 Mon Apr 24 19:34:18 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkentry.c (gtk_entry_move_cursor_visually): Fix problem
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 067dc736b3..9c32da20c6 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,23 @@
+Tue Apr 25 19:40:18 2000  Owen Taylor  <otaylor@redhat.com>
+
+	* gtk/gtktextlayout.c (gtk_text_layout_set_buffer): Fix
+	a problem with referring to the wrong buffer.
+
+	* gtk/gtkentry.c: Fix focus-in/focus-out confusion.
+
+	* gtk/gtkrc.c gtk/gtkstyle.c: Moving setting default
+	font description to gtk_style_new() - otherwise things
+	don't work without a .gtkrc file.
+
+	* gtk/gtktextbuffer.c (gtk_text_buffer_new): Sink the
+	tags table if we create it ourself, too.
+
+	* gdk/gdktypes.h (enum): Move GDK_RELEASE_MASK, since
+	it was conflicting with XKB modifiers.
+
+	* gtk/gtktextview.[ch]: Add simple support for 
+	GtkIMContext.
+
 Mon Apr 24 19:34:18 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkentry.c (gtk_entry_move_cursor_visually): Fix problem
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index cded807d74..dfbc00b323 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -1151,7 +1151,7 @@ gtk_entry_focus_in (GtkWidget     *widget,
   gtk_widget_draw_focus (widget);
   gtk_entry_queue_draw (GTK_ENTRY (widget));
   
-  gtk_im_context_focus_out (GTK_ENTRY (widget)->im_context);
+  gtk_im_context_focus_in (GTK_ENTRY (widget)->im_context);
 
   return FALSE;
 }
diff --git a/gtk/gtktextlayout.c b/gtk/gtktextlayout.c
index 473fdf9ff6..4e058191e7 100644
--- a/gtk/gtktextlayout.c
+++ b/gtk/gtktextlayout.c
@@ -225,7 +225,7 @@ gtk_text_layout_set_buffer (GtkTextLayout *layout,
   
   if (layout->buffer)
     {
-      gtk_text_btree_remove_view (buffer->tree, layout);
+      gtk_text_btree_remove_view (layout->buffer->tree, layout);
       
       gtk_object_unref (GTK_OBJECT (layout->buffer));
       layout->buffer = NULL;
@@ -1828,4 +1828,3 @@ gtk_text_layout_spew (GtkTextLayout *layout)
 }
 
 
-