yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Accidentally broke tunk in my previous commit. I was supposed to commit

Browse source 
to a branch, but instead committed to the trunk. Well, the trunk was
broken because not all files were committed and hence anyone who checked
out of the trunk during this time could not have built kwin.

From what I can gather, the trunk has been broken for around 45 minutes
now. I didn't realize all that while that the trunk was broken. I
apologize for the inconvinience and I deeply regret my actions which
were clearly not well-thought.

Sorry,
Rohan


svn path=/trunk/KDE/kdebase/workspace/; revision=1133013
This commit is contained in:
Rohan Ramdas Prabhu 2010-05-31 22:18:41 +00:00
parent d8daff5162
commit 4f10c8fc39
2 changed files with 0 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CMakeLists.txt
View file

@ -110,11 +110,6 @@ set(kwin_KDEINIT_SRCS
tiling.cpp
tilinglayout.cpp
tilinglayoutfactory.cpp
#load the scripting related functions
scripttesting.cpp
scripting/scripting.cpp
scripting/workspace.cpp
# tiling layouts
# spiral

19
main.cpp
View file

@ -40,11 +40,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <kdefakes.h>
#include <QtDBus/QtDBus>
#include <QMessageBox>
#include <QEvent>
#include "scripttesting.h"
#include "scripting/scripting.h"
#include <kdialog.h>
#include <kstandarddirs.h>
#include <kdebug.h>
@ -493,11 +488,8 @@ KDE_EXPORT int kdemain( int argc, char * argv[] )
args.add( "lock", ki18n( "Disable configuration options" ));
args.add( "replace", ki18n( "Replace already-running ICCCM2.0-compliant window manager" ));
args.add( "crashes <n>", ki18n( "Indicate that KWin has recently crashed n times" ));
args.add( "stest", ki18n( "Load the script testing dialog" ));
KCmdLineArgs::addCmdLineOptions( args );
ScriptTesting* stestWindow;
if( KDE_signal( SIGTERM, KWin::sighandler ) == SIG_IGN )
KDE_signal( SIGTERM, SIG_IGN );
if( KDE_signal( SIGINT, KWin::sighandler ) == SIG_IGN )
@ -512,7 +504,6 @@ KDE_EXPORT int kdemain( int argc, char * argv[] )
KWin::SessionManager weAreIndeed;
KWin::SessionSaveDoneHelper helper;
KGlobal::locale()->insertCatalog( "kwin_effects" );
KWin::Scripting scripting;
// Announce when KWIN_DIRECT_GL is set for above HACK
if( qstrcmp( qgetenv( "KWIN_DIRECT_GL" ), "1" ) == 0 )
@ -528,16 +519,6 @@ KDE_EXPORT int kdemain( int argc, char * argv[] )
QDBusConnection::sessionBus().interface()->registerService(
appname, QDBusConnectionInterface::DontQueueService );
KCmdLineArgs* sargs = KCmdLineArgs::parsedArgs();
if(sargs->isSet("stest")) {
stestWindow = new ScriptTesting();
stestWindow->setEngine(&scripting);
stestWindow->runDefault();
//QEvent* showSTest = new QEvent(QEvent::Type(QEvent::User + 7));
//a.postEvent(stestWindow, showSTest, INT_MIN);
}
return a.exec();
}