Update ignore, add installer to the backend

Author: gcasa

.gitignore

@@ -14,3 +14,4 @@ Source/config.h
 Source/libgnustep*Info.plist
 Tools/XGCommonFont.m
 Tools/xdnd.c
+*~

Headers/fontconfig/FCFontAssetInstaller.h

@@ -26,18 +26,9 @@
 #define FCFONTASSETINSTALLER_H
 
 #import <Foundation/NSObject.h>
+#import <GNUstepGUI/GSFontAssetInstaller.h>
 
-@interface FCFontAssetInstaller : NSObject
-{
-  NSString *_fontPath;
-}
-
-- (instancetype) initWithFontPath: (NSString *)path;
-- (BOOL) validateFontError: (NSError **)error;
-- (BOOL) installFontError: (NSError **)error;
-- (NSString *) systemFontsDirectory;
-- (NSString *) userFontsDirectory;
-
+@interface FCFontAssetInstaller : GSFontAssetInstaller
 @end
 
 #endif

Source/cairo/CairoContext.m

@@ -36,6 +36,8 @@
 #include "cairo/CairoPDFSurface.h"
 #include "cairo/CairoFontInfo.h"
 #include "cairo/CairoFontEnumerator.h"
+#include "cairo/CairoFontAssetInstaller.h"
+
 #include "config.h"
 
 #define CGSTATE ((CairoGState *)gstate)
@@ -88,6 +90,7 @@ + (void) initializeBackend
 
   [GSFontEnumerator setDefaultClass: [CairoFontEnumerator class]];
   [GSFontInfo setDefaultClass: [CairoFontInfo class]];
+  [GSFontAssetInstaller setDefaultClass: [CairoFontAssetInstaller class]];
 }
 
 + (Class) GStateClass

Source/cairo/GNUmakefile

@@ -34,6 +34,7 @@ cairo_OBJC_FILES = CairoSurface.m \
   CairoGState.m \
   CairoContext.m \
   CairoFontEnumerator.m \
+  CairoFontAssetInstaller.m \
   CairoFaceInfo.m \
   CairoPSSurface.m \
   CairoPDFSurface.m \

Source/fontconfig/FCFontAssetInstaller.m

@@ -244,8 +244,8 @@ - (NSString *) userFontsDirectory
       if ([osName isEqualToString: @"NSWindowsNTOperatingSystem"]
 	  || [osName isEqualToString: @"NSWindows95OperatingSystem"])
 	{
-	  NSString *winDir = [NSString stringWithUTF8String: getenv("USERPROFILE")];
-	  fontsPath = [winDir stringByAppendingPathComponent: @"Fonts"];
+	  NSString *dir = [NSString stringWithUTF8String: getenv("USERPROFILE")];
+	  fontsPath = [dir stringByAppendingPathComponent: @"Fonts"];
 	}
       else if ([osName isEqualToString: @"NSMACHOperatingSystem"])
 	{
@@ -276,8 +276,8 @@ - (NSString *) systemFontsDirectory
       if ([osName isEqualToString: @"NSWindowsNTOperatingSystem"]
 	  || [osName isEqualToString: @"NSWindows95OperatingSystem"])
 	{
-	  NSString *winDir = [NSString stringWithUTF8String: getenv("WINDIR")];
-	  fontsPath = [winDir stringByAppendingPathComponent: @"Fonts"];
+	  NSString *dir = [NSString stringWithUTF8String: getenv("WINDIR")];
+	  fontsPath = [dir stringByAppendingPathComponent: @"Fonts"];
 	}
       else if ([osName isEqualToString: @"NSMACHOperatingSystem"])
 	{