Date: Monday, October 15, 2012 @ 21:29:32 Author: eric Revision: 168798
archrelease: copy trunk to staging-any Added: wicd/repos/staging-any/ wicd/repos/staging-any/ChangeLog (from rev 168797, wicd/trunk/ChangeLog) wicd/repos/staging-any/PKGBUILD (from rev 168797, wicd/trunk/PKGBUILD) wicd/repos/staging-any/dbus_string_fix.patch (from rev 168797, wicd/trunk/dbus_string_fix.patch) wicd/repos/staging-any/deepcopy+python27-fixes.patch (from rev 168797, wicd/trunk/deepcopy+python27-fixes.patch) wicd/repos/staging-any/net-tools.patch (from rev 168797, wicd/trunk/net-tools.patch) wicd/repos/staging-any/wicd-daemon (from rev 168797, wicd/trunk/wicd-daemon) wicd/repos/staging-any/wicd-locale.patch (from rev 168797, wicd/trunk/wicd-locale.patch) wicd/repos/staging-any/wicd-scripts-execution.patch (from rev 168797, wicd/trunk/wicd-scripts-execution.patch) wicd/repos/staging-any/wicd.desktop (from rev 168797, wicd/trunk/wicd.desktop) wicd/repos/staging-any/wicd.install (from rev 168797, wicd/trunk/wicd.install) wicd/repos/staging-any/wicd_in_usr.patch (from rev 168797, wicd/trunk/wicd_in_usr.patch) -------------------------------+ ChangeLog | 40 +++++++ PKGBUILD | 101 +++++++++++++++++++ dbus_string_fix.patch | 16 +++ deepcopy+python27-fixes.patch | 72 +++++++++++++ net-tools.patch | 11 ++ wicd-daemon | 27 +++++ wicd-locale.patch | 12 ++ wicd-scripts-execution.patch | 24 ++++ wicd.desktop | 11 ++ wicd.install | 23 ++++ wicd_in_usr.patch | 208 ++++++++++++++++++++++++++++++++++++++++ 11 files changed, 545 insertions(+) Copied: wicd/repos/staging-any/ChangeLog (from rev 168797, wicd/trunk/ChangeLog) =================================================================== --- staging-any/ChangeLog (rev 0) +++ staging-any/ChangeLog 2012-10-16 01:29:32 UTC (rev 168798) @@ -0,0 +1,40 @@ +2008-10-07 Giovanni Scafora <giova...@archlinux.org> + + * wicd-1.5.3 + +2008-09-03 Giovanni Scafora <giova...@archlinux.org> + + * wicd-1.5.1 + +2008-01-11 Varun Acharya <va...@archlinux.org> + + * wicd-1.4.1-4 moved to extra + * locale patch added to extra + * ethtool dependency fixed, thanks evdvelde (flyspray #9145) + * dhclient,wpa_supplicant are now deps + * wicd.install cleaned up + +2008-01-09 Varun Acharya <va...@archlinux.org> + + * wicd-1.4.1-3 now in testing + * wicd-locale.patch added to cvs + * Locale issues fixed, see #9086 + +2008-01-06 Varun Acharya <va...@archlinux.org> + + * wicd-1.4.1 moved to extra + * tray icon bug fixed + * ChangeLog cleanup, thanks to evil overlord skeletor. + +2008-01-03 Varun Acharya <va...@archliunx.org> + + * wicd-1.4.0 now in testing + +2007-12-20 Varun Acharya <va...@archlinux.org> + + * Added patch and removed sed from the PKGBUILD in testing + +2007-11-05 Varun Acharya <va...@archlinux.org> + + * Cleaned up PKGBUILD, defaults to /usr/share + * Adopted from AUR and moved to testing/extra Copied: wicd/repos/staging-any/PKGBUILD (from rev 168797, wicd/trunk/PKGBUILD) =================================================================== --- staging-any/PKGBUILD (rev 0) +++ staging-any/PKGBUILD 2012-10-16 01:29:32 UTC (rev 168798) @@ -0,0 +1,101 @@ +# $Id$ +# Maintainer: Daniel Isenmann <dan...@archlinux.org> +# Contributor: Rashif "Don Ray" Rahman <rayras...@gmail.com> + +pkgbase=wicd +pkgname=('wicd' 'wicd-gtk') +pkgver=1.7.2.4 +pkgrel=4 +arch=(any) +url="http://wicd.sourceforge.net/" +license=('GPL2') +conflicts=('wicd-svn') +install=wicd.install +source=(http://launchpad.net/wicd/1.7/$pkgver/+download/wicd-$pkgver.tar.gz wicd-daemon + wicd.desktop + dbus_string_fix.patch) +makedepends=('python2' 'python2-babel' 'python2-distribute' 'gettext') +options=('emptydirs') +md5sums=('c2435ddfdef0b9898852d72a85a45f0f' + 'f40e5f59998d0829707a7c9976afa8f8' + '326df163a5732d38741371baa4fce9e5' + '744b3c12fe901ed435351e884dc8cb1d') + +build() { + cd "$srcdir/$pkgbase-$pkgver" + + find . -type f -exec sed -i 's@#!/usr.*python@#!/usr/bin/python2@' {} \; + export PYTHON=python2 + + patch -p0 < "$srcdir/dbus_string_fix.patch" + + python2 setup.py configure --no-install-init \ + --resume=/usr/share/wicd/scripts/ \ + --suspend=/usr/share/wicd/scripts/ \ + --verbose \ + --python=/usr/bin/python2 \ + --lib=/usr/lib \ + --systemd=/usr/lib/systemd/system + + #HACK for https://bugs.launchpad.net/wicd/+bug/928589 + mkdir -p translations/ast/LC_MESSAGES + msgfmt po/ast.po -o translations/ast/LC_MESSAGES/wicd.mo +} + +package_wicd() { + pkgdesc="Wired and wireless network manager for Linux" + depends=('python2' 'python2-dbus' 'dhcpcd' 'wpa_supplicant' 'wireless_tools' + 'inetutils' 'net-tools' 'ethtool' 'shared-mime-info' 'python2-urwid' 'python2-gobject2' 'dbus-glib') + optdepends=('wicd-gtk: needed if you want the GTK interface') + backup=('etc/wicd/encryption/templates/active') + install=wicd.install + + cd "$srcdir/$pkgbase-$pkgver" + python2 setup.py install --optimize=1 --root="$pkgdir" + + # Add custom rc.d script + install -Dm755 "$srcdir/wicd-daemon" "$pkgdir/etc/rc.d/wicd" + + cd build/lib/wicd + for i in *.py; do + install -Dm 755 $i "$pkgdir/usr/lib/wicd/$i" + done + + rm -rf "$pkgdir"/usr/share/autostart + + #deleting the GTK stuff + rm -rf "$pkgdir"/etc/xdg + rm -f "$pkgdir"/usr/bin/{wicd-client,wicd-gtk} + rm -rf "$pkgdir"/usr/share/{applications,icons,pixmaps} + rm -rf "$pkgdir"/usr/share/wicd/gtk +} + +package_wicd-gtk() { + pkgdesc="Wired and wireless network manager for Linux - GTK client" + depends=('wicd' 'pygtk') + optdepends=('gksu: needed to access some preferences in gtk interface' + 'notification-daemon: needed if you want notifications' + 'python2-notify: needed if you want notifications' + 'hicolor-icon-theme') + + cd "$srcdir/$pkgbase-$pkgver" + python2 setup.py install --optimize=1 --root="$pkgdir" + + install -Dm644 "$srcdir/wicd.desktop" "$pkgdir/usr/share/applications/wicd.desktop" + + cd build/lib/wicd + for i in *.py; do + install -Dm 755 $i "$pkgdir"/usr/lib/wicd/$i + done + + #deleting the core dirs which exists in wicd + rm -rf "$pkgdir"/etc/{wicd,dbus-1,rc.d,logrotate.d} + rm -rf "$pkgdir"/usr/{lib,sbin} + rm -rf "$pkgdir"/usr/share/{man,doc,locale,wicd/curses,wicd/daemon,wicd/backends,wicd/scripts,wicd/cli} + rm -rf "$pkgdir"/var + rm -f "$pkgdir"/usr/bin/{wicd-curses,wicd-cli} + + rm -rf "$pkgdir"/usr/share/autostart + rm -rf "$pkgdir"/lib/ + rm -rf "$pkgdir"/usr/share/dbus-1 +} Copied: wicd/repos/staging-any/dbus_string_fix.patch (from rev 168797, wicd/trunk/dbus_string_fix.patch) =================================================================== --- staging-any/dbus_string_fix.patch (rev 0) +++ staging-any/dbus_string_fix.patch 2012-10-16 01:29:32 UTC (rev 168798) @@ -0,0 +1,16 @@ +=== modified file 'wicd/misc.py' +--- wicd/misc.py 2012-04-30 19:20:47 +0000 ++++ wicd/misc.py 2012-05-03 16:01:49 +0000 +@@ -430,7 +430,10 @@ + """ Sanitize property names to be used in config-files. """ + allowed = string.ascii_letters + '_' + string.digits + table = string.maketrans(allowed, ' ' * len(allowed)) +- return s.translate(None, table) ++ ++ # s is a dbus.String -- since we don't allow unicode property keys, ++ # make it simple. ++ return str(s).translate(None, table) + + def sanitize_escaped(s): + """ Sanitize double-escaped unicode strings. """ + Copied: wicd/repos/staging-any/deepcopy+python27-fixes.patch (from rev 168797, wicd/trunk/deepcopy+python27-fixes.patch) =================================================================== --- staging-any/deepcopy+python27-fixes.patch (rev 0) +++ staging-any/deepcopy+python27-fixes.patch 2012-10-16 01:29:32 UTC (rev 168798) @@ -0,0 +1,72 @@ +diff -ur wicd-1.7.0/wicd/configmanager.py wicd-1.7.0.new/wicd/configmanager.py +--- wicd-1.7.0/wicd/configmanager.py 2010-01-15 05:49:11.000000000 +0100 ++++ wicd-1.7.0.new/wicd/configmanager.py 2010-10-08 13:14:22.084345024 +0200 +@@ -35,7 +35,7 @@ + class ConfigManager(RawConfigParser): + """ A class that can be used to manage a given configuration file. """ + def __init__(self, path, debug=False, mark_whitespace="`'`"): +- RawConfigParser.__init__(self) ++ RawConfigParser.__init__(self, allow_no_value=True) + self.config_file = path + self.debug = debug + self.mrk_ws = mark_whitespace +@@ -176,28 +176,35 @@ + + + def _copy_section(self, name): +- # Yes, deepcopy sucks, but it is robust to changes in both +- # this class and RawConfigParser. +- p = copy.deepcopy(self) +- for sname in p.sections(): +- if sname != name: +- p.remove_section(sname) ++ p = ConfigManager("", self.debug, self.mrk_ws) ++ p.add_section(name) ++ for (iname, value) in self.items(name): ++ p.set(name, iname, value) ++ # Store the filename this section was read from. + p.config_file = p.get_option(name, '_filename_', p.config_file) + p.remove_option(name, '_filename_') + return p + + def write(self): + """ Writes the loaded config file to disk. """ +- # Really don't like this deepcopy. +- p = copy.deepcopy(self) +- for sname in p.sections(): +- fname = p.get_option(sname, '_filename_') ++ in_this_file = [] ++ for sname in self.sections(): ++ fname = self.get_option(sname, '_filename_') + if fname and fname != self.config_file: ++ # Write sections from other files + section = self._copy_section(sname) +- p.remove_section(sname) + section._write_one() ++ else: ++ # Save names of local sections ++ in_this_file.append(sname) + +- for sname in p.sections(): ++ # Make an instance with only these sections ++ p = ConfigManager("", self.debug, self.mrk_ws) ++ p.config_file = self.config_file ++ for sname in in_this_file: ++ p.add_section(sname) ++ for (iname, value) in self.items(sname): ++ p.set(sname, iname, value) + p.remove_option(sname, '_filename_') + p._write_one() + +diff -ur wicd-1.7.0/wicd/wicd-daemon.py wicd-1.7.0.new/wicd/wicd-daemon.py +--- wicd-1.7.0/wicd/wicd-daemon.py 2010-01-15 05:49:11.000000000 +0100 ++++ wicd-1.7.0.new/wicd/wicd-daemon.py 2010-10-08 13:11:15.811786603 +0200 +@@ -1802,7 +1802,7 @@ + wicd_bus = dbus.service.BusName('org.wicd.daemon', bus=bus) + daemon = WicdDaemon(wicd_bus, auto_connect=auto_connect) + if not no_poll: +- child_pid = Popen([misc.find_path("python"), "-O", ++ child_pid = Popen([misc.find_path("python2"), "-O", + os.path.join(wpath.daemon, "monitor.py")], + shell=False, close_fds=True).pid + atexit.register(on_exit, child_pid) Copied: wicd/repos/staging-any/net-tools.patch (from rev 168797, wicd/trunk/net-tools.patch) =================================================================== --- staging-any/net-tools.patch (rev 0) +++ staging-any/net-tools.patch 2012-10-16 01:29:32 UTC (rev 168798) @@ -0,0 +1,11 @@ +--- wicd/wnettools.py.bak 2011-08-20 12:55:32.898673334 +0200 ++++ wicd/wnettools.py 2011-08-20 12:55:56.608671946 +0200 +@@ -58,7 +58,7 @@ + wpa2_pattern = re.compile('(WPA2)', _re_mode) + + #iwconfig-only regular expressions. +-ip_pattern = re.compile(r'inet [Aa]d?dr[^.]*:([^.]*\.[^.]*\.[^.]*\.[0-9]*)', re.S) ++ip_pattern = re.compile(r'inet ([^.]*\.[^.]*\.[^.]*\.[0-9]*)', re.S) + bssid_pattern = re.compile('.*Access Point: (([0-9A-Z]{2}:){5}[0-9A-Z]{2})', _re_mode) + bitrate_pattern = re.compile('.*Bit Rate[=:](.*?/s)', _re_mode) + opmode_pattern = re.compile('.*Mode:(.*?) ', _re_mode) Copied: wicd/repos/staging-any/wicd-daemon (from rev 168797, wicd/trunk/wicd-daemon) =================================================================== --- staging-any/wicd-daemon (rev 0) +++ staging-any/wicd-daemon 2012-10-16 01:29:32 UTC (rev 168798) @@ -0,0 +1,27 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions +case "$1" in + start) + stat_busy "Starting wicd Daemon" + pkill -f wicd-daemon.py &> /dev/null + /usr/sbin/wicd &> /dev/null + add_daemon wicd + stat_done + ;; + stop) + stat_busy "Stopping wicd Daemon" + pkill -f wicd-daemon.py &> /dev/null + rm_daemon wicd + stat_done + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 Copied: wicd/repos/staging-any/wicd-locale.patch (from rev 168797, wicd/trunk/wicd-locale.patch) =================================================================== --- staging-any/wicd-locale.patch (rev 0) +++ staging-any/wicd-locale.patch 2012-10-16 01:29:32 UTC (rev 168798) @@ -0,0 +1,12 @@ +diff -aur wicd-old/opt/wicd/gui.py wicd-new/opt/wicd/gui.py +--- wicd-old/opt/wicd/gui.py 2008-01-03 23:18:40.000000000 +0530 ++++ wicd-new/opt/wicd/gui.py 2008-01-09 00:27:29.000000000 +0530 +@@ -44,7 +44,7 @@ + #which is also under GPLv2 + + #Get the local directory since we are not installing anything +-local_path = os.path.realpath(os.path.dirname(sys.argv[0])) + '/translations' ++local_path = ('/usr/share/locale') + # Init the list of languages to support + langs = list() + #Check the default locale Copied: wicd/repos/staging-any/wicd-scripts-execution.patch (from rev 168797, wicd/trunk/wicd-scripts-execution.patch) =================================================================== --- staging-any/wicd-scripts-execution.patch (rev 0) +++ staging-any/wicd-scripts-execution.patch 2012-10-16 01:29:32 UTC (rev 168798) @@ -0,0 +1,24 @@ +=== modified file 'wicd/networking.py' +--- wicd/networking.py 2010-01-15 04:02:10 +0000 ++++ wicd/networking.py 2010-01-27 19:06:21 +0000 +@@ -215,8 +215,8 @@ + if self.pre_disconnect_script: + print 'Running pre-disconnect script' + misc.ExecuteScript(expand_script_macros(self.pre_disconnect_script, +- 'pre-disconnection', (mac, +- name)), ++ 'pre-disconnection', ++ mac, name), + self.debug) + iface.ReleaseDHCP() + iface.SetAddress('0.0.0.0') +@@ -229,7 +229,7 @@ + print 'Running post-disconnect script' + misc.ExecuteScript(expand_script_macros(self.post_disconnect_script, + 'post-disconnection', +- (mac, name)), ++ mac, name), + self.debug) + + def ReleaseDHCP(self): + Copied: wicd/repos/staging-any/wicd.desktop (from rev 168797, wicd/trunk/wicd.desktop) =================================================================== --- staging-any/wicd.desktop (rev 0) +++ staging-any/wicd.desktop 2012-10-16 01:29:32 UTC (rev 168798) @@ -0,0 +1,11 @@ +[Desktop Entry] +Categories=Network; +Encoding=UTF-8 +Exec=/usr/bin/wicd-client +GenericName=Network Manager +Icon=wicd-gtk +Comment=Manage Wired/Wireless Networks +Name=Wicd +Terminal=false +Type=Application +Version=1.0 Copied: wicd/repos/staging-any/wicd.install (from rev 168797, wicd/trunk/wicd.install) =================================================================== --- staging-any/wicd.install (rev 0) +++ staging-any/wicd.install 2012-10-16 01:29:32 UTC (rev 168798) @@ -0,0 +1,23 @@ +PKGNAME=wicd + +pre_remove () { + for pyo in $(pacman -Qql $PKGNAME | grep \.py$ | sed 's|.py$|.pyo|g'); do + if [ -f "$pyo" ]; then + rm "$pyo" + fi + done +} + +post_install() { + echo + echo "==> You need to restart the dbus service after " + echo "==> upgrading wicd." + echo "==> Disable networkmanager,dhcdbd or other networking " + echo "==> utility and add 'wicd' to DAEMONS " + echo "==> in /etc/rc.conf" + echo "==> 'dbus' HAS to be before 'wicd' in rc.conf in the " + echo "==> DAEMONS array." + echo "==> Wireless Interface Connection Daemon" + echo + echo "==> To run: wicd-cli or wicd-curses" +} Copied: wicd/repos/staging-any/wicd_in_usr.patch (from rev 168797, wicd/trunk/wicd_in_usr.patch) =================================================================== --- staging-any/wicd_in_usr.patch (rev 0) +++ staging-any/wicd_in_usr.patch 2012-10-16 01:29:32 UTC (rev 168798) @@ -0,0 +1,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):