Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/tigervnc/patches/tigervnc-1.0.90-102434.patch

    Contents of /trunk/tigervnc/patches/tigervnc-1.0.90-102434.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 1052 - (show annotations) (download)
    Tue Jun 15 06:02:59 2010 UTC (13 years, 10 months ago) by niro
    File size: 2880 byte(s) 
    re-diffed for 1.0.90-svn
    1 diff -Naur tigervnc-1.0.90_svn4063/unix/vncviewer/CConn.cxx tigervnc-1.0.90_svn4063-magellan/unix/vncviewer/CConn.cxx
    2 --- tigervnc-1.0.90_svn4063/unix/vncviewer/CConn.cxx 2010-06-14 12:36:26.000000000 +0200
    3 +++ tigervnc-1.0.90_svn4063-magellan/unix/vncviewer/CConn.cxx 2010-06-15 08:01:55.000000000 +0200
    4 @@ -40,6 +40,8 @@
    5 #include "ServerDialog.h"
    6 #include "PasswdDialog.h"
    7 #include "parameters.h"
    8 +#include <string>
    9 +#include <iostream>
    10
    11 using namespace rfb;
    12
    13 @@ -217,6 +219,15 @@
    14 return;
    15 }
    16
    17 + /* XXX Who wrote this code? Yes, it is really ugly */
    18 + if (passwdInput) {
    19 + std::string s;
    20 + std::cin >> s;
    21 + *password = strdup(s.c_str());
    22 + if(user) *user = 0;
    23 + return;
    24 + }
    25 +
    26 const char* secType = secTypeName(csecurity->getType());
    27 const char* titlePrefix = _("VNC authentication");
    28 unsigned int titleLen = strlen(titlePrefix) + strlen(secType) + 4;
    29 diff -Naur tigervnc-1.0.90_svn4063/unix/vncviewer/parameters.h tigervnc-1.0.90_svn4063-magellan/unix/vncviewer/parameters.h
    30 --- tigervnc-1.0.90_svn4063/unix/vncviewer/parameters.h 2010-06-14 12:36:26.000000000 +0200
    31 +++ tigervnc-1.0.90_svn4063-magellan/unix/vncviewer/parameters.h 2010-06-15 08:02:16.000000000 +0200
    32 @@ -42,6 +42,7 @@
    33 extern rfb::IntParameter compressLevel;
    34 extern rfb::BoolParameter noJpeg;
    35 extern rfb::IntParameter qualityLevel;
    36 +extern rfb::BoolParameter passwdInput;
    37
    38 extern char aboutText[];
    39 extern char* programName;
    40 diff -Naur tigervnc-1.0.90_svn4063/unix/vncviewer/vncviewer.cxx tigervnc-1.0.90_svn4063-magellan/unix/vncviewer/vncviewer.cxx
    41 --- tigervnc-1.0.90_svn4063/unix/vncviewer/vncviewer.cxx 2010-06-14 12:36:26.000000000 +0200
    42 +++ tigervnc-1.0.90_svn4063-magellan/unix/vncviewer/vncviewer.cxx 2010-06-15 08:03:02.000000000 +0200
    43 @@ -58,6 +58,7 @@
    44 "manager decoration around a window", 24);
    45 StringParameter passwordFile("PasswordFile",
    46 "Password file for VNC authentication", "");
    47 +BoolParameter passwdInput("passwdInput", "Gets password from stdin", false);
    48 AliasParameter passwd("passwd", "Alias for PasswordFile", &passwordFile);
    49
    50 BoolParameter useLocalCursor("UseLocalCursor",
    51 diff -Naur tigervnc-1.0.90_svn4063/unix/vncviewer/vncviewer.man tigervnc-1.0.90_svn4063-magellan/unix/vncviewer/vncviewer.man
    52 --- tigervnc-1.0.90_svn4063/unix/vncviewer/vncviewer.man 2010-06-14 12:36:26.000000000 +0200
    53 +++ tigervnc-1.0.90_svn4063-magellan/unix/vncviewer/vncviewer.man 2010-06-15 08:03:57.000000000 +0200
    54 @@ -119,6 +119,11 @@
    55 "~/.vnc/passwd".
    56
    57 .TP
    58 +.B \-passwdInput \fItrue, false\fP
    59 +Force standard vnc dialog to getting password and reads password from stdin.
    60 +Default is false(shows dialog window)
    61 +
    62 +.TP
    63 .B \-Shared
    64 When you make a connection to a VNC server, all other existing connections are
    65 normally closed. This option requests that they be left open, allowing you to