diff options
| author | Sergey Mironov <ierton@gmail.com> | 2013-03-31 18:07:40 +0000 |
|---|---|---|
| committer | Sergey Mironov <ierton@gmail.com> | 2013-03-31 18:10:28 +0000 |
| commit | 6901f6346dedac38ca2b11ce17de2c9f3d03aa4d (patch) | |
| tree | 42875f799db3688d211a0f557fa7d239dcc52d14 /pkgs/tools/networking/wicd | |
| parent | ee921d9df413b7634229e79630b7ca9217a1cb2d (diff) | |
| download | nixlib-6901f6346dedac38ca2b11ce17de2c9f3d03aa4d.tar nixlib-6901f6346dedac38ca2b11ce17de2c9f3d03aa4d.tar.gz nixlib-6901f6346dedac38ca2b11ce17de2c9f3d03aa4d.tar.bz2 nixlib-6901f6346dedac38ca2b11ce17de2c9f3d03aa4d.tar.lz nixlib-6901f6346dedac38ca2b11ce17de2c9f3d03aa4d.tar.xz nixlib-6901f6346dedac38ca2b11ce17de2c9f3d03aa4d.tar.zst nixlib-6901f6346dedac38ca2b11ce17de2c9f3d03aa4d.zip | |
wicd: [HACK] fix various gtk issues
* hack around s.translate situation * fix KeyError exception in error dialog * fix Russian translation
Diffstat (limited to 'pkgs/tools/networking/wicd')
| -rw-r--r-- | pkgs/tools/networking/wicd/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/tools/networking/wicd/fix-gtk-issues.patch | 47 |
2 files changed, 48 insertions, 0 deletions
diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix index 0b63f40a95be..f8d3186f3a91 100644 --- a/pkgs/tools/networking/wicd/default.nix +++ b/pkgs/tools/networking/wicd/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { ./dhclient.patch ./no-ast-transl.patch ./fix-app-icon.patch + ./fix-gtk-issues.patch ]; # Should I be using pygtk's propogated build inputs? diff --git a/pkgs/tools/networking/wicd/fix-gtk-issues.patch b/pkgs/tools/networking/wicd/fix-gtk-issues.patch new file mode 100644 index 000000000000..31e553b46b50 --- /dev/null +++ b/pkgs/tools/networking/wicd/fix-gtk-issues.patch @@ -0,0 +1,47 @@ +diff -ruN wicd-1.7.2.4.orig/gtk/gui.py wicd-1.7.2.4/gtk/gui.py +--- wicd-1.7.2.4.orig/gtk/gui.py 2013-03-31 17:01:29.367001288 +0000 ++++ wicd-1.7.2.4/gtk/gui.py 2013-03-31 17:55:20.826028396 +0000 +@@ -35,7 +35,7 @@ + from wicd import misc + from wicd import wpath + from wicd import dbusmanager +-from wicd.misc import noneToString ++from wicd.misc import noneToString, _status_dict + from wicd.translations import _, language + import prefs + from prefs import PreferencesDialog +@@ -250,7 +250,7 @@ + + def handle_connection_results(self, results): + if results not in ['success', 'aborted'] and self.is_visible: +- error(self.window, language[results], block=False) ++ error(self.window, misc._status_dict[results], block=False) + + def create_adhoc_network(self, widget=None): + """ Shows a dialog that creates a new adhoc network. """ +diff -ruN wicd-1.7.2.4.orig/po/ru.po wicd-1.7.2.4/po/ru.po +--- wicd-1.7.2.4.orig/po/ru.po 2013-03-31 17:01:29.362001288 +0000 ++++ wicd-1.7.2.4/po/ru.po 2013-03-31 17:43:37.909022515 +0000 +@@ -173,7 +173,7 @@ + + #: wicd/misc.py:79 + msgid "Connection Failed: Bad password" +-msgstr "Ошибка соединения: Неверный пароль:" ++msgstr "Ошибка соединения: Неверный пароль" + + #: wicd/misc.py:89 + msgid "Connection Failed: No DHCP offers received." +diff -ruN wicd-1.7.2.4.orig/wicd/misc.py wicd-1.7.2.4/wicd/misc.py +--- wicd-1.7.2.4.orig/wicd/misc.py 2013-03-31 17:01:29.369001288 +0000 ++++ wicd-1.7.2.4/wicd/misc.py 2013-03-31 17:23:56.822012593 +0000 +@@ -430,7 +430,9 @@ + """ 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) ++ #return s.translate(None, table) ++ #return s.translate(table) ++ return s + + def sanitize_escaped(s): + """ Sanitize double-escaped unicode strings. """ |