gryf/wicd
1
0
Fork 0
mirror of https://github.com/gryf/wicd.git synced 2025-12-22 22:27:59 +01:00
Code Issues Projects Releases Wiki Activity

Merge r408 of mainline 1.6.

Browse Source
This commit is contained in:
Andrew Psaltis
2009-06-04 22:10:05 -04:00
parent 49a2dd04f6 b10c959e9a
commit a9ef525da5
3 changed files with 46 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
CHANGES
View File

@@ -1,4 +1,32 @@
------------------------------------------------------------ ------------------------------------------------------------
revno: 406
committer: Andrew Psaltis <ampsaltis@gmail.com>
branch nick: 1.6
timestamp: Sat 2009-05-30 23:18:22 -0400
message:
Merge r342 of experimental-nacl.
------------------------------------------------------------
revno: 202.2.51
committer: Andrew Psaltis <ampsaltis@gmail.com>
branch nick: experimental-nacl
timestamp: Sat 2009-05-30 23:12:53 -0400
message:
Increased time between wireless scans to 2 seconds.
------------------------------------------------------------
revno: 202.2.50
committer: Andrew Psaltis <ampsaltis@gmail.com>
branch nick: experimental-nacl
timestamp: Sat 2009-05-30 23:11:37 -0400
message:
Merged with r405 of mainline 1.6
------------------------------------------------------------
revno: 405
committer: Adam Blackburn <compwiz18@gmail.com>
branch nick: 1.6
timestamp: Thu 2009-05-28 11:10:10 +0800
message:
updated CHANGES and setup.py version
------------------------------------------------------------
revno: 404 revno: 404
committer: Dan O'Reilly <oreilldf@gmail.com> committer: Dan O'Reilly <oreilldf@gmail.com>
branch nick: 1.6 branch nick: 1.6

2
NEWS
View File

@@ -17,7 +17,7 @@ Minor Changes and Other Enhancements:
- Better autoconnection behavior - Better autoconnection behavior
- Tray/GUI will survive the daemon being killed - Tray/GUI will survive the daemon being killed
- Reasons for connection failures will now bubble back to the GUI - Reasons for connection failures will now bubble back to the GUI
- Add/Remove wired profile system is now more user-friendly - Add/remove wired profile system is now more user-friendly
- Support for using resolvconf instead of directly editing /etc/resolv.conf - Support for using resolvconf instead of directly editing /etc/resolv.conf
- Wicd won't blindly kill dhcp clients / wpa_supplicant any more - Wicd won't blindly kill dhcp clients / wpa_supplicant any more
- Added an option to automatically switch from a wireless network to a wired - Added an option to automatically switch from a wireless network to a wired

35
setup.py
View File

@@ -20,12 +20,13 @@
from distutils.core import setup, Command from distutils.core import setup, Command
from distutils.extension import Extension from distutils.extension import Extension
import os import os
import sys
import shutil import shutil
import subprocess import subprocess
# Be sure to keep this updated! # Be sure to keep this updated!
# VERSIONNUMBER # VERSIONNUMBER
VERSION_NUM = '1.6.0b3' VERSION_NUM = '1.6.0'
# REVISION_NUM is automatically updated # REVISION_NUM is automatically updated
REVISION_NUM = 'unknown' REVISION_NUM = 'unknown'
CURSES_REVNO = 'uimod' CURSES_REVNO = 'uimod'
@@ -411,28 +412,26 @@ class get_translations(Command):
import urllib, shutil import urllib, shutil
shutil.rmtree('translations/') shutil.rmtree('translations/')
os.makedirs('translations') os.makedirs('translations')
filename, headers = urllib.urlretrieve('http://wicd.net/translator/idlist') filename, headers = urllib.urlretrieve('http://wicd.sourceforge.net/translator/idlist/')
id_file = open(filename, 'r') id_file = open(filename, 'r')
lines = id_file.readlines() lines = id_file.readlines()
# remove the \n from the end of lines, and remove blank entries # remove the \n from the end of lines, and remove blank entries
lines = [ x.strip() for x in lines if not x.strip() is '' ] lines = [ x.strip() for x in lines if not x.strip() is '' ]
for id in lines: for id in lines:
# http://wicd.net/translator/download_po.php?language=11 pofile, poheaders = urllib.urlretrieve('http://wicd.sourceforge.net/translator/download/'+str(id)+'/')
pofile, poheaders = urllib.urlretrieve('http://wicd.net/translator/download/'+str(id)) try:
#for i in `cat ids`; do lang_identifier = open(pofile,'r').readlines()[0].strip()
#wget "http://wicd.sourceforge.net/translator/download_po.php?language=$i&version=$1" -O "language_$i" first_line = lang_identifier
#iden=`python -c "import sys; print open('language_$i','r').readlines()[1].strip()[2:]"` lang_identifier = lang_identifier[lang_identifier.rindex('(')+1:lang_identifier.rindex(')')]
#mv "language_$i" po/$iden.po print first_line
#mkdir -p $iden/LC_MESSAGES/ except:
#msgfmt --output-file=$iden/LC_MESSAGES/wicd.mo po/$iden.po print >> sys.stderr, 'error downloading language %s' % id
lang_identifier = open(pofile,'r').readlines()[0].strip() else:
lang_identifier = lang_identifier[lang_identifier.rindex('(')+1:lang_identifier.rindex(')')] shutil.move(pofile, lang_identifier+'.po')
shutil.move(pofile, lang_identifier+'.po') os.makedirs('translations/'+lang_identifier+'/LC_MESSAGES')
print 'Got',lang_identifier os.system('msgfmt --output-file=translations/' + lang_identifier +
os.makedirs('translations/'+lang_identifier+'/LC_MESSAGES') '/LC_MESSAGES/wicd.mo ' + lang_identifier + '.po')
os.system('msgfmt --output-file=translations/' + lang_identifier + os.remove(lang_identifier+'.po')
'/LC_MESSAGES/wicd.mo ' + lang_identifier + '.po')
os.remove(lang_identifier+'.po')
class uninstall(Command): class uninstall(Command):