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

List:       kde-commits
Subject:    KDE/kdenetwork/krfb
From:       George Goldberg <grundleborg () googlemail ! com>
Date:       2009-09-16 12:25:43
Message-ID: 1253103943.237199.22206.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1024354 by gberg:

Change -Ask before accepting uninvited connections- to just -Ask before accepting \
connections- and make it behave as expceted.

This is because we can't know until after the connection has been accepted whether it \
was invited or not, so the old code used the broken method of seeing if there were 0 \
or more invitations to tell.

BUG: 188676

 M  +30 -29    configsecurity.ui  
 M  +1 -1      connectioncontroller.cpp  


--- trunk/KDE/kdenetwork/krfb/configsecurity.ui #1024353:1024354
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>Security</class>
- <widget class="QWidget" name="Security" >
-  <property name="geometry" >
+ <widget class="QWidget" name="Security">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -9,66 +10,66 @@
     <height>201</height>
    </rect>
   </property>
-  <layout class="QVBoxLayout" >
+  <layout class="QVBoxLayout">
    <item>
-    <widget class="QCheckBox" name="kcfg_allowUninvitedConnections" >
-     <property name="text" >
+    <widget class="QCheckBox" name="kcfg_allowUninvitedConnections">
+     <property name="text">
       <string>Allow uninvited connections</string>
      </property>
     </widget>
    </item>
    <item>
-    <widget class="QCheckBox" name="kcfg_allowDesktopControl" >
-     <property name="text" >
+    <widget class="QCheckBox" name="kcfg_allowDesktopControl">
+     <property name="text">
       <string>Allow remote connections to control your desktop</string>
      </property>
-     <property name="checked" >
+     <property name="checked">
       <bool>true</bool>
      </property>
     </widget>
    </item>
    <item>
-    <widget class="QCheckBox" name="kcfg_askOnConnect" >
-     <property name="enabled" >
+    <widget class="QCheckBox" name="kcfg_askOnConnect">
+     <property name="enabled">
       <bool>false</bool>
      </property>
-     <property name="text" >
-      <string>Ask before accepting an uninvited connection</string>
+     <property name="text">
+      <string>Ask before accepting connections</string>
      </property>
-     <property name="checked" >
+     <property name="checked">
       <bool>true</bool>
      </property>
     </widget>
    </item>
    <item>
-    <widget class="QLabel" name="label" >
-     <property name="enabled" >
+    <widget class="QLabel" name="label">
+     <property name="enabled">
       <bool>false</bool>
      </property>
-     <property name="text" >
+     <property name="text">
       <string>Uninvited connections password:</string>
      </property>
-     <property name="buddy" >
+     <property name="buddy">
       <cstring>kcfg_uninvitedConnectionPassword</cstring>
      </property>
     </widget>
    </item>
    <item>
-    <widget class="KLineEdit" name="kcfg_uninvitedConnectionPassword" >
-     <property name="enabled" >
+    <widget class="KLineEdit" name="kcfg_uninvitedConnectionPassword">
+     <property name="enabled">
       <bool>false</bool>
      </property>
-     <property name="echoMode" >
+     <property name="echoMode">
       <enum>QLineEdit::Password</enum>
      </property>
     </widget>
    </item>
    <item>
     <spacer>
-     <property name="orientation" >
+     <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeHint" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>40</height>
@@ -93,11 +94,11 @@
    <receiver>kcfg_askOnConnect</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>22</x>
      <y>24</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>29</x>
      <y>80</y>
     </hint>
@@ -109,11 +110,11 @@
    <receiver>kcfg_uninvitedConnectionPassword</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>98</x>
      <y>21</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>192</x>
      <y>137</y>
     </hint>
@@ -125,11 +126,11 @@
    <receiver>label</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>117</x>
      <y>20</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>120</x>
      <y>94</y>
     </hint>
--- trunk/KDE/kdenetwork/krfb/connectioncontroller.cpp #1024353:1024354
@@ -117,7 +117,7 @@
     // the clientGoneHook to be called when the connection ends.
     cl->clientGoneHook = clientGoneHook;
 
-    if (!askOnConnect && InvitationManager::self()->activeInvitations() == 0) {
+    if (!askOnConnect) {
         KNotification::event("NewConnectionAutoAccepted",
                              i18n("Accepted uninvited connection from %1",
                                   remoteIp));


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