[pkg-wpa-devel] r1055 - in /wpasupplicant/trunk/debian: changelog patches/46_wpa_gui_qt4_networkconfig_check_idstr.patch patches/series

[kelmo-guest at users.alioth.debian.org]

Author: kelmo-guest
Date: Wed Jan 23 10:06:51 2008
New Revision: 1055

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1055
Log:
  position of id string and adds a priority counter (as well as other
  enhancements).
    - debian/patches/46_wpa_gui_qt4_networkconfig_check_idstr.patch

Added:
    wpasupplicant/trunk/debian/patches/46_wpa_gui_qt4_networkconfig_check_idstr.patch
Modified:
    wpasupplicant/trunk/debian/changelog
    wpasupplicant/trunk/debian/patches/series

Modified: wpasupplicant/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/changelog?rev=1055&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Wed Jan 23 10:06:51 2008
@@ -37,15 +37,17 @@
     wpa_gui-qt4 exit, both from File->exit and the X button on the titlebar.
   * Add patches to increase usability of wpa_gui-qt4. These update the
     networkconfig.ui file to syntax the qt4-designer prefers, changes the
-    position of id string and adds a priority counter.
+    position of id string and adds a priority counter (as well as other
+    enhancements).
       - debian/patches/40_wpa_gui_qt4_networkconfigui_rework.patch
       - debian/patches/41_wpa_gui_qt4_networkconfigui_inc_size.patch
       - debian/patches/42_wpa_gui_qt4_networkconfigui_label_names.patch
       - debian/patches/43_wpa_gui_qt4_networkconfigui_tab_order.patch
       - debian/patches/44_wpa_gui_qt4_networkconfigui_network_prefs_box.patch
       - debian/patches/45_wpa_gui_qt4_networkconfig_idstr_priority.patch
-
- -- Kel Modderman <kel at otaku42.de>  Wed, 23 Jan 2008 18:38:44 +1000
+      - debian/patches/46_wpa_gui_qt4_networkconfig_check_idstr.patch
+
+ -- Kel Modderman <kel at otaku42.de>  Wed, 23 Jan 2008 20:05:34 +1000
 
 wpasupplicant (0.6.2-1) experimental; urgency=low
 

Added: wpasupplicant/trunk/debian/patches/46_wpa_gui_qt4_networkconfig_check_idstr.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/46_wpa_gui_qt4_networkconfig_check_idstr.patch?rev=1055&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/46_wpa_gui_qt4_networkconfig_check_idstr.patch (added)
+++ wpasupplicant/trunk/debian/patches/46_wpa_gui_qt4_networkconfig_check_idstr.patch Wed Jan 23 10:06:51 2008
@@ -1,0 +1,23 @@
+--- a/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp
++++ b/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp
+@@ -142,6 +142,20 @@
+ 		}
+ 	}
+ 
++	if (idstrEdit->isEnabled() && !idstrEdit->text().isEmpty()) {
++		QRegExp rx("^(\\w|-)+$");
++		if (rx.indexIn(idstrEdit->text()) < 0) {
++			QMessageBox::warning(this, "Network ID Error",
++					     "Network ID String contains "
++					     "non-word characters.\n"
++					     "It must be a simple string, "
++					     "without spaces, containing\n"
++					     "only characters in this range: "
++					     "[A-Za-z0-9_-]\n");
++			return;
++		}
++	}
++
+ 	if (wpagui == NULL)
+ 		return;
+ 

Modified: wpasupplicant/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/series?rev=1055&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/series (original)
+++ wpasupplicant/trunk/debian/patches/series Wed Jan 23 10:06:51 2008
@@ -21,3 +21,4 @@
 43_wpa_gui_qt4_networkconfigui_tab_order.patch
 44_wpa_gui_qt4_networkconfigui_network_prefs_box.patch
 45_wpa_gui_qt4_networkconfig_idstr_priority.patch
+46_wpa_gui_qt4_networkconfig_check_idstr.patch