Blob Blame History Raw
diff -up kdebase-workspace-4.2.0/kdm/kfrontend/kgapp.h.orig kdebase-workspace-4.2.0/kdm/kfrontend/kgapp.h
--- kdebase-workspace-4.2.0/kdm/kfrontend/kgapp.h.orig	2009-02-11 15:57:52.000000000 +0100
+++ kdebase-workspace-4.2.0/kdm/kfrontend/kgapp.h	2009-02-11 15:58:20.000000000 +0100
@@ -35,7 +35,7 @@ class GreeterApp : public QApplication {
 	typedef QApplication inherited;
 
   public:
-	GreeterApp(int argc, char **argv);
+	GreeterApp(int &argc, char **argv);
 	virtual bool x11EventFilter( XEvent * );
 
   protected:
diff -up kdebase-workspace-4.2.0/kdm/kfrontend/kgapp.cpp.orig kdebase-workspace-4.2.0/kdm/kfrontend/kgapp.cpp
--- kdebase-workspace-4.2.0/kdm/kfrontend/kgapp.cpp.orig	2009-02-11 16:16:28.000000000 +0100
+++ kdebase-workspace-4.2.0/kdm/kfrontend/kgapp.cpp	2009-02-11 16:22:15.000000000 +0100
@@ -70,7 +70,7 @@ sigAlarm( int )
 
 }
 
-GreeterApp::GreeterApp( int argc, char **argv ) :
+GreeterApp::GreeterApp( int &argc, char **argv ) :
 	inherited( argc, argv ),
 	regrabPtr( false ), regrabKbd( false ),
 	dragWidget( 0 )
@@ -296,13 +296,14 @@ main( int argc ATTR_UNUSED, char **argv 
 	}
 
 	static char *fakeArgv[] = { (char *)"kdmgreet", 0 };
+	static int fakeArgc = as(fakeArgv) - 1;
 
 	KCrash::setFlags( KCrash::KeepFDs | KCrash::SaferDialog | KCrash::AlwaysDirectly );
 	KCrash::setApplicationName( QLatin1String( fakeArgv[0] ) );
 	KCrash::setCrashHandler( KCrash::defaultCrashHandler );
 	XSetIOErrorHandler( xIOErr );
 	KComponentData inst( fakeArgv[0] );
-	GreeterApp app( as(fakeArgv) - 1, fakeArgv );
+	GreeterApp app( fakeArgc, fakeArgv );
 	foreach (const QString &dir, KGlobal::dirs()->resourceDirs( "qtplugins" ))
 		app.addLibraryPath( dir );
 	initQAppConfig();