[arch-commits] Commit in wicd/trunk (9 files)
Eric Bélanger
eric at nymeria.archlinux.org
Fri May 31 05:27:48 UTC 2013
Date: Friday, May 31, 2013 @ 07:27:48
Author: eric
Revision: 186767
upgpkg: wicd 1.7.2.4-7
Move files to /usr/bin, Remove initscripts daemon, Add install scriptlet to update icon cache, Remove old patches
Added:
wicd/trunk/wicd-gtk.install
Modified:
wicd/trunk/PKGBUILD
Deleted:
wicd/trunk/ChangeLog
wicd/trunk/deepcopy+python27-fixes.patch
wicd/trunk/net-tools.patch
wicd/trunk/wicd-daemon
wicd/trunk/wicd-locale.patch
wicd/trunk/wicd-scripts-execution.patch
wicd/trunk/wicd_in_usr.patch
-------------------------------+
ChangeLog | 40 -------
PKGBUILD | 40 ++++---
deepcopy+python27-fixes.patch | 72 -------------
net-tools.patch | 11 --
wicd-daemon | 27 -----
wicd-gtk.install | 11 ++
wicd-locale.patch | 12 --
wicd-scripts-execution.patch | 24 ----
wicd_in_usr.patch | 208 ----------------------------------------
9 files changed, 33 insertions(+), 412 deletions(-)
Deleted: ChangeLog
===================================================================
--- ChangeLog 2013-05-31 05:08:47 UTC (rev 186766)
+++ ChangeLog 2013-05-31 05:27:48 UTC (rev 186767)
@@ -1,40 +0,0 @@
-2008-10-07 Giovanni Scafora <giovanni at archlinux.org>
-
- * wicd-1.5.3
-
-2008-09-03 Giovanni Scafora <giovanni at archlinux.org>
-
- * wicd-1.5.1
-
-2008-01-11 Varun Acharya <varun at 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 <varun at 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 <varun at 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 <varun at archliunx.org>
-
- * wicd-1.4.0 now in testing
-
-2007-12-20 Varun Acharya <varun at archlinux.org>
-
- * Added patch and removed sed from the PKGBUILD in testing
-
-2007-11-05 Varun Acharya <varun at archlinux.org>
-
- * Cleaned up PKGBUILD, defaults to /usr/share
- * Adopted from AUR and moved to testing/extra
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-05-31 05:08:47 UTC (rev 186766)
+++ PKGBUILD 2013-05-31 05:27:48 UTC (rev 186767)
@@ -5,38 +5,45 @@
pkgbase=wicd
pkgname=('wicd' 'wicd-gtk')
pkgver=1.7.2.4
-pkgrel=6
+pkgrel=7
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
+source=(http://launchpad.net/wicd/1.7/$pkgver/+download/wicd-$pkgver.tar.gz
wicd.desktop
dbus_string_fix.patch
http://bazaar.launchpad.net/~wicd-devel/wicd/experimental/diff/831
http://bazaar.launchpad.net/~wicd-devel/wicd/experimental/diff/835)
-makedepends=('python2' 'python2-babel' 'python2-distribute' 'gettext')
-options=('emptydirs')
md5sums=('c2435ddfdef0b9898852d72a85a45f0f'
- 'f40e5f59998d0829707a7c9976afa8f8'
'326df163a5732d38741371baa4fce9e5'
'744b3c12fe901ed435351e884dc8cb1d'
'0d2355bc2eb7234a537f42f1773edfe0'
'1630d7fe8f09911302d33b26286ff9b8')
+makedepends=('python2' 'python2-babel' 'python2-distribute' 'gettext' 'dbus-glib' 'dhcpcd'
+ 'ethtool' 'inetutils' 'net-tools' 'pygtk' 'python2-dbus' 'python2-gobject2'
+ 'python2-urwid' 'rfkill' 'shared-mime-info' 'wireless_tools' 'wpa_supplicant'
+ 'hicolor-icon-theme')
+options=('emptydirs')
-build() {
- cd "$srcdir/$pkgbase-$pkgver"
+prepare() {
+ cd $pkgbase-$pkgver
find . -type f -exec sed -i 's@#!/usr.*python@#!/usr/bin/python2@' {} \;
export PYTHON=python2
+ sed -i 's|/usr/sbin/|/usr/bin/|' other/wicd.service
+
patch -p0 < "$srcdir/dbus_string_fix.patch"
# Fix problem with new urwid FS#33378 LP#1075399
patch -Np0 -i "$srcdir/831"
patch -Np0 -i "$srcdir/835"
+}
+build() {
+ cd $pkgbase-$pkgver
python2 setup.py configure --no-install-init \
--resume=/usr/share/wicd/scripts/ \
@@ -44,6 +51,7 @@
--verbose \
--python=/usr/bin/python2 \
--lib=/usr/lib \
+ --sbin=/usr/bin \
--systemd=/usr/lib/systemd/system
#HACK for https://bugs.launchpad.net/wicd/+bug/928589
@@ -59,12 +67,9 @@
backup=('etc/wicd/encryption/templates/active')
install=wicd.install
- cd "$srcdir/$pkgbase-$pkgver"
+ cd $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"
@@ -81,13 +86,13 @@
package_wicd-gtk() {
pkgdesc="Wired and wireless network manager for Linux - GTK client"
- depends=('wicd' 'pygtk')
+ depends=('wicd' 'pygtk' 'hicolor-icon-theme')
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')
+ 'python2-notify: needed if you want notifications')
+ install=wicd-gtk.install
- cd "$srcdir/$pkgbase-$pkgver"
+ cd $pkgbase-$pkgver
python2 setup.py install --optimize=1 --root="$pkgdir"
install -Dm644 "$srcdir/wicd.desktop" "$pkgdir/usr/share/applications/wicd.desktop"
@@ -99,12 +104,11 @@
#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/lib
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 -f "$pkgdir"/usr/bin/{wicd,wicd-curses,wicd-cli}
rm -rf "$pkgdir"/usr/share/autostart
- rm -rf "$pkgdir"/lib/
rm -rf "$pkgdir"/usr/share/dbus-1
}
Deleted: deepcopy+python27-fixes.patch
===================================================================
--- deepcopy+python27-fixes.patch 2013-05-31 05:08:47 UTC (rev 186766)
+++ deepcopy+python27-fixes.patch 2013-05-31 05:27:48 UTC (rev 186767)
@@ -1,72 +0,0 @@
-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)
Deleted: net-tools.patch
===================================================================
--- net-tools.patch 2013-05-31 05:08:47 UTC (rev 186766)
+++ net-tools.patch 2013-05-31 05:27:48 UTC (rev 186767)
@@ -1,11 +0,0 @@
---- 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)
Deleted: wicd-daemon
===================================================================
--- wicd-daemon 2013-05-31 05:08:47 UTC (rev 186766)
+++ wicd-daemon 2013-05-31 05:27:48 UTC (rev 186767)
@@ -1,27 +0,0 @@
-#!/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
Added: wicd-gtk.install
===================================================================
--- wicd-gtk.install (rev 0)
+++ wicd-gtk.install 2013-05-31 05:27:48 UTC (rev 186767)
@@ -0,0 +1,11 @@
+post_install() {
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_upgrade
+}
+
+post_remove() {
+ post_upgrade
+}
Deleted: wicd-locale.patch
===================================================================
--- wicd-locale.patch 2013-05-31 05:08:47 UTC (rev 186766)
+++ wicd-locale.patch 2013-05-31 05:27:48 UTC (rev 186767)
@@ -1,12 +0,0 @@
-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
Deleted: wicd-scripts-execution.patch
===================================================================
--- wicd-scripts-execution.patch 2013-05-31 05:08:47 UTC (rev 186766)
+++ wicd-scripts-execution.patch 2013-05-31 05:27:48 UTC (rev 186767)
@@ -1,24 +0,0 @@
-=== 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):
-
Deleted: wicd_in_usr.patch
===================================================================
--- wicd_in_usr.patch 2013-05-31 05:08:47 UTC (rev 186766)
+++ wicd_in_usr.patch 2013-05-31 05:27:48 UTC (rev 186767)
@@ -1,208 +0,0 @@
-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):
More information about the arch-commits
mailing list