1From e72887901edb91e784db6f86e3930a2c3b7c4639 Mon Sep 17 00:00:00 2001
2From: Mario Iseli <admin@marioiseli.com>
3Date: Sat, 2 Sep 2006 21:56:22 +0200
4Subject: direct upstream changes in yudit_2.8.1-1.diff.gz
5
6(without any changes coming from ./configure)
7---
8 swidget/SIconFactory.cpp |    2 +-
9 yudit.properties.in      |    7 +++++--
10 2 files changed, 6 insertions(+), 3 deletions(-)
11
12diff --git a/swidget/SIconFactory.cpp b/swidget/SIconFactory.cpp
13index 4c2c697..6f5d5b8 100644
14--- a/swidget/SIconFactory.cpp
15+++ b/swidget/SIconFactory.cpp
16@@ -70,7 +70,7 @@
17 #include "icons/SS_LR_XPM.xpm"
18 #include "icons/SS_Yudit_XPM.xpm"
19
20-struct _icon_map {
21+static struct _icon_map {
22   const char*  name;
23   char** icon;
24 } icon_map[] = {
25diff --git a/yudit.properties.in b/yudit.properties.in
26index 620e1bc..8bc4d7e 100644
27--- a/yudit.properties.in
28+++ b/yudit.properties.in
29@@ -36,7 +36,7 @@ yudit.datapath=@YUDIT_DATA@/data
30 #
31 # This is where the .ttf (True Type font) files are
32 #
33-yudit.fontpath=@YUDIT_DATA@/fonts,/usr/share/yudit/data
34+yudit.fontpath=@YUDIT_DATA@/fonts,/usr/share/yudit/data,/usr/share/fonts/truetype/freefont,/usr/share/fonts/truetype/msttcorefonts
35
36 # The overall background.
37
38@@ -223,7 +223,7 @@ yudit.editor.xinputs=interxim,utf-8:en_GB,utf-8:hu_HU,kinput2:ja_JP.eucJP,xcin:z
39 yudit.editor.xinputs.style=preedit-over-status-under
40
41 yudit.editor.fontsize=18
42-yudit.editor.font=default
43+yudit.editor.font=Misc
44 yudit.editor.input=straight
45
46 yudit.fonts=default,TrueType,Bitmap,Japanese,Courier,Times,Helvetica,Lucida,Misc
47@@ -391,3 +391,6 @@ yudit.command.fontsize=18
48 #
49 yudit.font.Box=unifont.hex,-misc-fixed-medium-r-*--18-120-100-100-c-90-iso10646-1
50
51+
52+# added for debian
53+yudit.font.Freefont=FreeSans.ttf,FreeSerif.ttf,FreeMono.ttf
54