rev 4330 - in kde-extras/knemo/trunk/debian: . patches

[Achim Bohnet]

Author: ach-guest
Date: 2006-08-14 18:41:20 +0000 (Mon, 14 Aug 2006)
New Revision: 4330

Added:
   kde-extras/knemo/trunk/debian/patches/13_fix_essid_regexp_for_not_quoted_strings.diff
Modified:
   kde-extras/knemo/trunk/debian/changelog
Log:
knemo:
   * added debian/patches/13_fix_essid_regexp_for_not_quoted_strings.diff
     Fixes broken ESSID extraction from iwconfig output for the case that
     the ESSID value is not quoted.


Modified: kde-extras/knemo/trunk/debian/changelog
===================================================================
--- kde-extras/knemo/trunk/debian/changelog	2006-08-14 14:21:40 UTC (rev 4329)
+++ kde-extras/knemo/trunk/debian/changelog	2006-08-14 18:41:20 UTC (rev 4330)
@@ -11,8 +11,11 @@
     reverts Dirk Muellers change from 6-Aug-2006
     trunk/extragear/network/knemo/knemod/knemod.desktop #570450:570451
     See also: http://bugs.kde.org/show_bug.cgi?id=132218
+  * added debian/patches/13_fix_essid_regexp_for_not_quoted_strings.diff
+    Fixes broken ESSID extraction from iwconfig output for the case that
+    the ESSID value is not quoted.
 
- -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Mon, 14 Aug 2006 15:05:36 +0200
+ -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Mon, 14 Aug 2006 20:38:37 +0200
 
 knemo (0.4.3-1) unstable; urgency=low
 

Added: kde-extras/knemo/trunk/debian/patches/13_fix_essid_regexp_for_not_quoted_strings.diff
===================================================================
--- kde-extras/knemo/trunk/debian/patches/13_fix_essid_regexp_for_not_quoted_strings.diff	2006-08-14 14:21:40 UTC (rev 4329)
+++ kde-extras/knemo/trunk/debian/patches/13_fix_essid_regexp_for_not_quoted_strings.diff	2006-08-14 18:41:20 UTC (rev 4330)
@@ -0,0 +1,20 @@
+--- knemo-0.4.4.orig/src/knemod/backends/nettoolsbackend.cpp
++++ knemo-0.4.4/src/knemod/backends/nettoolsbackend.cpp
+@@ -388,9 +388,16 @@
+ 
+ void NetToolsBackend::updateWirelessData( QString& config, WirelessData& data )
+ {
+-    QRegExp regExp( "ESSID:\"?([^\"]*)\"?" );
++    QRegExp regExp( "ESSID:([^\"][^\\s]*)" );
+     if ( regExp.search( config ) > -1 )
+         data.essid = regExp.cap( 1 );
++    else {
++        regExp.setPattern( "ESSID:\"([^\"]*)" );
++        if ( regExp.search( config ) > -1 )
++            data.essid = regExp.cap( 1 );
++        else
++            data.essid = "<parse error>";
++    }
+ 
+     regExp.setPattern( "Mode:(\\w*)" );
+     if ( regExp.search( config ) > -1 )