Magellan Linux

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

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

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 1201 - (show annotations) (download)
    Mon Nov 22 23:25:59 2010 UTC (13 years, 5 months ago) by niro
    File size: 3145 byte(s) 
    -patches for 1.0.1 against xorg-server-1.7
    1 diff -up tightvnc-1.5.0-20081015svn3022/unix/vncviewer/CConn.cxx.102434 tightvnc-1.5.0-20081015svn3022/unix/vncviewer/CConn.cxx
    2 --- tightvnc-1.5.0-20081015svn3022/unix/vncviewer/CConn.cxx.102434 2008-10-10 17:48:22.000000000 +0200
    3 +++ tightvnc-1.5.0-20081015svn3022/unix/vncviewer/CConn.cxx 2008-10-22 18:35:46.000000000 +0200
    4 @@ -37,6 +37,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 @@ -209,6 +211,15 @@ void CConn::getUserPasswd(char** user, c
    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(getCurrentCSecurity()->getType());
    27 const char* titlePrefix = _("VNC authentication");
    28 unsigned int titleLen = strlen(titlePrefix) + strlen(secType) + 4;
    29 diff -up tightvnc-1.5.0-20081015svn3022/unix/vncviewer/parameters.h.102434 tightvnc-1.5.0-20081015svn3022/unix/vncviewer/parameters.h
    30 --- tightvnc-1.5.0-20081015svn3022/unix/vncviewer/parameters.h.102434 2006-05-18 13:08:21.000000000 +0200
    31 +++ tightvnc-1.5.0-20081015svn3022/unix/vncviewer/parameters.h 2008-10-22 18:08:47.000000000 +0200
    32 @@ -41,6 +41,7 @@ extern rfb::BoolParameter customCompress
    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 -up tightvnc-1.5.0-20081015svn3022/unix/vncviewer/vncviewer.cxx.102434 tightvnc-1.5.0-20081015svn3022/unix/vncviewer/vncviewer.cxx
    41 --- tightvnc-1.5.0-20081015svn3022/unix/vncviewer/vncviewer.cxx.102434 2008-09-28 07:08:48.000000000 +0200
    42 +++ tightvnc-1.5.0-20081015svn3022/unix/vncviewer/vncviewer.cxx 2008-10-22 18:04:00.000000000 +0200
    43 @@ -58,6 +58,7 @@ IntParameter wmDecorationHeight("WMDecor
    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 rfbauth("passwd", "Alias for PasswordFile", &passwordFile);
    49
    50 BoolParameter useLocalCursor("UseLocalCursor",
    51 diff -up tightvnc-1.5.0-20081015svn3022/unix/vncviewer/vncviewer.man.102434 tightvnc-1.5.0-20081015svn3022/unix/vncviewer/vncviewer.man
    52 --- tightvnc-1.5.0-20081015svn3022/unix/vncviewer/vncviewer.man.102434 2006-06-02 06:43:52.000000000 +0200
    53 +++ tightvnc-1.5.0-20081015svn3022/unix/vncviewer/vncviewer.man 2008-10-22 18:04:00.000000000 +0200
    54 @@ -115,6 +115,11 @@ the server, you can specify it here to a
    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