[pkg-wpa-devel] r1533 - in /wpasupplicant/trunk/debian: changelog patches/10_wpa_gui_qt4_network_id_qregexp.patch patches/series
kelmo-guest at users.alioth.debian.org
kelmo-guest at users.alioth.debian.org
Sat May 1 08:24:48 UTC 2010
Author: kelmo-guest
Date: Sat May 1 08:24:47 2010
New Revision: 1533
URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1533
Log:
Add 10_wpa_gui_qt4_network_id_qregexp.patch which replaces wpa_gui-
qt4's string comparison of 'Select any network' with regular
expression matching of '^\d+:' for functions which need to get the
network id number.
Added:
wpasupplicant/trunk/debian/patches/10_wpa_gui_qt4_network_id_qregexp.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=1533&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Sat May 1 08:24:47 2010
@@ -20,8 +20,12 @@
* Set default driver type to nl80211,wext in ifupdown glue.
* Remove duplicate handling of wpa-mode in ifupdown/functions.sh.
* Add support for scan_freq and freq_list in ifupdown/functions.sh.
-
- -- Kel Modderman <kel at otaku42.de> Mon, 26 Apr 2010 11:19:30 +1000
+ * Add 10_wpa_gui_qt4_network_id_qregexp.patch which replaces wpa_gui-
+ qt4's string comparison of 'Select any network' with regular
+ expression matching of '^\d+:' for functions which need to get the
+ network id number.
+
+ -- Kel Modderman <kel at otaku42.de> Sat, 01 May 2010 18:23:42 +1000
wpasupplicant (0.6.10-2) unstable; urgency=low
Added: wpasupplicant/trunk/debian/patches/10_wpa_gui_qt4_network_id_qregexp.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/10_wpa_gui_qt4_network_id_qregexp.patch?rev=1533&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/10_wpa_gui_qt4_network_id_qregexp.patch (added)
+++ wpasupplicant/trunk/debian/patches/10_wpa_gui_qt4_network_id_qregexp.patch Sat May 1 08:24:47 2010
@@ -1,0 +1,110 @@
+Description: Use regular expression matches to see if input is not
+ the (now translated?) string "Select any network" and is a
+ "<network id>: <ssid>" string or the "all" keyword.
+From: Kel Modderman <kel at otaku42.de>
+---
+--- a/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
++++ b/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
+@@ -971,17 +971,10 @@ void WpaGui::selectNetwork( const QStrin
+ char reply[10];
+ size_t reply_len = sizeof(reply);
+
+- if (cmd.compare(tr("Select any network"))) {
++ if (cmd.contains(QRegExp("^\\d+:")))
++ cmd.truncate(cmd.indexOf(':'));
++ else
+ cmd = "any";
+- } else {
+- int pos = cmd.indexOf(':');
+- if (pos < 0) {
+- printf("Invalid selectNetwork '%s'\n",
+- cmd.toAscii().constData());
+- return;
+- }
+- cmd.truncate(pos);
+- }
+ cmd.prepend("SELECT_NETWORK ");
+ ctrlRequest(cmd.toAscii().constData(), reply, &reply_len);
+ triggerUpdate();
+@@ -995,14 +988,12 @@ void WpaGui::enableNetwork(const QString
+ char reply[10];
+ size_t reply_len = sizeof(reply);
+
+- if (!cmd.startsWith("all")) {
+- int pos = cmd.indexOf(':');
+- if (pos < 0) {
+- printf("Invalid enableNetwork '%s'\n",
+- cmd.toAscii().constData());
+- return;
+- }
+- cmd.truncate(pos);
++ if (cmd.contains(QRegExp("^\\d+:")))
++ cmd.truncate(cmd.indexOf(':'));
++ else if (!cmd.startsWith("all")) {
++ printf("Invalid editNetwork '%s'\n",
++ cmd.toAscii().constData());
++ return;
+ }
+ cmd.prepend("ENABLE_NETWORK ");
+ ctrlRequest(cmd.toAscii().constData(), reply, &reply_len);
+@@ -1016,14 +1007,12 @@ void WpaGui::disableNetwork(const QStrin
+ char reply[10];
+ size_t reply_len = sizeof(reply);
+
+- if (!cmd.startsWith("all")) {
+- int pos = cmd.indexOf(':');
+- if (pos < 0) {
+- printf("Invalid disableNetwork '%s'\n",
+- cmd.toAscii().constData());
+- return;
+- }
+- cmd.truncate(pos);
++ if (cmd.contains(QRegExp("^\\d+:")))
++ cmd.truncate(cmd.indexOf(':'));
++ else if (!cmd.startsWith("all")) {
++ printf("Invalid editNetwork '%s'\n",
++ cmd.toAscii().constData());
++ return;
+ }
+ cmd.prepend("DISABLE_NETWORK ");
+ ctrlRequest(cmd.toAscii().constData(), reply, &reply_len);
+@@ -1036,14 +1025,8 @@ void WpaGui::editNetwork(const QString &
+ QString cmd(sel);
+ int id = -1;
+
+- if (!cmd.compare(tr("Select any network"))) {
+- int pos = sel.indexOf(':');
+- if (pos < 0) {
+- printf("Invalid editNetwork '%s'\n",
+- cmd.toAscii().constData());
+- return;
+- }
+- cmd.truncate(pos);
++ if (cmd.contains(QRegExp("^\\d+:"))) {
++ cmd.truncate(cmd.indexOf(':'));
+ id = cmd.toInt();
+ }
+
+@@ -1114,17 +1097,12 @@ void WpaGui::removeNetwork(const QString
+ char reply[10];
+ size_t reply_len = sizeof(reply);
+
+- if (cmd.compare(tr("Select any network")))
++ if (cmd.contains(QRegExp("^\\d+:")))
++ cmd.truncate(cmd.indexOf(':'));
++ else if (!cmd.startsWith("all")) {
++ printf("Invalid editNetwork '%s'\n",
++ cmd.toAscii().constData());
+ return;
+-
+- if (!cmd.startsWith("all")) {
+- int pos = cmd.indexOf(':');
+- if (pos < 0) {
+- printf("Invalid removeNetwork '%s'\n",
+- cmd.toAscii().constData());
+- return;
+- }
+- cmd.truncate(pos);
+ }
+ cmd.prepend("REMOVE_NETWORK ");
+ ctrlRequest(cmd.toAscii().constData(), reply, &reply_len);
Modified: wpasupplicant/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/series?rev=1533&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/series (original)
+++ wpasupplicant/trunk/debian/patches/series Sat May 1 08:24:47 2010
@@ -2,3 +2,4 @@
02_dbus_group_policy.patch
06_wpa_gui_menu_exec_path.patch
07_dbus_service_syslog.patch
+10_wpa_gui_qt4_network_id_qregexp.patch
More information about the Pkg-wpa-devel
mailing list