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

List:       kde-commits
Subject:    KDE/kdenetwork/krdc
From:       Urs Wolfer <uwolfer () kde ! org>
Date:       2012-01-04 19:28:59
Message-ID: 20120104192859.E2C93AC890 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1271602 by uwolfer:

Restore key grabbing action status after sucessful connection.
Fixes keyboard blocking which prevented users for example to enter any passwords in KRDC or KWallet.

BUG: 191532

 M  +8 -3      mainwindow.cpp  


--- trunk/KDE/kdenetwork/krdc/mainwindow.cpp #1271601:1271602
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2007 - 2010 Urs Wolfer <uwolfer @ kde.org>
+** Copyright (C) 2007 - 2012 Urs Wolfer <uwolfer @ kde.org>
 ** Copyright (C) 2009 - 2010 Tony Murray <murraytony @ gmail.com>
 **
 ** This file is part of KDE.
@@ -354,7 +354,6 @@
 
     saveHostPrefs();
 
-    view->setGrabAllKeys(prefs->grabAllKeys());
     view->showDotCursor(prefs->showLocalCursor() ? RemoteView::CursorOn : RemoteView::CursorOff);
     view->setViewOnly(prefs->viewOnly());
     if (! switchFullscreenWhenConnected) view->enableScaling(prefs->windowedScale());
@@ -442,7 +441,8 @@
     if (status == RemoteView::Disconnecting || status == RemoteView::Disconnected)
         return;
 
-    const QString host = m_remoteViewList.at(m_currentRemoteView)->host();
+    RemoteView *view = m_remoteViewList.at(m_currentRemoteView);
+    const QString host = view->host();
 
     QString iconName = "krdc";
     QString message;
@@ -464,6 +464,11 @@
         iconName = "krdc";
         message = i18n("Connected to %1", host);
 
+        if (view->grabAllKeys() != view->hostPreferences()->grabAllKeys()) {
+            view->setGrabAllKeys(view->hostPreferences()->grabAllKeys());
+            updateActionStatus();
+        }
+
         // when started with command line fullscreen argument
         if (m_switchFullscreenWhenConnected) {
             m_switchFullscreenWhenConnected = false;
[prev in list] [next in list] [prev in thread] [next in thread]