1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
|
diff -aur wicd-old/etc/acpi/resume.d/80-wicd-connect.sh wicd-new/etc/acpi/resume.d/80-wicd-connect.sh
--- wicd-old/etc/acpi/resume.d/80-wicd-connect.sh 2007-07-25 20:34:25.000000000 +0530
+++ wicd-new/etc/acpi/resume.d/80-wicd-connect.sh 2007-12-20 07:19:00.000000000 +0530
@@ -1,4 +1,4 @@
#!/bin/sh
# Bring wifi network interface back up.
-/opt/wicd/autoconnect.py
+/usr/lib/wicd/autoconnect.py
diff -aur wicd-old/etc/init.d/wicd wicd-new/etc/init.d/wicd
--- wicd-old/etc/init.d/wicd 2007-07-25 20:34:25.000000000 +0530
+++ wicd-new/etc/init.d/wicd 2007-12-20 07:19:15.000000000 +0530
@@ -5,7 +5,7 @@
echo "Stopping any running daemons..."
killall daemon.py 2> /dev/null
echo "Starting wicd daemon..."
- /opt/wicd/daemon.py 2> /dev/null
+ /usr/lib/wicd/daemon.py 2> /dev/null
fi
if [[ $1 = "stop" ]]
diff -aur wicd-old/opt/wicd/dapper.py wicd-new/opt/wicd/dapper.py
--- wicd-old/opt/wicd/dapper.py 2007-12-01 19:47:51.000000000 +0530
+++ wicd-new/opt/wicd/dapper.py 2007-12-20 07:20:35.000000000 +0530
@@ -76,7 +76,7 @@
if wired.CheckPluggedIn() == True and wired_ip != None:
# Only set image/tooltip if it hasn't been set already
if stillWired == False:
- pic.set_from_file("images/wired.png")
+ pic.set_from_file("/usr/share/wicd/images/wired.png")
tooltip.set_tip(eb,language['connected_to_wired'].replace('$A',
wired_ip))
stillWired = True
@@ -85,7 +85,7 @@
# Check to see if we were using a wired connection that has now become
# unplugged or disabled.
if stillWired == True:
- pic.set_from_file("images/no-signal.png")
+ pic.set_from_file("/usr/share/wicd/images/no-signal.png")
tooltip.set_tip(eb,language['not_connected'])
stillWired = False
@@ -124,28 +124,28 @@
if daemon.GetSignalDisplayType()== 0:
if wireless_signal > 75:
- pic.set_from_file("images/high-signal" + lock + ".png")
+ pic.set_from_file("/usr/share/wicd/images/high-signal" + lock + ".png")
elif wireless_signal > 50:
- pic.set_from_file("images/good-signal" + lock + ".png")
+ pic.set_from_file("/usr/share/wicd/images/good-signal" + lock + ".png")
elif wireless_signal > 25:
- pic.set_from_file("images/low-signal" + lock + ".png")
+ pic.set_from_file("/usr/share/wicd/images/low-signal" + lock + ".png")
elif wireless_signal > 0:
- pic.set_from_file("images/bad-signal" + lock + ".png")
+ pic.set_from_file("/usr/share/wicd/images/bad-signal" + lock + ".png")
elif wireless_signal == 0:
- pic.set_from_file("images/no-signal.png")
+ pic.set_from_file("/usr/share/wicd/images/no-signal.png")
auto_reconnect()
else:
if wireless_signal >= -60:
- pic.set_from_file("images/high-signal" + lock + ".png")
+ pic.set_from_file("/usr/share/wicd/images/high-signal" + lock + ".png")
elif wireless_signal >= -70:
- pic.set_from_file("images/good-signal" + lock + ".png")
+ pic.set_from_file("/usr/share/wicd/images/good-signal" + lock + ".png")
elif wireless_signal >= -80:
- pic.set_from_file("images/low-signal" + lock + ".png")
+ pic.set_from_file("/usr/share/wicd/images/low-signal" + lock + ".png")
else:
- pic.set_from_file("images/bad-signal" + lock + ".png")
+ pic.set_from_file("/usr/share/wicd/images/bad-signal" + lock + ".png")
elif wireless_ip is None and wired_ip is None:
- pic.set_from_file("images/no-signal")
+ pic.set_from_file("/usr/share/wicd/images/no-signal")
tooltip.set_tip(eb,language['not_connected'])
auto_reconnect()
@@ -247,7 +247,7 @@
gobject.timeout_add(3000,set_signal_image)
tooltip.set_tip(eb, "Wicd Systray")
-pic.set_from_file("images/no-signal.png")
+pic.set_from_file("/usr/share/wicd/images/no-signal.png")
eb.connect('button_press_event',tray_clicked)
eb.add(pic)
diff -aur wicd-old/opt/wicd/edgy.py wicd-new/opt/wicd/edgy.py
--- wicd-old/opt/wicd/edgy.py 2007-12-01 19:47:51.000000000 +0530
+++ wicd-new/opt/wicd/edgy.py 2007-12-20 07:20:35.000000000 +0530
@@ -158,7 +158,7 @@
if wired.CheckPluggedIn() == True and wired_ip != None:
# Only set image/tooltip if it hasn't been set already
if stillWired == False:
- tr.set_from_file("images/wired.png")
+ tr.set_from_file("/usr/share/wicd/images/wired.png")
tr.set_tooltip(language['connected_to_wired'].replace('$A',
wired_ip))
stillWired = True
@@ -167,7 +167,7 @@
# Check to see if we were using a wired connection that has now become
# unplugged or disabled.
if stillWired == True:
- tr.set_from_file("images/no-signal.png")
+ tr.set_from_file("/usr/share/wicd/images/no-signal.png")
tr.set_tooltip(language['not_connected'])
stillWired = False
@@ -209,35 +209,35 @@
if daemon.GetSignalDisplayType()== 0:
if wireless_signal > 75:
- tr.set_from_file("images/" + data_string + "high-signal" + lock + ".png")
+ tr.set_from_file("/usr/share/wicd/images/" + data_string + "high-signal" + lock + ".png")
elif wireless_signal > 50:
- tr.set_from_file("images/" + data_string + "good-signal" + lock + ".png")
+ tr.set_from_file("/usr/share/wicd/images/" + data_string + "good-signal" + lock + ".png")
elif wireless_signal > 25:
- tr.set_from_file("images/" + data_string + "low-signal" + lock + ".png")
+ tr.set_from_file("/usr/share/wicd/images/" + data_string + "low-signal" + lock + ".png")
elif wireless_signal > 0:
- tr.set_from_file("images/" + data_string + "bad-signal" + lock + ".png")
+ tr.set_from_file("/usr/share/wicd/images/" + data_string + "bad-signal" + lock + ".png")
elif wireless_signal == 0:
- tr.set_from_file("images/no-signal.png")
+ tr.set_from_file("/usr/share/wicd/images/no-signal.png")
auto_reconnect()
else:
if wireless_signal >= -60:
- tr.set_from_file("images/" + data_string + "high-signal" + lock + ".png")
+ tr.set_from_file("/usr/share/wicd/images/" + data_string + "high-signal" + lock + ".png")
elif wireless_signal >= -70:
- tr.set_from_file("images/" + data_string + "good-signal" + lock + ".png")
+ tr.set_from_file("/usr/share/wicd/images/" + data_string + "good-signal" + lock + ".png")
elif wireless_signal >= -80:
- tr.set_from_file("images/" + data_string + "low-signal" + lock + ".png")
+ tr.set_from_file("/usr/share/wicd/images/" + data_string + "low-signal" + lock + ".png")
else:
- tr.set_from_file("images/bad-signal" + lock + ".png")
+ tr.set_from_file("/usr/share/wicd/images/bad-signal" + lock + ".png")
elif wireless_ip is None and wired_ip is None:
- tr.set_from_file("images/no-signal.png")
+ tr.set_from_file("/usr/share/wicd/images/no-signal.png")
tr.set_tooltip(language['not_connected'])
auto_reconnect()
elif tr.current_icon_path.startswith(data_string) == False:
print ":"+tr.current_icon_path
print "|"+data_string+tr.current_icon_path[tr.current_icon_path.find('-')+1:]
- tr.set_from_file("images/"+data_string+tr.current_icon_path[tr.current_icon_path.find('-')+1:])
+ tr.set_from_file("/usr/share/wicd/images/"+data_string+tr.current_icon_path[tr.current_icon_path.find('-')+1:])
if not daemon.GetDebugMode():
config.EnableLogging()
@@ -301,11 +301,11 @@
self.manager.add_ui_from_string(menu)
self.menu = self.manager.get_widget('/Menubar/Menu/About').props.parent
self.current_icon_path = ''
- self.set_from_file("images/no-signal.png")
+ self.set_from_file("/usr/share/wicd/images/no-signal.png")
self.set_visible(True)
self.connect('activate', self.on_activate)
self.connect('popup-menu', self.on_popup_menu)
- self.set_from_file("images/no-signal.png")
+ self.set_from_file("/usr/share/wicd/images/no-signal.png")
self.set_tooltip("Initializing wicd...")
wireless.SetForcedDisconnect(False)
diff -aur wicd-old/opt/wicd/gui.py wicd-new/opt/wicd/gui.py
--- wicd-old/opt/wicd/gui.py 2007-12-01 19:47:51.000000000 +0530
+++ wicd-new/opt/wicd/gui.py 2007-12-20 07:20:35.000000000 +0530
@@ -350,24 +350,24 @@
# "converted" to strength bars, so suggestions from people
# for a better way would be welcome.
if dbm_strength >= -60:
- self.image.set_from_file('images/signal-100.png')
+ self.image.set_from_file('/usr/share/wicd/images/signal-100.png')
elif dbm_strength >= -70:
- self.image.set_from_file('images/signal-75.png')
+ self.image.set_from_file('/usr/share/wicd/images/signal-75.png')
elif dbm_strength >= -80:
- self.image.set_from_file('images/signal-50.png')
+ self.image.set_from_file('/usr/share/wicd/images/signal-50.png')
else:
- self.image.set_from_file('images/signal-25.png')
+ self.image.set_from_file('/usr/share/wicd/images/signal-25.png')
else:
# Uses normal link quality, should be fine in most cases
if strength > 75:
- self.image.set_from_file('images/signal-100.png')
+ self.image.set_from_file('/usr/share/wicd/images/signal-100.png')
elif strength > 50:
- self.image.set_from_file('images/signal-75.png')
+ self.image.set_from_file('/usr/share/wicd/images/signal-75.png')
elif strength > 25:
- self.image.set_from_file('images/signal-50.png')
+ self.image.set_from_file('/usr/share/wicd/images/signal-50.png')
else:
- self.image.set_from_file('images/signal-25.png')
+ self.image.set_from_file('/usr/share/wicd/images/signal-25.png')
self.expander.setSignalStrength(strength, dbm_strength)
def setMACAddress(self,address):
|
