Wed, 21 Oct 1998 19:29:03 +0200 Paolo Molaro <lupus@debian.org>

Wed, 21 Oct 1998 19:29:03 +0200 Paolo Molaro <lupus@debian.org>

	* gdk/gdkps.c: fixed silly error.
	* gtk/testps.c: test for string length (X<->PS).

9 files changed, 39 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 327f4a8edb..ee92e0eab5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed, 21 Oct 1998 19:29:03 +0200 Paolo Molaro <lupus@debian.org>
+
+	* gdk/gdkps.c: fixed silly error.
+	* gtk/testps.c: test for string length (X<->PS).
+	
 Wed, 21 Oct 1998 19:10:02 +0200 Paolo Molaro <lupus@debian.org>
 
 	* gdk/gdkps.c: better guessing of postscript font name.
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 327f4a8edb..ee92e0eab5 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Wed, 21 Oct 1998 19:29:03 +0200 Paolo Molaro <lupus@debian.org>
+
+	* gdk/gdkps.c: fixed silly error.
+	* gtk/testps.c: test for string length (X<->PS).
+	
 Wed, 21 Oct 1998 19:10:02 +0200 Paolo Molaro <lupus@debian.org>
 
 	* gdk/gdkps.c: better guessing of postscript font name.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 327f4a8edb..ee92e0eab5 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Wed, 21 Oct 1998 19:29:03 +0200 Paolo Molaro <lupus@debian.org>
+
+	* gdk/gdkps.c: fixed silly error.
+	* gtk/testps.c: test for string length (X<->PS).
+	
 Wed, 21 Oct 1998 19:10:02 +0200 Paolo Molaro <lupus@debian.org>
 
 	* gdk/gdkps.c: better guessing of postscript font name.
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 327f4a8edb..ee92e0eab5 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Wed, 21 Oct 1998 19:29:03 +0200 Paolo Molaro <lupus@debian.org>
+
+	* gdk/gdkps.c: fixed silly error.
+	* gtk/testps.c: test for string length (X<->PS).
+	
 Wed, 21 Oct 1998 19:10:02 +0200 Paolo Molaro <lupus@debian.org>
 
 	* gdk/gdkps.c: better guessing of postscript font name.
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 327f4a8edb..ee92e0eab5 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Wed, 21 Oct 1998 19:29:03 +0200 Paolo Molaro <lupus@debian.org>
+
+	* gdk/gdkps.c: fixed silly error.
+	* gtk/testps.c: test for string length (X<->PS).
+	
 Wed, 21 Oct 1998 19:10:02 +0200 Paolo Molaro <lupus@debian.org>
 
 	* gdk/gdkps.c: better guessing of postscript font name.
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 327f4a8edb..ee92e0eab5 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Wed, 21 Oct 1998 19:29:03 +0200 Paolo Molaro <lupus@debian.org>
+
+	* gdk/gdkps.c: fixed silly error.
+	* gtk/testps.c: test for string length (X<->PS).
+	
 Wed, 21 Oct 1998 19:10:02 +0200 Paolo Molaro <lupus@debian.org>
 
 	* gdk/gdkps.c: better guessing of postscript font name.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 327f4a8edb..ee92e0eab5 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Wed, 21 Oct 1998 19:29:03 +0200 Paolo Molaro <lupus@debian.org>
+
+	* gdk/gdkps.c: fixed silly error.
+	* gtk/testps.c: test for string length (X<->PS).
+	
 Wed, 21 Oct 1998 19:10:02 +0200 Paolo Molaro <lupus@debian.org>
 
 	* gdk/gdkps.c: better guessing of postscript font name.
diff --git a/gdk/gdkps.c b/gdk/gdkps.c
index c3f1c1d649..bdb4aae1d8 100644
--- a/gdk/gdkps.c
+++ b/gdk/gdkps.c
@@ -721,7 +721,7 @@ ps_out_font(GdkPsDrawable* d, GdkFont* font, GdkGC* gc) {
 	} else if ( (face = XInternAtom(fp->xdisplay, "_DEC_DEVICE_FONTNAMES", True)) != None ) {
 		if (XGetFontProperty(fp->xfont, face, &value)) {
 			pname = XGetAtomName(fp->xdisplay, value);
-			if ( (psname=ststr(pname, "PS=")) )
+			if ( pname && (psname=strstr(pname, "PS=")) )
 				psname = psname+3;
 		}
 	} else if ( (face = XInternAtom(fp->xdisplay, "FACE", True)) != None ) {
diff --git a/gtk/testps.c b/gtk/testps.c
index fc9d928edd..a328200232 100644
--- a/gtk/testps.c
+++ b/gtk/testps.c
@@ -91,6 +91,7 @@ void page3(GdkDrawable* d, int print) {
 	GdkRectangle clip2 = {150, 150, 200, 100};
 	GdkRegion *region1;
 	GdkRegion *region2;
+	gint len;
 
 	region1 = gdk_region_new();
 	region2 = gdk_region_union_with_rect(region1, &clip1);
@@ -115,6 +116,8 @@ void page3(GdkDrawable* d, int print) {
 	gdk_draw_string(d, font, gc, 50, fsize*3, "Third line");
 	gdk_draw_string(d, font, gc, 50, fsize*4, "Fourth line");
 	gdk_draw_string(d, font, gc, 50, fsize*5, "Fifth line");
+	len = gdk_string_width(font, "Fifth line");
+	gdk_draw_string(d, font, gc, 50+len, fsize*5, "This continues right after line");
 	if (print)
 		gdk_ps_drawable_page_end(d);
 	else {