summaryrefslogtreecommitdiff
path: root/noncore/settings/networksettings2
Unidiff
Diffstat (limited to 'noncore/settings/networksettings2') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/networksettings2/bluetooth/config.in4
-rw-r--r--noncore/settings/networksettings2/cable/config.in4
-rw-r--r--noncore/settings/networksettings2/config.in9
-rw-r--r--noncore/settings/networksettings2/irda/config.in4
-rw-r--r--noncore/settings/networksettings2/lancard/config.in4
-rw-r--r--noncore/settings/networksettings2/main.cpp1
-rw-r--r--noncore/settings/networksettings2/modem/config.in4
-rw-r--r--noncore/settings/networksettings2/network/config.in4
-rw-r--r--noncore/settings/networksettings2/networksettings2/config.in6
-rw-r--r--noncore/settings/networksettings2/networksettings2/wextensions.cpp14
-rw-r--r--noncore/settings/networksettings2/ppp/config.in4
-rw-r--r--noncore/settings/networksettings2/profile/config.in4
-rw-r--r--noncore/settings/networksettings2/usb/config.in4
-rw-r--r--noncore/settings/networksettings2/vpn/config.in4
-rw-r--r--noncore/settings/networksettings2/wlan/config.in4
15 files changed, 40 insertions, 34 deletions
diff --git a/noncore/settings/networksettings2/bluetooth/config.in b/noncore/settings/networksettings2/bluetooth/config.in
index e5155e8..b1a5a58 100644
--- a/noncore/settings/networksettings2/bluetooth/config.in
+++ b/noncore/settings/networksettings2/bluetooth/config.in
@@ -2,3 +2,3 @@
2 boolean "opie-networksettings2plugin-bluetooth (set up BLUETOOTH)" 2 boolean "opie-networksettings2plugin-bluetooth (set up BLUETOOTH)"
3 default "n" if NS2 3 default "n"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NS2 && NS2CORE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NS2MAIN && NS2CORE
diff --git a/noncore/settings/networksettings2/cable/config.in b/noncore/settings/networksettings2/cable/config.in
index 1cdcaa1..9007f14 100644
--- a/noncore/settings/networksettings2/cable/config.in
+++ b/noncore/settings/networksettings2/cable/config.in
@@ -2,3 +2,3 @@
2 boolean "opie-networksettings2plugin-cable (set up Cable)" 2 boolean "opie-networksettings2plugin-cable (set up Cable)"
3 default "n" if NS2 3 default "n" if NS2MAIN
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NS2 && NS2CORE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NS2MAIN && NS2CORE
diff --git a/noncore/settings/networksettings2/config.in b/noncore/settings/networksettings2/config.in
index 1004ce4..ac38c2f 100644
--- a/noncore/settings/networksettings2/config.in
+++ b/noncore/settings/networksettings2/config.in
@@ -1,5 +1,7 @@
1 source noncore/settings/networksettings2/networksettings2/config.in
2
1config NS2 3config NS2
2 boolean "opie-networksettings-2 (TCP/IP network settings)" 4 boolean
3 default "y" 5 default "y" if NS2MAIN
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE 6 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NS2MAIN
5 7
@@ -21,2 +23 @@ config NS2CORE
21 source noncore/settings/networksettings2/modem/config.in source noncore/settings/networksettings2/modem/config.in
22 source noncore/settings/networksettings2/networksettings2/config.in
diff --git a/noncore/settings/networksettings2/irda/config.in b/noncore/settings/networksettings2/irda/config.in
index dd86b61..0da9a25 100644
--- a/noncore/settings/networksettings2/irda/config.in
+++ b/noncore/settings/networksettings2/irda/config.in
@@ -2,3 +2,3 @@
2 boolean "opie-networksettings2plugin-irda (set up IRDA)" 2 boolean "opie-networksettings2plugin-irda (set up IRDA)"
3 default "n" if NS2 3 default "n" if NS2MAIN
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NS2 && NS2CORE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NS2MAIN && NS2CORE
diff --git a/noncore/settings/networksettings2/lancard/config.in b/noncore/settings/networksettings2/lancard/config.in
index 71fb83e..c694908 100644
--- a/noncore/settings/networksettings2/lancard/config.in
+++ b/noncore/settings/networksettings2/lancard/config.in
@@ -2,3 +2,3 @@
2 boolean "opie-networksettings2plugin-lancard (regular wired lan card)" 2 boolean "opie-networksettings2plugin-lancard (regular wired lan card)"
3 default "n" if NS2 3 default "n" if NS2MAIN
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NS2 && NS2CORE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NS2MAIN && NS2CORE
diff --git a/noncore/settings/networksettings2/main.cpp b/noncore/settings/networksettings2/main.cpp
index b32b323..200e31b 100644
--- a/noncore/settings/networksettings2/main.cpp
+++ b/noncore/settings/networksettings2/main.cpp
@@ -65,2 +65,3 @@ int main( int argc, char * argv[] ) {
65 Action = ACT_REQUEST; 65 Action = ACT_REQUEST;
66 Log(("Request : %s\n", argv[1] ));
66 } 67 }
diff --git a/noncore/settings/networksettings2/modem/config.in b/noncore/settings/networksettings2/modem/config.in
index 1a36636..a354da0 100644
--- a/noncore/settings/networksettings2/modem/config.in
+++ b/noncore/settings/networksettings2/modem/config.in
@@ -2,3 +2,3 @@
2 boolean "opie-networksettings2plugin-modem (set up DIALUP)" 2 boolean "opie-networksettings2plugin-modem (set up DIALUP)"
3 default "n" if NS2 3 default "n" if NS2MAIN
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NS2 && NS2CORE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NS2MAIN && NS2CORE
diff --git a/noncore/settings/networksettings2/network/config.in b/noncore/settings/networksettings2/network/config.in
index 4c37974..725b7f0 100644
--- a/noncore/settings/networksettings2/network/config.in
+++ b/noncore/settings/networksettings2/network/config.in
@@ -2,3 +2,3 @@
2 boolean "opie-networksettings2plugin-ipsetup (set up TCP/IP)" 2 boolean "opie-networksettings2plugin-ipsetup (set up TCP/IP)"
3 default "n" if NS2 3 default "n" if NS2MAIN
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NS2 && NS2CORE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NS2MAIN && NS2CORE
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 @@
1 config NS2MAIN 1 config NS2MAIN
2 boolean 2 boolean "opie-networksettings2 (TCP/IP network settings)"
3 default "y" if NS2 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NS2 4 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(){
54 if ( 0 == ioctl( fd, SIOCGIWNICKN, &iwr )){ 54 if ( 0 == ioctl( fd, SIOCGIWNICKN, &iwr )){
55 iwr.u.data.pointer[(unsigned int) iwr.u.data.length-1] = '\0'; 55 buffer[(unsigned int) iwr.u.data.length-1] = '\0';
56 return QString(iwr.u.data.pointer); 56 return (const char *)buffer;
57 } 57 }
58 return QString(); 58 return QString::null;
59} 59}
@@ -66,5 +66,9 @@ QString WExtensions::essid(){
66 return QString(); 66 return QString();
67 const char* buffer[200];
68 iwr.u.data.pointer = (caddr_t) buffer;
69 iwr.u.data.length = IW_ESSID_MAX_SIZE;
70 iwr.u.data.flags = 0;
67 if ( 0 == ioctl( fd, SIOCGIWESSID, &iwr )){ 71 if ( 0 == ioctl( fd, SIOCGIWESSID, &iwr )){
68 iwr.u.essid.pointer[(unsigned int) iwr.u.essid.length] = '\0'; 72 buffer[(unsigned int) iwr.u.essid.length] = '\0';
69 return QString(iwr.u.essid.pointer); 73 return (const char *)buffer;
70 } 74 }
diff --git a/noncore/settings/networksettings2/ppp/config.in b/noncore/settings/networksettings2/ppp/config.in
index 9e3cd35..c722a10 100644
--- a/noncore/settings/networksettings2/ppp/config.in
+++ b/noncore/settings/networksettings2/ppp/config.in
@@ -2,3 +2,3 @@
2 boolean "opie-networksettings2plugin-ppp (set up PPP)" 2 boolean "opie-networksettings2plugin-ppp (set up PPP)"
3 default "n" if NS2 3 default "n" if NS2MAIN
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NS2 && NS2CORE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NS2MAIN && NS2CORE
diff --git a/noncore/settings/networksettings2/profile/config.in b/noncore/settings/networksettings2/profile/config.in
index c5f2075..f99ef99 100644
--- a/noncore/settings/networksettings2/profile/config.in
+++ b/noncore/settings/networksettings2/profile/config.in
@@ -2,3 +2,3 @@
2 boolean "opie-networksettings2plugin-profiles (User profiles)" 2 boolean "opie-networksettings2plugin-profiles (User profiles)"
3 default "n" if NS2 3 default "n" if NS2MAIN
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NS2 && NS2CORE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NS2MAIN && NS2CORE
diff --git a/noncore/settings/networksettings2/usb/config.in b/noncore/settings/networksettings2/usb/config.in
index 136806d..d0c6cba 100644
--- a/noncore/settings/networksettings2/usb/config.in
+++ b/noncore/settings/networksettings2/usb/config.in
@@ -2,3 +2,3 @@
2 boolean "opie-networksettings2plugin-usb (set up USB)" 2 boolean "opie-networksettings2plugin-usb (set up USB)"
3 default "n" if NS2 3 default "n" if NS2MAIN
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NS2 && NS2CORE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NS2MAIN && NS2CORE
diff --git a/noncore/settings/networksettings2/vpn/config.in b/noncore/settings/networksettings2/vpn/config.in
index fff52c3..0d2cb3a 100644
--- a/noncore/settings/networksettings2/vpn/config.in
+++ b/noncore/settings/networksettings2/vpn/config.in
@@ -2,3 +2,3 @@
2 boolean "opie-networksettings2plugin-vpn (set up VPN)" 2 boolean "opie-networksettings2plugin-vpn (set up VPN)"
3 default "n" if NS2 3 default "n" if NS2MAIN
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NS2 && NS2CORE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NS2MAIN && NS2CORE
diff --git a/noncore/settings/networksettings2/wlan/config.in b/noncore/settings/networksettings2/wlan/config.in
index 328287b..13ef9da 100644
--- a/noncore/settings/networksettings2/wlan/config.in
+++ b/noncore/settings/networksettings2/wlan/config.in
@@ -2,3 +2,3 @@
2 boolean "opie-networksettings2plugin-wlan (set up Wireless LAN)" 2 boolean "opie-networksettings2plugin-wlan (set up Wireless LAN)"
3 default "n" if NS2 3 default "n" if NS2MAIN
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NS2 && NS2CORE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && NS2MAIN && NS2CORE