From 8366c74c086fd04a8be623e74e0af9736f8107c2 Mon Sep 17 00:00:00 2001
From: Andrew Psaltis <ampsaltis@gmail.com>
Date: Fri, 20 Feb 2009 21:44:16 -0500
Subject: [PATCH 1/2] .bzrignore: Added files generated from the build to
 .bzrignore wicd/misc.py:   Decode all unicode fonts before a client handles
 them.  Prevents wicd-curses   from dying due to having to display non-latin
 characters.

---
 .bzrignore   | 16 ++++++++++++++++
 wicd/misc.py | 10 +++++++++-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/.bzrignore b/.bzrignore
index 4cb9c80..8a13d6a 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -3,3 +3,19 @@ install.log
 uninstall.log
 .bzrignore
 vcsinfo.py
+build/*
+init/*/*
+man/wicd-curses.8
+man/wicd-manager-settings.conf.5
+man/wicd-wired-settings.conf.5
+man/wicd-wireless-settings.conf.5
+man/wicd.8
+other/50-wicd-suspend.sh
+other/55wicd
+other/80-wicd-connect.sh
+other/WHEREAREMYFILES
+other/wicd.conf
+scripts/wicd
+scripts/wicd-client
+scripts/wicd-curses
+wicd/wpath.py
diff --git a/wicd/misc.py b/wicd/misc.py
index 3e076aa..e0a69c6 100644
--- a/wicd/misc.py
+++ b/wicd/misc.py
@@ -529,7 +529,7 @@ def get_language_list_gui():
     language['stop_showing_chooser'] = _('Stop Showing Autoconnect pop-up temporarily')
     language['display_type_dialog'] = _('Use dBm to measure signal strength')
     language['scripts'] = _('Scripts')
-    language['invalid_address'] = _('Invalid address in $A entry.')
+    #language['invalid_address'] = _('Invalid address in $A entry.')
     language['global_settings'] = _('Use these settings for all networks sharing this essid')
     language['encrypt_info_missing'] = _('Required encryption information is missing.')
     language['enable_encryption'] = _('This network requires encryption to be enabled.')
@@ -614,6 +614,14 @@ def get_language_list_gui():
     language['wicd_curses'] = _("Wicd Curses Interface")
     language['dbus_fail'] = _("DBus failure! This is most likely caused by the wicd daemon stopping while wicd-curses is running. Please restart the daemon, and then restart wicd-curses.")
 
+    # Fix strings in wicd-curses
+    for i in language.keys():
+        try :
+            language[i] = language[i].decode('utf8')
+        except:
+            print "\"%s\"" % language[i]
+            raise
+
 
     return language
 

From f1920f7c7af943720d82c21b32d3a0850e2efa4c Mon Sep 17 00:00:00 2001
From: Andrew Psaltis <ampsaltis@gmail.com>
Date: Fri, 20 Feb 2009 21:54:30 -0500
Subject: [PATCH 2/2] .bzrignore: Added some stuff that I missed.

---
 .bzrignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.bzrignore b/.bzrignore
index 8a13d6a..e5f1d99 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -3,8 +3,10 @@ install.log
 uninstall.log
 .bzrignore
 vcsinfo.py
+build
 build/*
 init/*/*
+wpath.py*
 man/wicd-curses.8
 man/wicd-manager-settings.conf.5
 man/wicd-wired-settings.conf.5
@@ -15,6 +17,7 @@ other/55wicd
 other/80-wicd-connect.sh
 other/WHEREAREMYFILES
 other/wicd.conf
+other/postinst
 scripts/wicd
 scripts/wicd-client
 scripts/wicd-curses