|
1 --- dtlogin-integration-0.37/config/Xinitrc.in.orig 2009-02-04 16:17:23.416565482 +0900 |
|
2 +++ dtlogin-integration-0.37/config/Xinitrc.in 2009-02-04 16:17:58.467807163 +0900 |
|
3 @@ -10,53 +10,6 @@ |
|
4 ### |
|
5 ##################################################################### |
|
6 |
|
7 -if [ "x$LC_ALL" = x -a "x$LANG" = x -o "x$LANG" = xC ]; then |
|
8 - : |
|
9 -# This is needed until fix 6533406 |
|
10 -# European locales have LC_MESSAGES=C in /usr/lib/locale/*/locale_map |
|
11 -else |
|
12 - export LC_MESSAGES=$LANG |
|
13 -fi |
|
14 - |
|
15 -# Fixes 6555226 |
|
16 -if [ "x$LANG" = "xzh" ] ; then |
|
17 - export LANGUAGE=zh:zh_CN.EUC |
|
18 -fi |
|
19 - |
|
20 -export G_FILENAME_ENCODING=@locale,UTF-8 |
|
21 -export G_BROKEN_FILENAMES=yes |
|
22 -# Fixes 6583891 |
|
23 -case $LANG in |
|
24 -ja*) export VTE_CJK_WIDTH=1;; |
|
25 -ko*) export VTE_CJK_WIDTH=1;; |
|
26 -zh*) export VTE_CJK_WIDTH=1;; |
|
27 -*) ;; |
|
28 -esac |
|
29 - |
|
30 -/usr/openwin/bin/xrdb -merge << EOF |
|
31 -! Default CDE resources |
|
32 -*WindowColor: #8A008A008A00 |
|
33 -!*WindowForeground: #FF0000000000 |
|
34 -!*DataBackground: #0000FF000000 |
|
35 -*DataForeground: #FF0000000000 |
|
36 -*WorkspaceColor: #8A008A008A00 |
|
37 -*Color.Background: #FF000000FF00 |
|
38 -!*Color.Foreground: #0000FF000000 |
|
39 -*foreground: #000000000000 |
|
40 -! Hack for Dtmail |
|
41 -*XmText*background: seashell |
|
42 -*XmTextField*background: seashell |
|
43 -*Message_List*background: seashell |
|
44 -*background: #AE00B200C300 |
|
45 -Dthello*string: Welcome to the Sun Java Desktop System |
|
46 -EOF |
|
47 - |
|
48 -if [ -f $HOME/.Xdefaults ]; then |
|
49 - xrdb -merge $HOME/.Xdefaults # Load Users X11 resource database |
|
50 -fi |
|
51 - |
|
52 -@EXEC_PREFIX@/bin/linc-cleanup-sockets |
|
53 - |
|
54 command=@EXEC_PREFIX@/bin/gnome-session |
|
55 |
|
56 echo 'Starting gnome-session' |