1 files changed, 20 insertions, 56 deletions

diff --git a/src/client/fontConfig.c b/src/client/fontConfig.c
index 6033287..3b73df8 100644
--- a/src/client/fontConfig.c
+++ b/src/client/fontConfig.c
@@ -1,10 +1,10 @@
-
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
 #include <fontconfig/fontconfig.h>
 
+#include "main.h"
 #include "fontConfig.h"
 
 int fontconfig_init()
@@ -13,16 +13,15 @@ int fontconfig_init()
 	
 	res = FcInit();
 	
-	if( res == 0 )
-	{
-		fprintf(stderr, "Can't init font config library\n");
+	if (res == 0) {
+		fprintf(stderr, _("[Error] Unable to init fontconfig library\n"));
 		return 1;
 	}
 
 	return 0;
 }
 
-font_config_t* fontconfig_find(char **arg)
+font_config_t *fontconfig_find(char **arg)
 {
 	FcObjectSet *os;
 	FcFontSet *fs;
@@ -33,55 +32,45 @@ font_config_t* fontconfig_find(char **arg)
 	os = NULL;
 	ret = NULL;
 
-	for( i = 0 ; arg[i] != NULL ; i++ )
-	{
-		//printf("arg %s\n", arg[i]);
-
-		if( i == 0 )
-		{
-			pat = FcNameParse ((FcChar8 *) arg[i]);
+	for (i = 0; arg[i] != NULL; i++) {
+		if (i == 0) {
+			pat = FcNameParse((FcChar8 *) arg[i]);
 		}
 
-		if( os == NULL )
-		{
+		if (os == NULL) {
 			os = FcObjectSetCreate();
 		}
 
-		FcObjectSetAdd (os, arg[i]);
+		FcObjectSetAdd(os, arg[i]);
 	}
 
-	if( os == NULL )
-	{
-		os = FcObjectSetBuild (FC_FAMILY, FC_STYLE, (char *) 0);
+	if (os == NULL) {
+		os = FcObjectSetBuild(FC_FAMILY, FC_STYLE, (char *) 0);
 	}
 
-	fs = FcFontList (0, pat, os);
+	fs = FcFontList(0, pat, os);
 	FcObjectSetDestroy(os);
 
-	if( pat != NULL )
-	{
+	if (pat != NULL) {
 		FcPatternDestroy(pat);
 	}
 
-	if( fs != NULL )
-	{
+	if (fs != NULL) {
 		int j;
 
-		ret = malloc( (fs->nfont+1) * sizeof(font_config_t) );
+		ret = malloc((fs->nfont + 1) * sizeof(font_config_t));
 
-		for( j = 0; j < fs->nfont ; j++ )
-		{
+		for (j = 0; j < fs->nfont; j++) {
 			FcChar8 *font;
 			FcChar8 *file;
 		
 			font = FcNameUnparse(fs->fonts[j]);
 
-			if( FcPatternGetString(fs->fonts[j], FC_FILE, 0, &file) == FcResultMatch )
-			{
-				ret[j].path = strdup((char *)file);
+			if (FcPatternGetString(fs->fonts[j], FC_FILE, 0, &file) == FcResultMatch) {
+				ret[j].path = strdup((char *) file);
 			}
 
-			ret[j].flag = strdup((char *)font);
+			ret[j].flag = strdup((char *) font);
 			free(font);
 		}
 
@@ -98,8 +87,7 @@ void fontconfig_del_list(font_config_t *list)
 {
 	int i;
 
-	for( i = 0 ; list[i].path != NULL ; i++ )
-	{
+	for (i = 0; list[i].path != NULL; i++) {
 		free(list[i].path);
 		free(list[i].flag);
 	}
@@ -112,27 +100,3 @@ int fontconfig_quit()
 	FcFini();
 	return 0;
 }
-
-#ifdef TEST_FONT_CONFIG
-int fc_test_main(int argc, char **argv)
-{
-	char *arg[] = {":lang=he:outline=true", "family", "style", "weight", "file", NULL};
-	font_config_t *res;
-	int i;
-
-	fontconfig_init();
-	
-	res = fontconfig_find(arg);
-	
-	for( i = 0 ; res[i].path != NULL ; i++ )
-	{
-		printf("path=%s\nflag=%s\n\n", res[i].path, res[i].flag);
-	}
-
-	fontconfig_del_list(res);
-
-	fontconfig_quit();
-
-	return 0;
-}
-#endif