Diffstat (limited to 'noncore/settings/networksettings2/main.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/networksettings2/main.cpp | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/noncore/settings/networksettings2/main.cpp b/noncore/settings/networksettings2/main.cpp index 6c969fc..b32b323 100644 --- a/noncore/settings/networksettings2/main.cpp +++ b/noncore/settings/networksettings2/main.cpp @@ -2,2 +2,3 @@ #include "activateprofile.h" +#include "activatevpn.h" #include "networksettings.h" @@ -23,2 +24,4 @@ OPIE_EXPORT_APP( OApplicationFactory<NetworkSettings> ) #define ACT_PROMPT 3 +// used by interfaces to trigger VPN +#define ACT_VPN 4 @@ -46,2 +49,5 @@ int main( int argc, char * argv[] ) { rmv = 1; + } else if( strcmp( argv[i], "--triggervpn" ) == 0 ) { + Action = ACT_VPN; + rmv = 1; } @@ -80,6 +86,4 @@ int main( int argc, char * argv[] ) { { NetworkSettingsData NS; - Log(("ACT_REQUEST\n")); if( NS.canStart( argv[1] ) ) { QString S; - Log(("NEED FOR PROMPT\n" )); S.sprintf( QPEApplication::qpeDir()+ @@ -99,3 +103,2 @@ int main( int argc, char * argv[] ) { { NetworkSettingsData NS; - Log(("REGEN\n" )); // regen returns 0 if OK @@ -106,3 +109,2 @@ int main( int argc, char * argv[] ) { { ActivateProfile AP(argv[1]); - Log(("PROMPT\n" )); if( AP.exec() == QDialog::Accepted ) { @@ -114,5 +116,9 @@ int main( int argc, char * argv[] ) { break; + case ACT_VPN : + { ActivateVPN AVPN; + AVPN.exec(); + } + break; case ACT_GUI : { QWidget * W = new NetworkSettings(0); - Log(("GUI\n" )); TheApp->setMainWidget( W ); |