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

is completely useless now...)
                                        -owt

8 files changed, 29 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 245a999cb0..9d9148304d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,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.
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 245a999cb0..9d9148304d 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,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.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 245a999cb0..9d9148304d 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,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.
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 245a999cb0..9d9148304d 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,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.
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 245a999cb0..9d9148304d 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,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.
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 245a999cb0..9d9148304d 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,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.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 245a999cb0..9d9148304d 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,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.
diff --git a/gdk/gdkgc.c b/gdk/gdkgc.c
index 3dc11ce6cc..8ee9fdc359 100644
--- a/gdk/gdkgc.c
+++ b/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);
 
-  gc_private = (GdkGCPrivate*) gc;
-  font_private = (GdkFontPrivate*) font;
-
-  XSetFont (gc_private->xdisplay, gc_private->xgc,
-	    ((XFontStruct *) font_private->xfont)->fid);
+  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