[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdebase/ksmserver
From:       Dirk Mueller <mueller () kde ! org>
Date:       2003-02-11 2:08:18
[Download RAW message or body]

CVS commit by mueller: 

fix --enable-final


  M +10 -7     server.cpp   1.106


--- kdebase/ksmserver/server.cpp  #1.105:1.106
@@ -67,5 +67,4 @@ CONNECTION WITH THE SOFTWARE OR THE USE 
 #include <unistd.h>
 #include <kapplication.h>
-#include <knotifyclient.h>
 #include <kstaticdeleter.h>
 #include <ktempfile.h>
@@ -82,4 +81,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE 
 
 #include <kdebug.h>
+
+const int XNone = None;
+#undef None
+#include <knotifyclient.h>
 #include <qregexp.h>
 
@@ -1496,7 +1499,7 @@ const int WM_SAVE_YOURSELF_TIMEOUT = 400
 static WindowMap* windowMapPtr = 0;
 
-static Atom wm_save_yourself = None;
-static Atom wm_protocols = None;
-static Atom wm_client_leader = None;
+static Atom wm_save_yourself = XNone;
+static Atom wm_protocols = XNone;
+static Atom wm_client_leader = XNone;
 
 extern Time qt_x_time;
@@ -1522,5 +1525,5 @@ void KSMServer::performLegacySessionSave
     // and determine which style (WM_COMMAND or WM_SAVE_YOURSELF)
     KWinModule module;
-    if( wm_save_yourself == None ) {
+    if( wm_save_yourself == XNone ) {
         Atom atoms[ 3 ];
         const char* const names[]
@@ -1563,5 +1566,5 @@ void KSMServer::performLegacySessionSave
                   GrabModeAsync, GrabModeAsync, CurrentTime);
     XGrabPointer(newdisplay, root, False, Button1Mask|Button2Mask|Button3Mask,
-                 GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
+                 GrabModeAsync, GrabModeAsync, XNone, XNone, CurrentTime);
     // Send WM_SAVE_YOURSELF messages
     XEvent ev;
@@ -1833,5 +1836,5 @@ QCString KSMServer::windowSessionId(WId 
 {
     QCString result = getStringProperty(w, qt_sm_client_id);
-    if (result.isEmpty() && leader != None && leader != w)
+    if (result.isEmpty() && leader != XNone && leader != w)
         result = getStringProperty(leader, qt_sm_client_id);
     return result;


[prev in list] [next in list] [prev in thread] [next in thread]