[Apollon-cvs] apollon/apollon main.cpp,1.22,1.23

[Martin K. <mko...@us...>]

Update of /cvsroot/apollon/apollon/apollon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1924

Modified Files:
	main.cpp 
Log Message:
first run wizard is not executed if apollon is directed to connect to a remote giftd by calling "apollon -s IP:port"


Index: main.cpp
===================================================================
RCS file: /cvsroot/apollon/apollon/apollon/main.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** main.cpp	7 May 2005 12:26:39 -0000	1.22
--- main.cpp	8 May 2005 22:19:31 -0000	1.23
***************
*** 1,2 ****
--- 1,5 ----
+ #include <string.h>
+ #include <iostream>
+ 
  #include <qstring.h>
  #include <qmessagebox.h>
***************
*** 16,19 ****
--- 19,24 ----
  static KCmdLineOptions options[] = {  {"d", I18N_NOOP("switches on debug output"), 0} , { "s <argument>", I18N_NOOP("Connect to server host:port."), 0 } , { 0, 0, 0 }  };
  
+ using namespace std;
+ 
  int main( int argc, char **argv )
  {
***************
*** 49,56 ****
  	a.dcopClient()->registerAs(a.name(), false);
  
! 	FirstRunWizard wizard;
! 
! 	if(wizard.checkFirstRun() == false)
! 		return 0;
  
  	ApollonApp *apollon = new ApollonApp;
--- 54,70 ----
  	a.dcopClient()->registerAs(a.name(), false);
  
! 	//run FirstRun wizard only if apollon is not started 
! 	//with a remote giftd
! 	bool runWizard = true;
! 	for (int i = 0; i <= argc; i++) {
! 		if (QString("-s") == QString(argv[i])) {
! 			runWizard = false;
! 		}
! 	}
! 	if (runWizard) {
! 		FirstRunWizard wizard;
! 		if(wizard.checkFirstRun() == false)
! 			return 0;
! 	}
  
  	ApollonApp *apollon = new ApollonApp;