Attachment #8962 for bug #10529

View | Details | Raw Unified | Return to bug 10529
Collapse All | Expand All




	p->font_fix_size           = DEFAULT_FONT_SIZE;
	p->font_var_points         = FALSE;
	p->font_fix_points         = FALSE;
	p->font_var_print          = g_strdup ("-*-helvetica-*-*-*-*-10-*-*-*-*-*-iso10646-1");
	p->font_fix_print          = g_strdup ("-*-courier-*-*-*-*-10-*-*-*-*-*-iso10646-1");
	p->font_var_size_print     = DEFAULT_FONT_SIZE_PRINT;
	p->font_fix_size_print     = DEFAULT_FONT_SIZE_PRINT;
	p->font_var_print_points   = FALSE;

	GETS (keybindings_theme, "keybindings_theme=ms");
	GETS (font_var, var_default);
	GETS (font_fix, fix_default);
	GETS (font_var_print, "font_variable_print=-*-helvetica-*-*-*-*-10-*-*-*-*-*-iso10646-1");
	GETS (font_fix_print, "font_fixed_print=-*-courier-*-*-*-*-10-*-*-*-*-*-iso10646-1");

	g_free (var_default);
	g_free (fix_default);

		g_free (enc1);
		g_free (enc2);
	} else {
		*var_name = g_strdup ("-*-helvetica-*-*-*-*-12-*-*-*-*-*-iso10646-1");
		*fix_name = g_strdup ("-*-courier-*-*-*-*-12-*-*-*-*-*-iso10646-1");
	}
}


Lines 341-347 Link Here

(-)gtkhtml-1.1.7.orig/src/gtkhtml-properties.c (-1 / +1 lines)
341	font_name = get_font_name (style->font);	341	font_name = get_font_name (style->font);
342	}	342	}
343		343
344	if (font_name) {	344	if (0) {
345	gchar enc1, enc2;	345	gchar enc1, enc2;
346		346
347	enc1 = html_font_manager_get_attr (font_name, 13);	347	enc1 = html_font_manager_get_attr (font_name, 13);

Return to bug 10529

Lines 52-59 Link Here

(-)gtkhtml-1.1.7.orig/src/gtkhtml-properties.c (-6 / +6 lines)
52	p->font_fix_size = DEFAULT_FONT_SIZE;	52	p->font_fix_size = DEFAULT_FONT_SIZE;
53	p->font_var_points = FALSE;	53	p->font_var_points = FALSE;
54	p->font_fix_points = FALSE;	54	p->font_fix_points = FALSE;
55	p->font_var_print = g_strdup ("--helvetica-----10-------");	55	p->font_var_print = g_strdup ("--helvetica-----10------iso10646-1");
56	p->font_fix_print = g_strdup ("--courier-----10-------");	56	p->font_fix_print = g_strdup ("--courier-----10------iso10646-1");
57	p->font_var_size_print = DEFAULT_FONT_SIZE_PRINT;	57	p->font_var_size_print = DEFAULT_FONT_SIZE_PRINT;
58	p->font_fix_size_print = DEFAULT_FONT_SIZE_PRINT;	58	p->font_fix_size_print = DEFAULT_FONT_SIZE_PRINT;
59	p->font_var_print_points = FALSE;	59	p->font_var_print_points = FALSE;
Lines 223-230 Link Here
223	GETS (keybindings_theme, "keybindings_theme=ms");	223	GETS (keybindings_theme, "keybindings_theme=ms");
224	GETS (font_var, var_default);	224	GETS (font_var, var_default);
225	GETS (font_fix, fix_default);	225	GETS (font_fix, fix_default);
226	GETS (font_var_print, "font_variable_print=--helvetica-----10-------");	226	GETS (font_var_print, "font_variable_print=--helvetica-----10------iso10646-1");
227	GETS (font_fix_print, "font_fixed_print=--courier-----10-------");	227	GETS (font_fix_print, "font_fixed_print=--courier-----10------iso10646-1");
228		228
229	g_free (var_default);	229	g_free (var_default);
230	g_free (fix_default);	230	g_free (fix_default);
Lines 355-362 Link Here
355	g_free (enc1);	355	g_free (enc1);
356	g_free (enc2);	356	g_free (enc2);
357	} else {	357	} else {
358	var_name = g_strdup ("--helvetica-----12-------*");	358	var_name = g_strdup ("--helvetica-----12-----*-iso10646-1");
359	fix_name = g_strdup ("--courier-----12-------*");	359	fix_name = g_strdup ("--courier-----12-----*-iso10646-1");
360	}	360	}
361	}	361	}
362		362