← Back to branch summary

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

« back to all changes in this revision

Viewing changes to debian/patches/05_fixdemo.patch

  • Committer: Stéphane graber
  • Date: 2008-10-01 19:38:01 UTC
  • Revision ID: stgraber@ubuntu.com-20081001193801-4n3vhjf4p318g510
Update 05_fixdemo, disable startup notification for ica

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/05_fixdemo.patch
7
7
@DPATCH@
8
8
diff -Nrup ../../orig/ica/src/isd_server.cpp ../ica/src/isd_server.cpp
9
9
--- ../../orig/ica/src/isd_server.cpp   2008-07-06 16:24:58.000000000 -0400
10
 
+++ ../ica/src/isd_server.cpp   2008-09-30 18:32:58.000000000 -0400
11
 
@@ -256,7 +256,9 @@ int isdServer::processClient( socketDisp
 
10
+++ ../ica/src/isd_server.cpp   2008-09-30 20:00:24.000000000 -0400
 
11
@@ -256,7 +256,7 @@ int isdServer::processClient( socketDisp
12
12
                        }
13
13
                        else
14
14
                        {
15
15
-                               action = port;
16
16
+                               action = port.split(":")[1]+":"+port.split(":")[2];
17
 
+                               if ( action == "192.168.0.14:5858" )
18
 
+                                       printf("Debug: PASS\n");
19
17
                        }
20
18
                        break;
21
19
                }
22
20
diff -Nrup ../../orig/ima/src/client.cpp ../ima/src/client.cpp
23
21
--- ../../orig/ima/src/client.cpp       2008-06-26 08:18:29.000000000 -0400
24
 
+++ ../ima/src/client.cpp       2008-09-30 18:23:09.000000000 -0400
25
 
@@ -51,7 +51,7 @@ const int DECO_WIDTH = 4;
26
 
 const int TITLE_HEIGHT = 23;
 
22
+++ ../ima/src/client.cpp       2008-09-30 20:00:07.000000000 -0400
 
23
@@ -52,6 +52,7 @@ const int TITLE_HEIGHT = 23;
27
24
 const QPoint CONTENT_OFFSET( DECO_WIDTH, DECO_WIDTH + TITLE_HEIGHT ); 
28
25
 const QSize CONTENT_SIZE_SUB( 2*DECO_WIDTH, 2*DECO_WIDTH + TITLE_HEIGHT ); 
29
 
-
 
26
 
30
27
+extern QString __isd_host;
31
28
 
32
29
 // resolve static symbols...
33
30
 QHash<int, client *> client::s_clientIDs;
34
 
@@ -1244,8 +1244,10 @@ void updateThread::update( void )
35
 
                                                i.second.toString() );
 
31
@@ -1245,7 +1246,7 @@ void updateThread::update( void )
36
32
                                break;
37
33
                        case Cmd_StartDemo:
38
 
+                               if ( __isd_host == "192.168.0.14" )
39
 
+                                       printf("Debug: OK\n");
40
34
                                m_client->m_connection->startDemo(
41
35
-                                       i.second.toList()[0].toString(),
42
36
+                                       __isd_host+":"+i.second.toList()[0].toString(),