Diffstat (limited to 'noncore/settings/networksettings2/networksettings2') (more/less context) (show whitespace changes)
| -rw-r--r-- | noncore/settings/networksettings2/networksettings2/config.in | 6 | ||||
| -rw-r--r-- | noncore/settings/networksettings2/networksettings2/wextensions.cpp | 14 |
2 files changed, 12 insertions, 8 deletions
diff --git a/noncore/settings/networksettings2/networksettings2/config.in b/noncore/settings/networksettings2/networksettings2/config.in index 907f1a0..2b4e2f3 100644 --- a/noncore/settings/networksettings2/networksettings2/config.in +++ b/noncore/settings/networksettings2/networksettings2/config.in @@ -1,4 +1,4 @@ config NS2MAIN - boolean - default "y" if NS2 - depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NS2 + boolean "opie-networksettings2 (TCP/IP network settings)" + default "y" + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE diff --git a/noncore/settings/networksettings2/networksettings2/wextensions.cpp b/noncore/settings/networksettings2/networksettings2/wextensions.cpp index 778990c..c10bdc3 100644 --- a/noncore/settings/networksettings2/networksettings2/wextensions.cpp +++ b/noncore/settings/networksettings2/networksettings2/wextensions.cpp @@ -54,6 +54,6 @@ QString WExtensions::station(){ if ( 0 == ioctl( fd, SIOCGIWNICKN, &iwr )){ - iwr.u.data.pointer[(unsigned int) iwr.u.data.length-1] = '\0'; - return QString(iwr.u.data.pointer); + buffer[(unsigned int) iwr.u.data.length-1] = '\0'; + return (const char *)buffer; } - return QString(); + return QString::null; } @@ -66,5 +66,9 @@ QString WExtensions::essid(){ return QString(); + const char* buffer[200]; + iwr.u.data.pointer = (caddr_t) buffer; + iwr.u.data.length = IW_ESSID_MAX_SIZE; + iwr.u.data.flags = 0; if ( 0 == ioctl( fd, SIOCGIWESSID, &iwr )){ - iwr.u.essid.pointer[(unsigned int) iwr.u.essid.length] = '\0'; - return QString(iwr.u.essid.pointer); + buffer[(unsigned int) iwr.u.essid.length] = '\0'; + return (const char *)buffer; } |