Commit | Line | Data |
---|---|---|
6c65cc47 JB |
1 | diff -pruN wbar-1.3.3.orig/dot.wbar wbar-1.3.3/dot.wbar |
2 | --- wbar-1.3.3.orig/dot.wbar 2008-05-18 20:36:31.000000000 +0200 | |
3 | +++ wbar-1.3.3/dot.wbar 2008-05-18 20:36:41.000000000 +0200 | |
4 | @@ -1,72 +1,72 @@ | |
5 | # The Bar && Font | |
6 | -i: iconpack/wbar.osx/osxbarback.png | |
7 | -t: iconpack/wbar.osx/font/12 | |
8 | +i: /usr/share/wbar/iconpack/wbar.osx/osxbarback.png | |
9 | +t: /usr/share/wbar/iconpack/comic/12 | |
10 | c: | |
11 | ||
12 | -i: iconpack/wbar.osx/nautilus.png | |
13 | +i: /usr/share/wbar/iconpack/wbar.osx/nautilus.png | |
14 | c: nautilus --no-desktop --browser | |
15 | t: nautilus | |
16 | ||
17 | -i: iconpack/wbar.osx/cedega.png | |
18 | +i: /usr/share/wbar/iconpack/wbar.osx/cedega.png | |
19 | c: | |
20 | t: wine | |
21 | ||
22 | -i: iconpack/wbar.osx/firefox.png | |
23 | +i: /usr/share/wbar/iconpack/wbar.osx/firefox.png | |
24 | c: firefox | |
25 | t: firefox | |
26 | ||
27 | -i: iconpack/wbar.osx/thunderbird.png | |
28 | +i: /usr/share/wbar/iconpack/wbar.osx/thunderbird.png | |
29 | c: thunderbird | |
30 | t: thunderbird | |
31 | ||
32 | -i: iconpack/wbar.osx/gearth.png | |
33 | +i: /usr/share/wbar/iconpack/wbar.osx/gearth.png | |
34 | c: | |
35 | t: gearth | |
36 | ||
37 | -i: iconpack/wbar.osx/skype.png | |
38 | +i: /usr/share/wbar/iconpack/wbar.osx/skype.png | |
39 | c: skype | |
40 | t: skype | |
41 | ||
42 | -i: iconpack/wbar.osx/psi.png | |
43 | +i: /usr/share/wbar/iconpack/wbar.osx/psi.png | |
44 | c: pidgin | |
45 | t: pidgin | |
46 | ||
47 | -i: iconpack/wbar.osx/mlgui.png | |
48 | +i: /usr/share/wbar/iconpack/wbar.osx/mlgui.png | |
49 | c: | |
50 | t: sancho | |
51 | ||
52 | -i: iconpack/wbar.osx/ooffice.png | |
53 | +i: /usr/share/wbar/iconpack/wbar.osx/ooffice.png | |
54 | c: soffice | |
55 | t: ooffice | |
56 | ||
57 | -i: iconpack/wbar.osx/acroread.png | |
58 | +i: /usr/share/wbar/iconpack/wbar.osx/acroread.png | |
59 | c: acroread | |
60 | t: acroread | |
61 | ||
62 | -i: iconpack/wbar.osx/beagle.png | |
63 | +i: /usr/share/wbar/iconpack/wbar.osx/beagle.png | |
64 | c: beagle-search | |
65 | t: beagle | |
66 | ||
67 | -i: iconpack/wbar.osx/gimp.png | |
68 | +i: /usr/share/wbar/iconpack/wbar.osx/gimp.png | |
69 | c: gimp | |
70 | t: gimp | |
71 | ||
72 | -i: iconpack/wbar.osx/picasa.png | |
73 | +i: /usr/share/wbar/iconpack/wbar.osx/picasa.png | |
74 | c: picasa | |
75 | t: picasa | |
76 | ||
77 | -i: iconpack/wbar.osx/gqview.png | |
78 | +i: /usr/share/wbar/iconpack/wbar.osx/gqview.png | |
79 | c: gqview | |
80 | t: gqview | |
81 | ||
82 | -i: iconpack/wbar.osx/xmms.png | |
83 | +i: /usr/share/wbar/iconpack/wbar.osx/xmms.png | |
84 | c: audacious | |
85 | t: audacious | |
86 | ||
87 | -i: iconpack/wbar.osx/gnucash.png | |
88 | +i: /usr/share/wbar/iconpack/wbar.osx/gnucash.png | |
89 | c: gnucash | |
90 | t: gnucash | |
91 | ||
92 | -i: iconpack/wbar.osx/gmplayer.png | |
93 | +i: /usr/share/wbar/iconpack/wbar.osx/gmplayer.png | |
94 | c: gmplayer | |
95 | t: gmplayer | |
96 | diff -pruN wbar-1.3.3.orig/IconLoader.cc wbar-1.3.3/IconLoader.cc | |
97 | --- wbar-1.3.3.orig/IconLoader.cc 2008-05-18 20:36:31.000000000 +0200 | |
98 | +++ wbar-1.3.3/IconLoader.cc 2008-05-18 20:37:52.000000000 +0200 | |
99 | @@ -24,8 +24,8 @@ IconLoader::IconLoader(const char *cfgFi | |
100 | else if( !stat("dot.wbar", &cfg_stat) ) | |
101 | configFile = "dot.wbar"; | |
102 | ||
103 | - else if( !stat("/usr/share/wbar/dot.wbar", &cfg_stat) ) | |
104 | - configFile = "/usr/share/wbar/dot.wbar"; | |
105 | + else if( !stat("/usr/etc/dot.wbar", &cfg_stat) ) | |
106 | + configFile = "/usr/etc/dot.wbar"; | |
107 | ||
108 | else | |
109 | throw "Can't stat a config file. Try # make install or -config <cfgfile>"; |