add varargs for properties to set on the tag.

2001-03-15  Havoc Pennington  <hp@redhat.com>

	* gtk/gtktextbuffer.c (gtk_text_buffer_create_tag): add varargs
	for properties to set on the tag.

	* gtk/testtext.c: fixups to reflect create_tag change

	* gtk/gtktexttag.c (gtk_text_tag_set_property):
	background/foreground stipple are objects, not boxed.

	* demos/gtk-demo/textview.c: intellihancing

18 files changed, 350 insertions, 205 deletions

diff --git a/ChangeLog b/ChangeLog
index a6cfe73a4..a433a0478 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2001-03-15  Havoc Pennington  <hp@redhat.com>
+	
+	* gtk/gtktextbuffer.c (gtk_text_buffer_create_tag): add varargs 
+	for properties to set on the tag.
+
+	* gtk/testtext.c: fixups to reflect create_tag change
+	
+	* gtk/gtktexttag.c (gtk_text_tag_set_property):
+	background/foreground stipple are objects, not boxed.
+
+	* demos/gtk-demo/textview.c: intellihancing
+
 Fri Mar 16 11:38:42 2001  Jonathan Blandford  <jrb@redhat.com>
 
 	* gtk/gtktreeview.c (gtk_tree_view_set_model): Fixed some
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index a6cfe73a4..a433a0478 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,15 @@
+2001-03-15  Havoc Pennington  <hp@redhat.com>
+	
+	* gtk/gtktextbuffer.c (gtk_text_buffer_create_tag): add varargs 
+	for properties to set on the tag.
+
+	* gtk/testtext.c: fixups to reflect create_tag change
+	
+	* gtk/gtktexttag.c (gtk_text_tag_set_property):
+	background/foreground stipple are objects, not boxed.
+
+	* demos/gtk-demo/textview.c: intellihancing
+
 Fri Mar 16 11:38:42 2001  Jonathan Blandford  <jrb@redhat.com>
 
 	* gtk/gtktreeview.c (gtk_tree_view_set_model): Fixed some
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index a6cfe73a4..a433a0478 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,15 @@
+2001-03-15  Havoc Pennington  <hp@redhat.com>
+	
+	* gtk/gtktextbuffer.c (gtk_text_buffer_create_tag): add varargs 
+	for properties to set on the tag.
+
+	* gtk/testtext.c: fixups to reflect create_tag change
+	
+	* gtk/gtktexttag.c (gtk_text_tag_set_property):
+	background/foreground stipple are objects, not boxed.
+
+	* demos/gtk-demo/textview.c: intellihancing
+
 Fri Mar 16 11:38:42 2001  Jonathan Blandford  <jrb@redhat.com>
 
 	* gtk/gtktreeview.c (gtk_tree_view_set_model): Fixed some
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index a6cfe73a4..a433a0478 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,15 @@
+2001-03-15  Havoc Pennington  <hp@redhat.com>
+	
+	* gtk/gtktextbuffer.c (gtk_text_buffer_create_tag): add varargs 
+	for properties to set on the tag.
+
+	* gtk/testtext.c: fixups to reflect create_tag change
+	
+	* gtk/gtktexttag.c (gtk_text_tag_set_property):
+	background/foreground stipple are objects, not boxed.
+
+	* demos/gtk-demo/textview.c: intellihancing
+
 Fri Mar 16 11:38:42 2001  Jonathan Blandford  <jrb@redhat.com>
 
 	* gtk/gtktreeview.c (gtk_tree_view_set_model): Fixed some
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index a6cfe73a4..a433a0478 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,15 @@
+2001-03-15  Havoc Pennington  <hp@redhat.com>
+	
+	* gtk/gtktextbuffer.c (gtk_text_buffer_create_tag): add varargs 
+	for properties to set on the tag.
+
+	* gtk/testtext.c: fixups to reflect create_tag change
+	
+	* gtk/gtktexttag.c (gtk_text_tag_set_property):
+	background/foreground stipple are objects, not boxed.
+
+	* demos/gtk-demo/textview.c: intellihancing
+
 Fri Mar 16 11:38:42 2001  Jonathan Blandford  <jrb@redhat.com>
 
 	* gtk/gtktreeview.c (gtk_tree_view_set_model): Fixed some
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index a6cfe73a4..a433a0478 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,15 @@
+2001-03-15  Havoc Pennington  <hp@redhat.com>
+	
+	* gtk/gtktextbuffer.c (gtk_text_buffer_create_tag): add varargs 
+	for properties to set on the tag.
+
+	* gtk/testtext.c: fixups to reflect create_tag change
+	
+	* gtk/gtktexttag.c (gtk_text_tag_set_property):
+	background/foreground stipple are objects, not boxed.
+
+	* demos/gtk-demo/textview.c: intellihancing
+
 Fri Mar 16 11:38:42 2001  Jonathan Blandford  <jrb@redhat.com>
 
 	* gtk/gtktreeview.c (gtk_tree_view_set_model): Fixed some
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index a6cfe73a4..a433a0478 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,15 @@
+2001-03-15  Havoc Pennington  <hp@redhat.com>
+	
+	* gtk/gtktextbuffer.c (gtk_text_buffer_create_tag): add varargs 
+	for properties to set on the tag.
+
+	* gtk/testtext.c: fixups to reflect create_tag change
+	
+	* gtk/gtktexttag.c (gtk_text_tag_set_property):
+	background/foreground stipple are objects, not boxed.
+
+	* demos/gtk-demo/textview.c: intellihancing
+
 Fri Mar 16 11:38:42 2001  Jonathan Blandford  <jrb@redhat.com>
 
 	* gtk/gtktreeview.c (gtk_tree_view_set_model): Fixed some
diff --git a/demos/gtk-demo/dialog.c b/demos/gtk-demo/dialog.c
index 0bcbb0103..e5ce1ef82 100644
--- a/demos/gtk-demo/dialog.c
+++ b/demos/gtk-demo/dialog.c
@@ -1,13 +1,13 @@
 /* Dialog and Message Boxes
  *
- * The Dialog Box widgets are used to pop up a transient window for user feedback.
+ * Dialog widgets are used to pop up a transient window for user feedback.
  */
 
 #include <gtk/gtk.h>
 
-GtkWidget *window = NULL;
-GtkWidget *entry1 = NULL;
-GtkWidget *entry2 = NULL;
+static GtkWidget *window = NULL;
+static GtkWidget *entry1 = NULL;
+static GtkWidget *entry2 = NULL;
 
 static void
 message_dialog_clicked (GtkButton *button, gpointer user_data)
diff --git a/demos/gtk-demo/main.c b/demos/gtk-demo/main.c
index 663537989..16b4ff6f3 100644
--- a/demos/gtk-demo/main.c
+++ b/demos/gtk-demo/main.c
@@ -438,17 +438,15 @@ main (int argc, char **argv)
 			    create_text (&source_buffer, TRUE),
 			    gtk_label_new ("Source"));
 
-  tag = gtk_text_buffer_create_tag (info_buffer, "title");
-  g_object_set (G_OBJECT (tag),
-                "font", "Sans 18",
-                NULL);
-
-  tag = gtk_text_buffer_create_tag (info_buffer, "source");
-  g_object_set (G_OBJECT (tag),
-                "font", "Courier 10",
-                "pixels_above_lines", 0,
-                "pixels_below_lines", 0,
-                NULL);
+  tag = gtk_text_buffer_create_tag (info_buffer, "title",
+                                    "font", "Sans 18",
+                                    NULL);
+
+  tag = gtk_text_buffer_create_tag (info_buffer, "source",
+                                    "font", "Courier 10",
+                                    "pixels_above_lines", 0,
+                                    "pixels_below_lines", 0,
+                                    NULL);
 
   gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
   gtk_widget_show_all (window);
diff --git a/demos/gtk-demo/textview.c b/demos/gtk-demo/textview.c
index b5d849c71..928df9073 100644
--- a/demos/gtk-demo/textview.c
+++ b/demos/gtk-demo/textview.c
@@ -48,7 +48,6 @@ static char gray50_bits[] = {
 static void
 create_tags (GtkTextBuffer *buffer)
 {
-  GtkTextTag *tag;
   GdkBitmap *stipple;
 
   /* Create a bunch of tags. Note that it's also possible to
@@ -64,91 +63,105 @@ create_tags (GtkTextBuffer *buffer)
    * new copies of the same tags for every buffer.
    *
    * Tags are assigned default priorities in order of addition to the
-   * tag table.  That is, tags created later that affect the same
-   * text property as an earlier tag will override the earlier tag.
-   * You can modify tag priorities with gtk_text_tag_set_priority().
+   * tag table.  That is, tags created later that affect the same text
+   * property affected by an earlier tag will override the earlier
+   * tag.  You can modify tag priorities with
+   * gtk_text_tag_set_priority().
    */
 
-  tag = gtk_text_buffer_create_tag (buffer, "italic");
-  g_object_set (G_OBJECT (tag), "style", PANGO_STYLE_ITALIC, NULL);
+  gtk_text_buffer_create_tag (buffer, "heading",
+                              "weight", PANGO_WEIGHT_BOLD,
+                              "size", 20 * PANGO_SCALE,
+                              NULL);
+  
+  gtk_text_buffer_create_tag (buffer, "italic",
+                              "style", PANGO_STYLE_ITALIC, NULL);
 
-  tag = gtk_text_buffer_create_tag (buffer, "bold");
-  g_object_set (G_OBJECT (tag), "weight", PANGO_WEIGHT_BOLD, NULL);  
+  gtk_text_buffer_create_tag (buffer, "bold",
+                              "weight", PANGO_WEIGHT_BOLD, NULL);  
+  
+  gtk_text_buffer_create_tag (buffer, "big",
+                              /* points times the PANGO_SCALE factor */
+                              "size", 30 * PANGO_SCALE, NULL);
 
-  tag = gtk_text_buffer_create_tag (buffer, "big");
-  /* 70 points times the PANGO_SCALE factor */
-  g_object_set (G_OBJECT (tag), "size", 45 * PANGO_SCALE, NULL);
+  gtk_text_buffer_create_tag (buffer, "monospace",
+                              "family", "monospace", NULL);
   
-  tag = gtk_text_buffer_create_tag (buffer, "blue_foreground");
-  g_object_set (G_OBJECT (tag), "foreground", "blue", NULL);  
+  gtk_text_buffer_create_tag (buffer, "blue_foreground",
+                              "foreground", "blue", NULL);  
 
-  tag = gtk_text_buffer_create_tag (buffer, "red_background");
-  g_object_set (G_OBJECT (tag), "background", "red", NULL);
+  gtk_text_buffer_create_tag (buffer, "red_background",
+                              "background", "red", NULL);
 
   stipple = gdk_bitmap_create_from_data (NULL,
                                          gray50_bits, gray50_width,
                                          gray50_height);
   
-  tag = gtk_text_buffer_create_tag (buffer, "background_stipple");
-  g_object_set (G_OBJECT (tag), "background_stipple", stipple, NULL);
+  gtk_text_buffer_create_tag (buffer, "background_stipple",
+                              "background_stipple", stipple, NULL);
 
-  tag = gtk_text_buffer_create_tag (buffer, "foreground_stipple");
-  g_object_set (G_OBJECT (tag), "foreground_stipple", stipple, NULL);
+  gtk_text_buffer_create_tag (buffer, "foreground_stipple",
+                              "foreground_stipple", stipple, NULL);
 
   g_object_unref (G_OBJECT (stipple));
 
-  tag = gtk_text_buffer_create_tag (buffer, "big_gap_before_line");
-  g_object_set (G_OBJECT (tag), "pixels_above_lines", 30, NULL);
+  gtk_text_buffer_create_tag (buffer, "big_gap_before_line",
+                              "pixels_above_lines", 30, NULL);
 
-  tag = gtk_text_buffer_create_tag (buffer, "big_gap_after_line");
-  g_object_set (G_OBJECT (tag), "pixels_below_lines", 30, NULL);
+  gtk_text_buffer_create_tag (buffer, "big_gap_after_line",
+                              "pixels_below_lines", 30, NULL);
 
-  tag = gtk_text_buffer_create_tag (buffer, "double_spaced_line");
-  g_object_set (G_OBJECT (tag), "pixels_inside_wrap", 10, NULL);
+  gtk_text_buffer_create_tag (buffer, "double_spaced_line",
+                              "pixels_inside_wrap", 10, NULL);
 
-  tag = gtk_text_buffer_create_tag (buffer, "not_editable");
-  g_object_set (G_OBJECT (tag), "editable", FALSE, NULL);
+  gtk_text_buffer_create_tag (buffer, "not_editable",
+                              "editable", FALSE, NULL);
   
-  tag = gtk_text_buffer_create_tag (buffer, "word_wrap");
-  g_object_set (G_OBJECT (tag), "wrap_mode", GTK_WRAP_WORD, NULL);
+  gtk_text_buffer_create_tag (buffer, "word_wrap",
+                              "wrap_mode", GTK_WRAP_WORD, NULL);
 
-  tag = gtk_text_buffer_create_tag (buffer, "char_wrap");
-  g_object_set (G_OBJECT (tag), "wrap_mode", GTK_WRAP_CHAR, NULL);
+  gtk_text_buffer_create_tag (buffer, "char_wrap",
+                              "wrap_mode", GTK_WRAP_CHAR, NULL);
 
-  tag = gtk_text_buffer_create_tag (buffer, "no_wrap");
-  g_object_set (G_OBJECT (tag), "wrap_mode", GTK_WRAP_NONE, NULL);
+  gtk_text_buffer_create_tag (buffer, "no_wrap",
+                              "wrap_mode", GTK_WRAP_NONE, NULL);
   
-  tag = gtk_text_buffer_create_tag (buffer, "center");
-  g_object_set (G_OBJECT (tag), "justification", GTK_JUSTIFY_CENTER, NULL);
-
-  tag = gtk_text_buffer_create_tag (buffer, "right_justify");
-  g_object_set (G_OBJECT (tag), "justification", GTK_JUSTIFY_RIGHT, NULL);
+  gtk_text_buffer_create_tag (buffer, "center",
+                              "justification", GTK_JUSTIFY_CENTER, NULL);
 
-  tag = gtk_text_buffer_create_tag (buffer, "wide_margins");
-  g_object_set (G_OBJECT (tag),
-                "left_margin", 50, "right_margin", 50,
-                NULL);
+  gtk_text_buffer_create_tag (buffer, "right_justify",
+                              "justification", GTK_JUSTIFY_RIGHT, NULL);
 
-  tag = gtk_text_buffer_create_tag (buffer, "strikethrough");
-  g_object_set (G_OBJECT (tag), "strikethrough", TRUE, NULL);
+  gtk_text_buffer_create_tag (buffer, "wide_margins",
+                              "left_margin", 50, "right_margin", 50,
+                              NULL);
   
-  tag = gtk_text_buffer_create_tag (buffer, "underline");
-  g_object_set (G_OBJECT (tag), "underline", PANGO_UNDERLINE_SINGLE, NULL);
+  gtk_text_buffer_create_tag (buffer, "strikethrough",
+                              "strikethrough", TRUE, NULL);
+  
+  gtk_text_buffer_create_tag (buffer, "underline",
+                              "underline", PANGO_UNDERLINE_SINGLE, NULL);
 
-  tag = gtk_text_buffer_create_tag (buffer, "double_underline");
-  g_object_set (G_OBJECT (tag), "underline", PANGO_UNDERLINE_DOUBLE, NULL);
+  gtk_text_buffer_create_tag (buffer, "double_underline",
+                              "underline", PANGO_UNDERLINE_DOUBLE, NULL);
 
-  tag = gtk_text_buffer_create_tag (buffer, "superscript");
-  g_object_set (G_OBJECT (tag),
-                "rise", 10 * PANGO_SCALE,   /* 10 pixels */
-                "size", 8 * PANGO_SCALE,    /* 8 points */
-                NULL);
+  gtk_text_buffer_create_tag (buffer, "superscript",
+                              "rise", 10 * PANGO_SCALE,   /* 10 pixels */
+                              "size", 8 * PANGO_SCALE,    /* 8 points */
+                              NULL);
   
-  tag = gtk_text_buffer_create_tag (buffer, "subscript");
-  g_object_set (G_OBJECT (tag),
-                "rise", -10 * PANGO_SCALE,   /* 10 pixels */
-                "size", 8 * PANGO_SCALE,     /* 8 points */
-                NULL); 
+  gtk_text_buffer_create_tag (buffer, "subscript",
+                              "rise", -10 * PANGO_SCALE,   /* 10 pixels */
+                              "size", 8 * PANGO_SCALE,     /* 8 points */
+                              NULL);
+
+  gtk_text_buffer_create_tag (buffer, "rtl_quote",
+                              "wrap_mode", GTK_WRAP_WORD,
+                              "direction", GTK_TEXT_DIR_RTL,
+                              "indent", 30,
+                              "left_margin", 20,
+                              "right_margin", 20,
+                              NULL);
 }
 
 static void
@@ -165,8 +178,11 @@ insert_text (GtkTextBuffer *buffer)
    */
   gtk_text_buffer_get_iter_at_offset (buffer, &iter, 0);
 
-  gtk_text_buffer_insert (buffer, &iter, "The text widget can display text with all kinds of nifty attributes.\n", -1);
+  gtk_text_buffer_insert (buffer, &iter, "The text widget can display text with all kinds of nifty attributes. It also supports multiple views of the same buffer; this demo is showing the same buffer in two places.\n\n", -1);
 
+  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter, "Font styles. ", -1,
+                                            "heading", NULL);
+  
   gtk_text_buffer_insert (buffer, &iter, "For example, you can have ", -1);
   gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
                                             "italic", -1,
@@ -175,13 +191,20 @@ insert_text (GtkTextBuffer *buffer)
   gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
                                             "bold", -1,
                                             "bold", NULL);
-  gtk_text_buffer_insert (buffer, &iter, ", or ", -1);  
+  gtk_text_buffer_insert (buffer, &iter, ", or ", -1);
   gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-                                            "huge", -1,
+                                            "monospace (typewriter)", -1,
+                                            "monospace", NULL);
+  gtk_text_buffer_insert (buffer, &iter, ", or ", -1);
+  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
+                                            "big", -1,
                                             "big", NULL);
-  gtk_text_buffer_insert (buffer, &iter, " text. ", -1);
+  gtk_text_buffer_insert (buffer, &iter, " text.\n\n", -1);
 
-  gtk_text_buffer_insert (buffer, &iter, "Also, colors such as ", -1);  
+  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter, "Colors. ", -1,
+                                            "heading", NULL);
+  
+  gtk_text_buffer_insert (buffer, &iter, "Colors such as ", -1);  
   gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
                                             "a blue foreground", -1,
                                             "blue_foreground", NULL);
@@ -203,8 +226,11 @@ insert_text (GtkTextBuffer *buffer)
                                             "red_background",
                                             "foreground_stipple",
                                             NULL);
-  gtk_text_buffer_insert (buffer, &iter, " (select that to read it) can be used.\n", -1);  
+  gtk_text_buffer_insert (buffer, &iter, " (select that to read it) can be used.\n\n", -1);  
 
+  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter, "Underline, strikethrough, and rise. ", -1,
+                                            "heading", NULL);
+  
   gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
                                             "Strikethrough", -1,
                                             "strikethrough", NULL);
@@ -224,40 +250,61 @@ insert_text (GtkTextBuffer *buffer)
   gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
                                             "subscript", -1,
                                             "subscript", NULL);
-  gtk_text_buffer_insert (buffer, &iter, ".\n", -1);
+  gtk_text_buffer_insert (buffer, &iter, " are all supported.\n\n", -1);
 
+  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter, "Images. ", -1,
+                                            "heading", NULL);
+  
   gtk_text_buffer_insert (buffer, &iter, "The buffer can have images in it: ", -1);
   gtk_text_buffer_insert_pixbuf (buffer, &iter, pixbuf);
   gtk_text_buffer_insert_pixbuf (buffer, &iter, pixbuf);
   gtk_text_buffer_insert_pixbuf (buffer, &iter, pixbuf);
-  gtk_text_buffer_insert (buffer, &iter, ".\n", -1);
+  gtk_text_buffer_insert (buffer, &iter, " for example.\n\n", -1);
+
+  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter, "Spacing. ", -1,
+                                            "heading", NULL);
+
+  gtk_text_buffer_insert (buffer, &iter, "You can adjust the amount of space before each line.\n", -1);
   
   gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-                                            "You can adjust the amount of space before each line; this line has a whole lot of space before it.\n", -1,
-                                            "big_gap_before_line", NULL);
+                                            "This line has a whole lot of space before it.\n", -1,
+                                            "big_gap_before_line", "wide_margins", NULL);
   gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
                                             "You can also adjust the amount of space after each line; this line has a whole lot of space after it.\n", -1,
-                                            "big_gap_after_line", NULL);
+                                            "big_gap_after_line", "wide_margins", NULL);
   
   gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-                                            "Of course you can also adjust the amount of space between wrapped lines; this line has extra space between each wrapped line.\n", -1,
-                                            "double_spaced_line", NULL);
+                                            "You can also adjust the amount of space between wrapped lines; this line has extra space between each wrapped line in the same paragraph. To show off wrapping, some filler text: the quick brown fox jumped over the lazy dog. Blah blah blah blah blah blah blah blah blah.\n", -1,
+                                            "double_spaced_line", "wide_margins", NULL);
 
+  gtk_text_buffer_insert (buffer, &iter, "Also note that those lines have extra-wide margins.\n\n", -1);
+
+  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter, "Editability. ", -1,
+                                            "heading", NULL);
   
   gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-                                            "This line is 'locked down' and can't be edited by the user - just try it! You can't delete this line.\n", -1,
+                                            "This line is 'locked down' and can't be edited by the user - just try it! You can't delete this line.\n\n", -1,
                                             "not_editable", NULL);
 
+  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter, "Wrapping. ", -1,
+                                            "heading", NULL);
+
+  gtk_text_buffer_insert (buffer, &iter,
+                          "This line (and most of the others in this buffer) is word-wrapped, using the proper Unicode algorithm. Word wrap should work in all scripts and languages that GTK+ supports. Let's make this a long paragraph to demonstrate: blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah\n\n", -1);  
+  
   gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-                                            "If char wrap worked, this line would be char wrapped, but since char wrap isn't yet implemented, this line will fall back to word wrap.\n", -1,
+                                            "This line has character-based wrapping, and can wrap between any two character glyphs. Let's make this a long paragraph to demonstrate: blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah blah\n\n", -1,
                                             "char_wrap", NULL);
-
+  
   gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-                                            "This line has all wrapping turned off, so it makes the horizontal scrollbar appear.\n", -1,
+                                            "This line has all wrapping turned off, so it makes the horizontal scrollbar appear.\n\n\n", -1,
                                             "no_wrap", NULL);
+
+  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter, "Justification. ", -1,
+                                            "heading", NULL);  
   
   gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-                                            "This line has center justification.\n", -1,
+                                            "\nThis line has center justification.\n", -1,
                                             "center", NULL);
 
   gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
@@ -265,10 +312,20 @@ insert_text (GtkTextBuffer *buffer)
                                             "right_justify", NULL);
 
   gtk_text_buffer_insert_with_tags_by_name (buffer, &iter,
-                                            "This line has big wide margins. Text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text.\n", -1,
-                                            "wide_margins", NULL);
+                                            "\nThis line has big wide margins. Text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text text.\n", -1,
+                                            "wide_margins", NULL);  
+
+  gtk_text_buffer_insert_with_tags_by_name (buffer, &iter, "Internationalization. ", -1,
+                                            "heading", NULL);
+          
+  gtk_text_buffer_insert (buffer, &iter,
+                          "You can put all sorts of Unicode text in the buffer.\n\nGerman (Deutsch Süd) Grüß Gott\nGreek (Ελληνικά) Γειά σας\nHebrew   שלום\nJapanese (日本語)\n\nThe widget properly handles bidirectional text, word wrapping, DOS/UNIX/Unicode paragraph separators, grapheme boundaries, and so on using the Pango internationalization framework.\n", -1);  
+
+      gtk_text_buffer_insert (buffer, &iter, "Here's a word-wrapped quote in a right-to-left language:\n", -1);
+      gtk_text_buffer_insert_with_tags_by_name (buffer, &iter, "وقد بدأ ثلاث من أكثر المؤسسات تقدما في شبكة اكسيون برامجها كمنظمات لا تسعى للربح، ثم تحولت في السنوات الخمس الماضية إلى مؤسسات مالية منظمة، وباتت جزءا من النظام المالي في بلدانها، ولكنها تتخصص في خدمة قطاع المشروعات الصغيرة. وأحد أكثر هذه المؤسسات نجاحا هو »بانكوسول« في بوليفيا.\n\n", -1,
+                                                "rtl_quote", NULL);
   
-  gtk_text_buffer_insert (buffer, &iter, "This demo doesn't even demonstrate all the GtkTextBuffer features; it leaves out, for example: invisible/hidden text, tab stops, application-drawn areas on the sides of the widget for displaying breakpoints and such...", -1);
+  gtk_text_buffer_insert (buffer, &iter, "\n\nThis demo doesn't demonstrate all the GtkTextBuffer features; it leaves out, for example: invisible/hidden text (doesn't work in GTK 2, but planned), tab stops, application-drawn areas on the sides of the widget for displaying breakpoints and such...", -1);
 
   /* Apply word_wrap tag to whole buffer */
   gtk_text_buffer_get_bounds (buffer, &start, &end);
@@ -292,7 +349,7 @@ do_textview (void)
       
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
       gtk_window_set_default_size (GTK_WINDOW (window),
-                                   300, 400);
+                                   450, 450);
       
       gtk_signal_connect (GTK_OBJECT (window), "destroy",
 			  GTK_SIGNAL_FUNC(gtk_widget_destroyed),
diff --git a/docs/reference/gtk/tmpl/gtktextbuffer.sgml b/docs/reference/gtk/tmpl/gtktextbuffer.sgml
index c9db05262..cfd32b85f 100644
--- a/docs/reference/gtk/tmpl/gtktextbuffer.sgml
+++ b/docs/reference/gtk/tmpl/gtktextbuffer.sgml
@@ -390,6 +390,8 @@ types related to the text widget and how they work together.
 
 @buffer: 
 @tag_name: 
+@first_property_name: 
+@Varargs: 
 @Returns: 
 
 
diff --git a/gtk/gtktextbuffer.c b/gtk/gtktextbuffer.c
index 669ef5b21..292e63ddc 100644
--- a/gtk/gtktextbuffer.c
+++ b/gtk/gtktextbuffer.c
@@ -26,6 +26,7 @@
 
 
 #include <string.h>
+#include <stdarg.h>
 
 #include "gtkclipboard.h"
 #include "gtkinvisible.h"
@@ -1888,6 +1889,9 @@ gtk_text_buffer_place_cursor (GtkTextBuffer     *buffer,
  * gtk_text_buffer_create_tag:
  * @buffer: a #GtkTextBuffer
  * @tag_name: name of the new tag, or %NULL
+ * @first_property_name: name of first property to set, or %NULL
+ * @Varargs: %NULL-terminated list of property names and values
+ *
  *
  * Creates a tag and adds it to the tag table for @buffer.
  * Equivalent to calling gtk_text_tag_new () and then adding the
@@ -1896,20 +1900,33 @@ gtk_text_buffer_place_cursor (GtkTextBuffer     *buffer,
  *
  * If @tag_name is %NULL, the tag is anonymous.
  *
+ * The @first_property_name argument and subsequent arguments are a list
+ * of properties to set on the tag, as with g_object_set().
+ *
  * Return value: a new tag
  **/
 GtkTextTag*
 gtk_text_buffer_create_tag (GtkTextBuffer *buffer,
-                            const gchar *tag_name)
+                            const gchar   *tag_name,
+                            const gchar   *first_property_name,
+                            ...)
 {
   GtkTextTag *tag;
-
+  va_list list;
+  
   g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), NULL);
 
   tag = gtk_text_tag_new (tag_name);
 
   gtk_text_tag_table_add (get_table (buffer), tag);
 
+  if (first_property_name)
+    {
+      va_start (list, first_property_name);
+      g_object_set_valist (G_OBJECT (tag), first_property_name, list);
+      va_end (list);
+    }
+  
   return tag;
 }
 
diff --git a/gtk/gtktextbuffer.h b/gtk/gtktextbuffer.h
index 85e42d08a..54f245e8a 100644
--- a/gtk/gtktextbuffer.h
+++ b/gtk/gtktextbuffer.h
@@ -271,9 +271,10 @@ void gtk_text_buffer_remove_tag_by_name    (GtkTextBuffer     *buffer,
 /* You can either ignore the return value, or use it to
  * set the attributes of the tag. tag_name can be NULL
  */
-/* FIXME this should take a varargs list of tag attributes I think */
 GtkTextTag    *gtk_text_buffer_create_tag (GtkTextBuffer *buffer,
-                                           const gchar   *tag_name);
+                                           const gchar   *tag_name,
+                                           const gchar   *first_property_name,
+                                           ...);
 
 /* Obtain iterators pointed at various places, then you can move the
    iterator around using the GtkTextIter operators */
diff --git a/gtk/gtktexttag.c b/gtk/gtktexttag.c
index ecdbf1cb8..3e48be334 100644
--- a/gtk/gtktexttag.c
+++ b/gtk/gtktexttag.c
@@ -837,7 +837,7 @@ gtk_text_tag_set_property (GObject      *object,
 
     case PROP_BACKGROUND_STIPPLE:
       {
-        GdkBitmap *bitmap = g_value_get_boxed (value);
+        GdkBitmap *bitmap = g_value_get_object (value);
 
         text_tag->bg_stipple_set = TRUE;
         g_object_notify (G_OBJECT (text_tag), "background_stipple_set");
@@ -857,7 +857,7 @@ gtk_text_tag_set_property (GObject      *object,
 
     case PROP_FOREGROUND_STIPPLE:
       {
-        GdkBitmap *bitmap = g_value_get_boxed (value);
+        GdkBitmap *bitmap = g_value_get_object (value);
 
         text_tag->fg_stipple_set = TRUE;
         g_object_notify (G_OBJECT (text_tag), "foreground_stipple_set");
diff --git a/gtk/testtext.c b/gtk/testtext.c
index 1969589f1..51b03d244 100644
--- a/gtk/testtext.c
+++ b/gtk/testtext.c
@@ -434,7 +434,7 @@ fill_example_buffer (GtkTextBuffer *buffer)
    * we try to create tags a second time.
    */
   
-  tag = gtk_text_buffer_create_tag (buffer, "fg_blue");
+  tag = gtk_text_buffer_create_tag (buffer, "fg_blue", NULL);
 
   /*       gtk_timeout_add (1000, blink_timeout, tag); */
       
@@ -446,23 +446,23 @@ fill_example_buffer (GtkTextBuffer *buffer)
   color2.blue = 0x0;
   color2.green = 0;
   g_object_set (G_OBJECT (tag),
-		 "foreground_gdk", &color,
-		 "background_gdk", &color2,
-                  "size_points", 24.0,
-		 NULL);
+                "foreground_gdk", &color,
+                "background_gdk", &color2,
+                "size_points", 24.0,
+                NULL);
 
-  tag = gtk_text_buffer_create_tag (buffer, "fg_red");
+  tag = gtk_text_buffer_create_tag (buffer, "fg_red", NULL);
 
   setup_tag (tag);
       
   color.blue = color.green = 0;
   color.red = 0xffff;
   g_object_set (G_OBJECT (tag),
-		 "rise", -4 * PANGO_SCALE,
-		 "foreground_gdk", &color,
-		 NULL);
+                "rise", -4 * PANGO_SCALE,
+                "foreground_gdk", &color,
+                NULL);
 
-  tag = gtk_text_buffer_create_tag (buffer, "bg_green");
+  tag = gtk_text_buffer_create_tag (buffer, "bg_green", NULL);
 
   setup_tag (tag);
       
@@ -473,7 +473,7 @@ fill_example_buffer (GtkTextBuffer *buffer)
                 "size_points", 10.0,
                 NULL);
 
-  tag = gtk_text_buffer_create_tag (buffer, "strikethrough");
+  tag = gtk_text_buffer_create_tag (buffer, "strikethrough", NULL);
 
   setup_tag (tag);
       
@@ -482,7 +482,7 @@ fill_example_buffer (GtkTextBuffer *buffer)
                 NULL);
 
 
-  tag = gtk_text_buffer_create_tag (buffer, "underline");
+  tag = gtk_text_buffer_create_tag (buffer, "underline", NULL);
 
   setup_tag (tag);
       
@@ -496,13 +496,13 @@ fill_example_buffer (GtkTextBuffer *buffer)
                 "underline", PANGO_UNDERLINE_SINGLE,
                 NULL);
 
-  tag = gtk_text_buffer_create_tag (buffer, "centered");
+  tag = gtk_text_buffer_create_tag (buffer, "centered", NULL);
       
   g_object_set (G_OBJECT (tag),
                 "justification", GTK_JUSTIFY_CENTER,
                 NULL);
 
-  tag = gtk_text_buffer_create_tag (buffer, "rtl_quote");
+  tag = gtk_text_buffer_create_tag (buffer, "rtl_quote", NULL);
       
   g_object_set (G_OBJECT (tag),
                 "wrap_mode", GTK_WRAP_WORD,
@@ -1413,26 +1413,23 @@ create_buffer (void)
     {
       GtkTextTag *tag;
 
-      tag = gtk_text_buffer_create_tag (buffer->buffer, NULL);
+      tag = gtk_text_buffer_create_tag (buffer->buffer, NULL, NULL);
       
       buffer->color_tags = g_slist_prepend (buffer->color_tags, tag);
       
       ++i;
     }
   
-  buffer->invisible_tag = gtk_text_buffer_create_tag (buffer->buffer, NULL);
-  g_object_set (G_OBJECT (buffer->invisible_tag),
-                  "invisible", TRUE,
-                  NULL);
+  buffer->invisible_tag = gtk_text_buffer_create_tag (buffer->buffer, NULL,
+                                                      "invisible", TRUE);
   
-  buffer->not_editable_tag = gtk_text_buffer_create_tag (buffer->buffer, NULL);
-  g_object_set (G_OBJECT (buffer->not_editable_tag),
-                  "editable", FALSE,
-                  "foreground", "purple", NULL);
+  buffer->not_editable_tag =
+    gtk_text_buffer_create_tag (buffer->buffer, NULL,
+                                "editable", FALSE,
+                                "foreground", "purple", NULL);
 
-  buffer->found_text_tag = gtk_text_buffer_create_tag (buffer->buffer, NULL);
-  g_object_set (G_OBJECT (buffer->found_text_tag),
-                  "foreground", "red", NULL);
+  buffer->found_text_tag = gtk_text_buffer_create_tag (buffer->buffer, NULL,
+                                                       "foreground", "red", NULL);
 
   tabs = pango_tab_array_new_with_positions (4,
                                              TRUE,
@@ -1441,10 +1438,9 @@ create_buffer (void)
                                              PANGO_TAB_LEFT, 60,
                                              PANGO_TAB_LEFT, 120);
   
-  buffer->custom_tabs_tag = gtk_text_buffer_create_tag (buffer->buffer, NULL);
-  g_object_set (G_OBJECT (buffer->custom_tabs_tag),
-                  "tabs", tabs,
-                  "foreground", "green", NULL);
+  buffer->custom_tabs_tag = gtk_text_buffer_create_tag (buffer->buffer, NULL,
+                                                        "tabs", tabs,
+                                                        "foreground", "green", NULL);
 
   pango_tab_array_free (tabs);
   
diff --git a/gtk/testtextbuffer.c b/gtk/testtextbuffer.c
index 0d42dcb19..bc94c69c4 100644
--- a/gtk/testtextbuffer.c
+++ b/gtk/testtextbuffer.c
@@ -585,36 +585,33 @@ fill_buffer (GtkTextBuffer *buffer)
   GdkPixbuf *pixbuf;
   int i;
 
-  tag = gtk_text_buffer_create_tag (buffer, "fg_blue");
-
   color.red = color.green = 0;
   color.blue = 0xffff;
   color2.red = 0xfff;
   color2.blue = 0x0;
   color2.green = 0;
-  g_object_set (G_OBJECT (tag),
-                "foreground_gdk", &color,
-                "background_gdk", &color2,
-                "font", "-*-courier-bold-r-*-*-30-*-*-*-*-*-*-*",
-                NULL);
-
-  tag = gtk_text_buffer_create_tag (buffer, "fg_red");
+  
+  gtk_text_buffer_create_tag (buffer, "fg_blue",
+                              "foreground_gdk", &color,
+                              "background_gdk", &color2,
+                              "font", "-*-courier-bold-r-*-*-30-*-*-*-*-*-*-*",
+                              NULL);
 
   color.blue = color.green = 0;
   color.red = 0xffff;
-  g_object_set (G_OBJECT (tag),
-                "rise", -4,
-                "foreground_gdk", &color,
-                NULL);
-
-  tag = gtk_text_buffer_create_tag (buffer, "bg_green");
+  
+  gtk_text_buffer_create_tag (buffer, "fg_red",
+                              "rise", -4,
+                              "foreground_gdk", &color,
+                              NULL);
 
   color.blue = color.red = 0;
   color.green = 0xffff;
-  g_object_set (G_OBJECT (tag),
-                "background_gdk", &color,
-                "font", "-*-courier-bold-r-*-*-10-*-*-*-*-*-*-*",
-                NULL);
+  
+  gtk_text_buffer_create_tag (buffer, "bg_green",
+                              "background_gdk", &color,
+                              "font", "-*-courier-bold-r-*-*-10-*-*-*-*-*-*-*",
+                              NULL);
 
   pixbuf = gdk_pixbuf_new_from_xpm_data (book_closed_xpm);
 
@@ -708,13 +705,13 @@ fill_buffer (GtkTextBuffer *buffer)
   /* Put in tags that are just at the beginning, and just near the end,
    * and just near the middle.
    */
-  tag = gtk_text_buffer_create_tag (buffer, "front_tag");
+  tag = gtk_text_buffer_create_tag (buffer, "front_tag", NULL);
   gtk_text_buffer_get_iter_at_offset (buffer, &iter, 3);
   gtk_text_buffer_get_iter_at_offset (buffer, &iter2, 300);
 
   gtk_text_buffer_apply_tag (buffer, tag, &iter, &iter2);  
   
-  tag = gtk_text_buffer_create_tag (buffer, "end_tag");
+  tag = gtk_text_buffer_create_tag (buffer, "end_tag", NULL);
   gtk_text_buffer_get_end_iter (buffer, &iter2);
   gtk_text_iter_backward_chars (&iter2, 12);
   iter = iter2;
@@ -722,7 +719,7 @@ fill_buffer (GtkTextBuffer *buffer)
 
   gtk_text_buffer_apply_tag (buffer, tag, &iter, &iter2);
   
-  tag = gtk_text_buffer_create_tag (buffer, "center_tag");
+  tag = gtk_text_buffer_create_tag (buffer, "center_tag", NULL);
   gtk_text_buffer_get_iter_at_offset (buffer, &iter,
                                       gtk_text_buffer_get_char_count (buffer)/2);
   gtk_text_iter_backward_chars (&iter, 37);
diff --git a/tests/testtext.c b/tests/testtext.c
index 1969589f1..51b03d244 100644
--- a/tests/testtext.c
+++ b/tests/testtext.c
@@ -434,7 +434,7 @@ fill_example_buffer (GtkTextBuffer *buffer)
    * we try to create tags a second time.
    */
   
-  tag = gtk_text_buffer_create_tag (buffer, "fg_blue");
+  tag = gtk_text_buffer_create_tag (buffer, "fg_blue", NULL);
 
   /*       gtk_timeout_add (1000, blink_timeout, tag); */
       
@@ -446,23 +446,23 @@ fill_example_buffer (GtkTextBuffer *buffer)
   color2.blue = 0x0;
   color2.green = 0;
   g_object_set (G_OBJECT (tag),
-		 "foreground_gdk", &color,
-		 "background_gdk", &color2,
-                  "size_points", 24.0,
-		 NULL);
+                "foreground_gdk", &color,
+                "background_gdk", &color2,
+                "size_points", 24.0,
+                NULL);
 
-  tag = gtk_text_buffer_create_tag (buffer, "fg_red");
+  tag = gtk_text_buffer_create_tag (buffer, "fg_red", NULL);
 
   setup_tag (tag);
       
   color.blue = color.green = 0;
   color.red = 0xffff;
   g_object_set (G_OBJECT (tag),
-		 "rise", -4 * PANGO_SCALE,
-		 "foreground_gdk", &color,
-		 NULL);
+                "rise", -4 * PANGO_SCALE,
+                "foreground_gdk", &color,
+                NULL);
 
-  tag = gtk_text_buffer_create_tag (buffer, "bg_green");
+  tag = gtk_text_buffer_create_tag (buffer, "bg_green", NULL);
 
   setup_tag (tag);
       
@@ -473,7 +473,7 @@ fill_example_buffer (GtkTextBuffer *buffer)
                 "size_points", 10.0,
                 NULL);
 
-  tag = gtk_text_buffer_create_tag (buffer, "strikethrough");
+  tag = gtk_text_buffer_create_tag (buffer, "strikethrough", NULL);
 
   setup_tag (tag);
       
@@ -482,7 +482,7 @@ fill_example_buffer (GtkTextBuffer *buffer)
                 NULL);
 
 
-  tag = gtk_text_buffer_create_tag (buffer, "underline");
+  tag = gtk_text_buffer_create_tag (buffer, "underline", NULL);
 
   setup_tag (tag);
       
@@ -496,13 +496,13 @@ fill_example_buffer (GtkTextBuffer *buffer)
                 "underline", PANGO_UNDERLINE_SINGLE,
                 NULL);
 
-  tag = gtk_text_buffer_create_tag (buffer, "centered");
+  tag = gtk_text_buffer_create_tag (buffer, "centered", NULL);
       
   g_object_set (G_OBJECT (tag),
                 "justification", GTK_JUSTIFY_CENTER,
                 NULL);
 
-  tag = gtk_text_buffer_create_tag (buffer, "rtl_quote");
+  tag = gtk_text_buffer_create_tag (buffer, "rtl_quote", NULL);
       
   g_object_set (G_OBJECT (tag),
                 "wrap_mode", GTK_WRAP_WORD,
@@ -1413,26 +1413,23 @@ create_buffer (void)
     {
       GtkTextTag *tag;
 
-      tag = gtk_text_buffer_create_tag (buffer->buffer, NULL);
+      tag = gtk_text_buffer_create_tag (buffer->buffer, NULL, NULL);
       
       buffer->color_tags = g_slist_prepend (buffer->color_tags, tag);
       
       ++i;
     }
   
-  buffer->invisible_tag = gtk_text_buffer_create_tag (buffer->buffer, NULL);
-  g_object_set (G_OBJECT (buffer->invisible_tag),
-                  "invisible", TRUE,
-                  NULL);
+  buffer->invisible_tag = gtk_text_buffer_create_tag (buffer->buffer, NULL,
+                                                      "invisible", TRUE);
   
-  buffer->not_editable_tag = gtk_text_buffer_create_tag (buffer->buffer, NULL);
-  g_object_set (G_OBJECT (buffer->not_editable_tag),
-                  "editable", FALSE,
-                  "foreground", "purple", NULL);
+  buffer->not_editable_tag =
+    gtk_text_buffer_create_tag (buffer->buffer, NULL,
+                                "editable", FALSE,
+                                "foreground", "purple", NULL);
 
-  buffer->found_text_tag = gtk_text_buffer_create_tag (buffer->buffer, NULL);
-  g_object_set (G_OBJECT (buffer->found_text_tag),
-                  "foreground", "red", NULL);
+  buffer->found_text_tag = gtk_text_buffer_create_tag (buffer->buffer, NULL,
+                                                       "foreground", "red", NULL);
 
   tabs = pango_tab_array_new_with_positions (4,
                                              TRUE,
@@ -1441,10 +1438,9 @@ create_buffer (void)
                                              PANGO_TAB_LEFT, 60,
                                              PANGO_TAB_LEFT, 120);
   
-  buffer->custom_tabs_tag = gtk_text_buffer_create_tag (buffer->buffer, NULL);
-  g_object_set (G_OBJECT (buffer->custom_tabs_tag),
-                  "tabs", tabs,
-                  "foreground", "green", NULL);
+  buffer->custom_tabs_tag = gtk_text_buffer_create_tag (buffer->buffer, NULL,
+                                                        "tabs", tabs,
+                                                        "foreground", "green", NULL);
 
   pango_tab_array_free (tabs);
   
diff --git a/tests/testtextbuffer.c b/tests/testtextbuffer.c
index 0d42dcb19..bc94c69c4 100644
--- a/tests/testtextbuffer.c
+++ b/tests/testtextbuffer.c
@@ -585,36 +585,33 @@ fill_buffer (GtkTextBuffer *buffer)
   GdkPixbuf *pixbuf;
   int i;
 
-  tag = gtk_text_buffer_create_tag (buffer, "fg_blue");
-
   color.red = color.green = 0;
   color.blue = 0xffff;
   color2.red = 0xfff;
   color2.blue = 0x0;
   color2.green = 0;
-  g_object_set (G_OBJECT (tag),
-                "foreground_gdk", &color,
-                "background_gdk", &color2,
-                "font", "-*-courier-bold-r-*-*-30-*-*-*-*-*-*-*",
-                NULL);
-
-  tag = gtk_text_buffer_create_tag (buffer, "fg_red");
+  
+  gtk_text_buffer_create_tag (buffer, "fg_blue",
+                              "foreground_gdk", &color,
+                              "background_gdk", &color2,
+                              "font", "-*-courier-bold-r-*-*-30-*-*-*-*-*-*-*",
+                              NULL);
 
   color.blue = color.green = 0;
   color.red = 0xffff;
-  g_object_set (G_OBJECT (tag),
-                "rise", -4,
-                "foreground_gdk", &color,
-                NULL);
-
-  tag = gtk_text_buffer_create_tag (buffer, "bg_green");
+  
+  gtk_text_buffer_create_tag (buffer, "fg_red",
+                              "rise", -4,
+                              "foreground_gdk", &color,
+                              NULL);
 
   color.blue = color.red = 0;
   color.green = 0xffff;
-  g_object_set (G_OBJECT (tag),
-                "background_gdk", &color,
-                "font", "-*-courier-bold-r-*-*-10-*-*-*-*-*-*-*",
-                NULL);
+  
+  gtk_text_buffer_create_tag (buffer, "bg_green",
+                              "background_gdk", &color,
+                              "font", "-*-courier-bold-r-*-*-10-*-*-*-*-*-*-*",
+                              NULL);
 
   pixbuf = gdk_pixbuf_new_from_xpm_data (book_closed_xpm);
 
@@ -708,13 +705,13 @@ fill_buffer (GtkTextBuffer *buffer)
   /* Put in tags that are just at the beginning, and just near the end,
    * and just near the middle.
    */
-  tag = gtk_text_buffer_create_tag (buffer, "front_tag");
+  tag = gtk_text_buffer_create_tag (buffer, "front_tag", NULL);
   gtk_text_buffer_get_iter_at_offset (buffer, &iter, 3);
   gtk_text_buffer_get_iter_at_offset (buffer, &iter2, 300);
 
   gtk_text_buffer_apply_tag (buffer, tag, &iter, &iter2);  
   
-  tag = gtk_text_buffer_create_tag (buffer, "end_tag");
+  tag = gtk_text_buffer_create_tag (buffer, "end_tag", NULL);
   gtk_text_buffer_get_end_iter (buffer, &iter2);
   gtk_text_iter_backward_chars (&iter2, 12);
   iter = iter2;
@@ -722,7 +719,7 @@ fill_buffer (GtkTextBuffer *buffer)
 
   gtk_text_buffer_apply_tag (buffer, tag, &iter, &iter2);
   
-  tag = gtk_text_buffer_create_tag (buffer, "center_tag");
+  tag = gtk_text_buffer_create_tag (buffer, "center_tag", NULL);
   gtk_text_buffer_get_iter_at_offset (buffer, &iter,
                                       gtk_text_buffer_get_char_count (buffer)/2);
   gtk_text_iter_backward_chars (&iter, 37);