Merge lp:~stefan-schwarzburg/qreator/fix_bug_1208033 into lp:qreator

[Schwarzburg]

This branch tries to fix bug 1208033.

The problem reported in this bug comes from the fact that the Wifi QR code type uses special characters to separate the ssid, the password and so on. Those characters have to be replaced.

[David Planella (dpm)]

Looks good to me, thanks for the fix!

review: Approve

=== modified file 'qreator/qrcodes/QRCodeWifiGtk.py'
--- qreator/qrcodes/QRCodeWifiGtk.py	2012-12-30 14:48:29 +0000
+++ qreator/qrcodes/QRCodeWifiGtk.py	2013-08-06 06:52:27 +0000
@@ -20,6 +20,16 @@
 from gi.repository import Gtk, NetworkManager, NMClient, GLib, GdkPixbuf
 
 
+def _escape(st):
+        """Replace problematic characters with the escaped versions.
+
+        Note that the backslash must be the first character to replace"""
+        esc_string = st
+        for c in ["\\", ",", ":", ";"]:
+            esc_string = esc_string.replace(c, "\\" + c)
+        return esc_string
+    
+
 class QRCodeWifiGtk(object):
     def __init__(self, qr_code_update_func):
         self.qr_code_update_func = qr_code_update_func
@@ -94,8 +104,8 @@
         if not security or ssid == '' or password == '':
             return
 
-        wifi_qr_code = 'WIFI:T:{0};S:{1};P:{2};;'.format(security, ssid,
-                                                         password)
+        wifi_qr_code = 'WIFI:T:{0};S:{1};P:{2};;'.format(_escape(security), _escape(ssid),
+                                                         _escape(password))
         self.qr_code_update_func(wifi_qr_code)
 
     def on_comboboxtextSecurity_changed(self, widget, data=None):