[Chinese-commits] [fqterm] 63/76: Telnet, SSH, and Local socket

[Boyuan Yang]

This is an automated email from the git hooks/post-receive script.

hosiet-guest pushed a commit to branch master
in repository fqterm.

commit a68d5b5eded5c214eb2e1f83c212a988965a38b3
Author: Iru Dog <mytbk920423 at gmail.com>
Date:   Thu Dec 11 16:56:19 2014 +0800

    Telnet, SSH, and Local socket
---
 src/terminal/internal/fqterm_telnet.cpp | 4 ++--
 src/ui/quickdialog.ui                   | 5 -----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/terminal/internal/fqterm_telnet.cpp b/src/terminal/internal/fqterm_telnet.cpp
index c629fa8..4555f83 100644
--- a/src/terminal/internal/fqterm_telnet.cpp
+++ b/src/terminal/internal/fqterm_telnet.cpp
@@ -213,11 +213,11 @@ FQTermTelnet::FQTermTelnet(const QString &strTermType, int rows, int columns,
   raw_size = 0;
 
 #ifndef _NO_SSH_COMPILED
-  if (protocolType == 1 || protocolType == 2) {
+  if (protocolType == 1) {
     socket = new FQTermSSHSocket(columns, rows, strTermType, sshuser, sshpasswd);
     FQ_VERIFY(connect(socket, SIGNAL(sshAuthOK()),
 		      this, SIGNAL(onSSHAuthOK())));
-  } else if (protocolType == 3) {
+  } else if (protocolType == 2) {
     socket = new FQTermLocalSocket();
   } else {
     socket = new FQTermTelnetSocket();
diff --git a/src/ui/quickdialog.ui b/src/ui/quickdialog.ui
index a830652..56921ad 100644
--- a/src/ui/quickdialog.ui
+++ b/src/ui/quickdialog.ui
@@ -149,11 +149,6 @@
        </item>
        <item>
         <property name="text">
-         <string>SSH</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
          <string>Local</string>
         </property>
        </item>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/chinese/fqterm.git