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

List:       kde-commits
Subject:    kdebase/klipper
From:       Esben Mose Hansen <kde () mosehansen ! dk>
Date:       2005-02-07 19:45:40
Message-ID: 20050207194540.4AD0717EA8 () office ! kde ! org
[Download RAW message or body]

CVS commit by esben: 

Revert


  M +12 -5     clipboardpoll.cpp   1.13
  M +2 -2      clipboardpoll.h   1.8


--- kdebase/klipper/clipboardpoll.cpp  #1.12:1.13
@@ -3,4 +3,11 @@
 
    Copyright (C) 2003 by Lubos Lunak <l.lunak@kde.org>
+   clipboardpoll.cpp (part of Klipper - Cut & paste history for KDE)
+
+   (C) 2003 by Lubos Lunak <l.lunak@kde.org>
+
+   Licensed under the Artistic License
+
+ ------------------------------------------------------------- */
 
    This program is free software; you can redistribute it and/or
@@ -61,5 +68,5 @@ ClipboardPoll::ClipboardPoll( QWidget* p
             "_QT_CLIPBOARD_SENTINEL",
             "CLIPBOARD",
-            "TARGETS",
+            "TIMESTAMP",
             "KLIPPER_SELECTION_TIMESTAMP",
             "KLIPPER_CLIPBOARD_TIMESTAMP" };
@@ -69,5 +76,5 @@ ClipboardPoll::ClipboardPoll( QWidget* p
     clipboard.sentinel_atom = atoms[ 1 ];
     xa_clipboard = atoms[ 2 ];
-    xa_targets = atoms[ 3 ];
+    xa_timestamp = atoms[ 3 ];
     selection.timestamp_atom = atoms[ 4 ];
     clipboard.timestamp_atom = atoms[ 5 ];
@@ -80,5 +87,5 @@ ClipboardPoll::ClipboardPoll( QWidget* p
 #endif
     clipboard.last_owner = XGetSelectionOwner( qt_xdisplay(), xa_clipboard );
-#ifdef NOISY_KLIPPER_
+#ifdef NOISY_KLIPPER
     kdDebug() << "(2) Setting last_owner for =" << "clipboard" << ":" << \
clipboard.last_owner << endl;  #endif
@@ -197,5 +204,5 @@ bool ClipboardPoll::checkTimestamp( Sele
     }
     XDeleteProperty( qt_xdisplay(), winId(), data.timestamp_atom );
-    XConvertSelection( qt_xdisplay(), data.atom, xa_targets, data.timestamp_atom, \
winId(), qt_x_time ); +    XConvertSelection( qt_xdisplay(), data.atom, xa_timestamp, \
data.timestamp_atom, winId(), qt_x_time );  data.waiting_for_timestamp = true;
     data.waiting_x_time = qt_x_time;
@@ -249,5 +256,5 @@ bool ClipboardPoll::changedTimestamp( Se
     if( timestamp != data.last_change || timestamp == CurrentTime )
     {
-#ifdef NOISY_KLIPPER_
+#ifdef NOISY_KLIPPER
         kdDebug() << "TIMESTAMP CHANGE:" << ( data.atom == XA_PRIMARY ) << endl;
 #endif

--- kdebase/klipper/clipboardpoll.h  #1.7:1.8
@@ -57,5 +57,5 @@ class ClipboardPoll
         SelectionData clipboard;
         Atom xa_clipboard;
-        Atom xa_targets;
+        Atom xa_timestamp;
     };
 


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