Ignore gdk_gc_set_font if font is a fontset. (Actually, gdk_gc_set_font

is completely useless now...)
                                        -owt

ChangeLog

+Thu Dec 4 1997 Owen Taylor <owt1@cornell.edu>
+	* gdk/gdkgc.c: Ignore gdk_gc_set_font if font is a fontset.
+
 Wed Dec 3 1997 Jay Painter <jpaint@serv.net>
 	* gtk/gtkstyle.c: fixed a problem introduced recently in 
 	gtk_style_detach witch crashed script_fu.

ChangeLog.pre-2-0

+Thu Dec 4 1997 Owen Taylor <owt1@cornell.edu>
+	* gdk/gdkgc.c: Ignore gdk_gc_set_font if font is a fontset.
+
 Wed Dec 3 1997 Jay Painter <jpaint@serv.net>
 	* gtk/gtkstyle.c: fixed a problem introduced recently in 
 	gtk_style_detach witch crashed script_fu.

ChangeLog.pre-2-10

+Thu Dec 4 1997 Owen Taylor <owt1@cornell.edu>
+	* gdk/gdkgc.c: Ignore gdk_gc_set_font if font is a fontset.
+
 Wed Dec 3 1997 Jay Painter <jpaint@serv.net>
 	* gtk/gtkstyle.c: fixed a problem introduced recently in 
 	gtk_style_detach witch crashed script_fu.

ChangeLog.pre-2-2

+Thu Dec 4 1997 Owen Taylor <owt1@cornell.edu>
+	* gdk/gdkgc.c: Ignore gdk_gc_set_font if font is a fontset.
+
 Wed Dec 3 1997 Jay Painter <jpaint@serv.net>
 	* gtk/gtkstyle.c: fixed a problem introduced recently in 
 	gtk_style_detach witch crashed script_fu.

ChangeLog.pre-2-4

+Thu Dec 4 1997 Owen Taylor <owt1@cornell.edu>
+	* gdk/gdkgc.c: Ignore gdk_gc_set_font if font is a fontset.
+
 Wed Dec 3 1997 Jay Painter <jpaint@serv.net>
 	* gtk/gtkstyle.c: fixed a problem introduced recently in 
 	gtk_style_detach witch crashed script_fu.

ChangeLog.pre-2-6

+Thu Dec 4 1997 Owen Taylor <owt1@cornell.edu>
+	* gdk/gdkgc.c: Ignore gdk_gc_set_font if font is a fontset.
+
 Wed Dec 3 1997 Jay Painter <jpaint@serv.net>
 	* gtk/gtkstyle.c: fixed a problem introduced recently in 
 	gtk_style_detach witch crashed script_fu.

ChangeLog.pre-2-8

+Thu Dec 4 1997 Owen Taylor <owt1@cornell.edu>
+	* gdk/gdkgc.c: Ignore gdk_gc_set_font if font is a fontset.
+
 Wed Dec 3 1997 Jay Painter <jpaint@serv.net>
 	* gtk/gtkstyle.c: fixed a problem introduced recently in 
 	gtk_style_detach witch crashed script_fu.

gdk/gdkgc.c

@@ -371,11 +371,14 @@ gdk_gc_set_font (GdkGC   *gc,
   g_return_if_fail (gc != NULL);
   g_return_if_fail (font != NULL);
 
+  if (font->type == GDK_FONT_FONT)
+    {
       gc_private = (GdkGCPrivate*) gc;
       font_private = (GdkFontPrivate*) font;
       
       XSetFont (gc_private->xdisplay, gc_private->xgc,
 		((XFontStruct *) font_private->xfont)->fid);
+    }
 }
 
 void