From 6f14920e915de17b7439a8b5d6d5491d49c7a347 Mon Sep 17 00:00:00 2001 From: Cristian Tibirna Date: Mon, 8 Apr 2002 12:58:27 +0000 Subject: [PATCH] CT: fix for bug:28599 (by M. Ettrich). Update copyright svn path=/trunk/kdebase/kwin/; revision=147882 --- main.cpp | 5 +++-- workspace.cpp | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/main.cpp b/main.cpp index 0cfe4728e3..991813ea88 100644 --- a/main.cpp +++ b/main.cpp @@ -189,7 +189,7 @@ int kdemain( int argc, char * argv[] ) // one for each screen... QCString multiHead = getenv("KDE_MULTIHEAD"); if (multiHead.lower() == "true") { - + Display* dpy = XOpenDisplay( NULL ); if ( !dpy ) { fprintf(stderr, "%s: FATAL ERROR while trying to open display %s\n", @@ -235,8 +235,9 @@ int kdemain( int argc, char * argv[] ) KAboutData aboutData( "kwin", I18N_NOOP("KWin"), version, description, KAboutData::License_BSD, - I18N_NOOP("(c) 1999-2001, The KDE Developers")); + I18N_NOOP("(c) 1999-2002, The KDE Developers")); aboutData.addAuthor("Matthias Ettrich",0, "ettrich@kde.org"); + aboutData.addAuthor("Cristian Tibirna",0, "tibirna@kde.org"); aboutData.addAuthor("Daniel M. Duley",0, "mosfet@kde.org"); KCmdLineArgs::init(argc, argv, &aboutData); diff --git a/workspace.cpp b/workspace.cpp index bcdbaaf3cf..b369500c12 100644 --- a/workspace.cpp +++ b/workspace.cpp @@ -480,7 +480,7 @@ Workspace::~Workspace() */ bool Workspace::workspaceEvent( XEvent * e ) { - if ( mouse_emulation && e->type == ButtonPress || e->type == ButtonRelease ) { + if ( mouse_emulation && (e->type == ButtonPress || e->type == ButtonRelease) ) { mouse_emulation = FALSE; XUngrabKeyboard( qt_xdisplay(), qt_x_time ); }