[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-06 14:54:49
Message-ID: 20050206145449.259B81BAC4 () office ! kde ! org
[Download RAW message or body]

CVS commit by esben: 

Turn off global "SynchronizeClipboardAndSelection" option at startup

BUG: 98622


  M +20 -4     toplevel.cpp   1.170


--- kdebase/klipper/toplevel.cpp  #1.169:1.170
@@ -98,4 +98,6 @@ extern bool qt_qclipboard_bailout_hack;
 #endif
 
+static void ensureGlobalSyncOff(KConfig* config);
+
 // config == kapp->config for process, otherwise applet
 KlipperWidget::KlipperWidget( QWidget *parent, KConfig* config )
@@ -109,8 +111,6 @@ KlipperWidget::KlipperWidget( QWidget *p
     qt_qclipboard_bailout_hack = true;
 
-// We don't use the clipboardsynchronizer anymore
-    KClipboardSynchronizer::setSynchronizing( false );
-    KClipboardSynchronizer::setReverseSynchronizing( false );
-    KIPC::sendMessageAll( KIPC::ClipboardConfigChanged, 0 );
+    // We don't use the clipboardsynchronizer anymore, and it confuses Klipper
+    ensureGlobalSyncOff(m_config);
 
     updateTimestamp(); // read initial X user time
@@ -1048,3 +1048,19 @@ void Klipper::quitProcess()
 }
 
+static void ensureGlobalSyncOff(KConfig* config) {
+    config->setGroup("General");
+    if ( config->readBoolEntry( "SynchronizeClipboardAndSelection" ) ) {
+        kdDebug() << "Shutting off global synchronization" << endl;
+        config->writeEntry("SynchronizeClipboardAndSelection",
+                           false,
+                           true,
+                           true );
+        config->sync();
+        KClipboardSynchronizer::setSynchronizing( false );
+        KClipboardSynchronizer::setReverseSynchronizing( false );
+        KIPC::sendMessageAll( KIPC::ClipboardConfigChanged, 0 );
+    }
+
+}
+
 #include "toplevel.moc"


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