~edubuntu-italc-devel/italc/italc-intrepid

#! /bin/sh /usr/share/dpatch/dpatch-run

## 03_remoteica.patch by  <stgraber@ubuntu.com>

##

## All lines beginning with `## DP:' are a description of the patch.

## DP: Allow support of remote ISD server

 

@DPATCH@

diff -Nrup ../../../package/italc-1.0.9-rc2/ica/src/isd_server.cpp ../ica/src/isd_server.cpp

--- ../../../package/italc-1.0.9-rc2/ica/src/isd_server.cpp     2008-04-30 15:40:32.000000000 +0200

+++ ../ica/src/isd_server.cpp   2008-06-04 13:20:34.000000000 +0200

@@ -59,7 +59,7 @@ isdServer::isdServer( const quint16 _ivs

        m_lockWidget( NULL )

 {

        if( __isd_server ||

-                       listen( QHostAddress::LocalHost, __isd_port ) == FALSE )

+                       listen( QHostAddress::Any, __isd_port ) == FALSE )

        {

                // uh oh, already an ISD running or port isn't available...

                qCritical( "isdServer::isdServer(...): "

diff -Nrup ../../../package/italc-1.0.9-rc2/ima/italc.1 ../ima/italc.1

--- ../../../package/italc-1.0.9-rc2/ima/italc.1        2008-02-01 15:46:07.000000000 +0100

+++ ../ima/italc.1      2008-06-04 13:23:26.000000000 +0200

@@ -20,6 +20,10 @@ Directly remote-control the specified ho

 .IP

 Set port to which iTALC should connect in order to contact the local iTALC-service-daemon. Default: 5800

 .

+.IP "\fB\-isdhost\fP \fIip\fP

+.IP

+Set the host to which iTALC should connect in order to contact the local iTALC-service-daemon. Default: localhost

+.

 .PP

 .SH SEE ALSO

 .IR ica (1),

diff -Nrup ../../../package/italc-1.0.9-rc2/ima/src/main.cpp ../ima/src/main.cpp

--- ../../../package/italc-1.0.9-rc2/ima/src/main.cpp   2008-05-06 16:16:39.000000000 +0200

+++ ../ima/src/main.cpp 2008-06-04 13:33:04.000000000 +0200

@@ -42,6 +42,7 @@ QString __default_domain;

 int __demo_quality = 0;

 

 int __isd_port = PortOffsetISD;

+QString __isd_host = "127.0.0.1";

 

 

 // good old main-function... initializes qt-app and starts iTALC

@@ -148,6 +149,11 @@ int main( int argc, char * * argv )

                {

                        __isd_port = arg_it.next().toInt();

                }

+               else if( a == "-isdhost" && arg_it.hasNext() )

+               {

+                       __isd_host = arg_it.next();

+               }

+

        }

 

 

diff -Nrup ../../../package/italc-1.0.9-rc2/ima/src/main_window.cpp ../ima/src/main_window.cpp

--- ../../../package/italc-1.0.9-rc2/ima/src/main_window.cpp    2008-05-21 11:17:31.000000000 +0200

+++ ../ima/src/main_window.cpp  2008-06-04 13:52:00.000000000 +0200

@@ -64,6 +64,7 @@ QSystemTrayIcon * __systray_icon = NULL;

 

 

 extern int __isd_port;

+extern QString __isd_host;

 

 

 bool mainWindow::ensureConfigPathExists( void )

@@ -364,7 +365,7 @@ mainWindow::mainWindow( int _rctrl_scree

                break;

        }

        m_localISD = new isdConnection( QHostAddress(

-                               QHostAddress::LocalHost).toString() +

+                               __isd_host ).toString() +

                                        ":" + QString::number( __isd_port ) );

        if( m_localISD->open() != isdConnection::Connected )

        {