Author: rmottola
Date: Wed Jul 20 01:03:08 2016
New Revision: 40028
URL: http://svn.gna.org/viewcvs/gnustep?rev=40028&view=rev
Log:
If we have no face set, don't append null
Modified:
libs/gui/trunk/ChangeLog
libs/gui/trunk/Source/NSFontDescriptor.m
Modified: libs/gui/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/ChangeLog?rev=40028&r1=40027&r2=40028&view=diff
==============================================================================
--- libs/gui/trunk/ChangeLog (original)
+++ libs/gui/trunk/ChangeLog Wed Jul 20 01:03:08 2016
@@ -1,3 +1,8 @@
+2016-07-19 Riccardo Mottola <r...@gnu.org>
+
+ * Source/NSFontDescriptor.m
+ If we have no face set, don't append null
+
2016-07-18 11:59-EDT Gregory John Casamento <greg.casame...@gmail.com>
* Source/NSView.m: Move to new branch.
Modified: libs/gui/trunk/Source/NSFontDescriptor.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/Source/NSFontDescriptor.m?rev=40028&r1=40027&r2=40028&view=diff
==============================================================================
--- libs/gui/trunk/Source/NSFontDescriptor.m (original)
+++ libs/gui/trunk/Source/NSFontDescriptor.m Wed Jul 20 01:03:08 2016
@@ -2,7 +2,7 @@
<abstract>The font descriptor class</abstract>
- Copyright (C) 2007 Free Software Foundation, Inc.
+ Copyright (C) 2007-2016 Free Software Foundation, Inc.
Author: H. Nikolaus Schaller <h...@computer.org>
Date: 2006
@@ -268,7 +268,7 @@
withString: @""
options: 0
range: NSMakeRange(0, [family length])];
- if ([face isEqualToString: @"Regular"])
+ if (!face || [face isEqualToString: @"Regular"])
return family;
return [NSString stringWithFormat: @"%@-%@", family, face];
}
_______________________________________________
Gnustep-cvs mailing list
Gnustep-cvs@gna.org
https://mail.gna.org/listinfo/gnustep-cvs
