rpms/kdebase/FC-5 kdebase-3.5.2-kwin.patch,1.1,1.2

[fedora-cvs-commits at redhat.com]

Author: than

Update of /cvs/dist/rpms/kdebase/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv8458

Modified Files:
	kdebase-3.5.2-kwin.patch 
Log Message:
update kdebase-3.5.2-kwin.patch


kdebase-3.5.2-kwin.patch:
 activation.cpp                  |    2 -
 client.cpp                      |   18 +++++++++++---
 clients/b2/b2client.cpp         |    2 -
 clients/default/kdedefault.cpp  |    2 -
 events.cpp                      |    8 +++---
 geometry.cpp                    |   16 ++++++++++++
 kcmkwin/kwinoptions/windows.cpp |   24 +++++++++++++++++--
 kcmkwin/kwinoptions/windows.h   |    3 ++
 kcmkwin/kwinrules/main.cpp      |    4 +--
 kompmgr/kompmgr.c               |   15 +++++++++---
 layers.cpp                      |   17 ++++++++++++-
 manage.cpp                      |   11 ++++++++
 popupinfo.cpp                   |    1 
 tabbox.cpp                      |   50 +++++++++++++++++++++++++---------------
 useractions.cpp                 |    3 +-
 utils.cpp                       |    9 ++++---
 utils.h                         |   12 ++++++---
 workspace.cpp                   |   35 +++++++++++++++++++++++-----
 workspace.h                     |    4 ++-
 19 files changed, 182 insertions(+), 54 deletions(-)

Index: kdebase-3.5.2-kwin.patch
===================================================================
RCS file: /cvs/dist/rpms/kdebase/FC-5/kdebase-3.5.2-kwin.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdebase-3.5.2-kwin.patch	28 Apr 2006 14:50:52 -0000	1.1
+++ kdebase-3.5.2-kwin.patch	28 Apr 2006 17:12:15 -0000	1.2
@@ -477,27 +477,6 @@
          }
      return false;
      }
---- kdebase-3.5.2/kwin/utils.h.kwin	2006-03-17 11:17:43.000000000 +0100
-+++ kdebase-3.5.2/kwin/utils.h	2006-04-28 12:30:43.000000000 +0200
-@@ -232,15 +232,13 @@
- inline
- int timestampCompare( Time time1, Time time2 ) // like strcmp()
-     {
--    if( time1 == time2 )
--        return 0;
--    return ( time1 - time2 ) < 1000000000 ? 1 : -1; // time1 > time2 -> 1, handle wrapping
-+    return NET::timestampCompare( time1, time2 );
-     }
- 
- inline
- Time timestampDiff( Time time1, Time time2 ) // returns time2 - time1
--    { // no need to handle wrapping?
--    return time2 - time1;
-+    {
-+    return NET::timestampDiff( time1, time2 );
-     }
- 
- bool isLocalMachine( const QCString& host );
 --- kdebase-3.5.2/kwin/workspace.cpp.kwin	2006-03-17 11:17:43.000000000 +0100
 +++ kdebase-3.5.2/kwin/workspace.cpp	2006-04-28 12:30:43.000000000 +0200
 @@ -512,7 +512,7 @@
@@ -608,3 +587,31 @@
          ClientList should_get_focus; // last is most recent
          ClientList attention_chain;
          
+--- kdebase-3.5.2/kwin/utils.h.kwin	2006-03-17 11:17:43.000000000 +0100
++++ kdebase-3.5.2/kwin/utils.h	2006-04-28 13:54:36.000000000 +0200
+@@ -230,17 +230,21 @@
+     }
+ 
+ inline
+-int timestampCompare( Time time1, Time time2 ) // like strcmp()
++int timestampCompare( unsigned long time1_, unsigned long time2_ ) // like strcmp()
+     {
++    Q_UINT32 time1 = time1_;
++    Q_UINT32 time2 = time2_;
+     if( time1 == time2 )
+         return 0;
+-    return ( time1 - time2 ) < 1000000000 ? 1 : -1; // time1 > time2 -> 1, handle wrapping
++    return Q_UINT32( time1 - time2 ) < 0x7fffffffU ? 1 : -1; // time1 > time2 -> 1, handle wrapping
+     }
+ 
+ inline
+-Time timestampDiff( Time time1, Time time2 ) // returns time2 - time1
++int timestampDiff( unsigned long time1_, unsigned long time2_ ) // returns time2 - time1
+     { // no need to handle wrapping?
+-    return time2 - time1;
++    Q_UINT32 time1 = time1_;
++    Q_UINT32 time2 = time2_;
++    return Q_UINT32( time2 - time1 );
+     }
+ 
+ bool isLocalMachine( const QCString& host );