gitso Commit Details

Date:

2008-09-03 22:12:10 (16 years 7 months ago)

Author:

gerberad

Branch:

master

Commit:

383feb7140d6dd9052b1be0aa671a51f02c51c01

Parents:

5e079974939bd28fea6b5a80276fcaec471b3faa

Message:

Updated vnc connection settings for OS X.

Changes:

File differences

-173
174 174
175 175
176 
176
177 177
178 178
179 179
... ...
194 194
195 195
196 196
197 
197
198 198
199 199
200 
200
201 201
202 202
203 203
+                    self.displayHostBox(self.sampleList, host)␊
                ␊
                if sys.platform == 'darwin':␊
                    self.returnPID = os.spawnl(os.P_NOWAIT, '%sOSXvnc/OSXvnc-server' % devPath, 'OSXvnc-server', '-nopw -connectHost', '%s' % host)␊
                    self.returnPID = os.spawnl(os.P_NOWAIT, '%sOSXvnc/OSXvnc-server' % devPath, '%sOSXvnc/OSXvnc-server' % devPath, '-connectHost', '%s' % host)␊
                elif sys.platform.find('linux') != -1:␊
                    self.returnPID = os.spawnlp(os.P_NOWAIT, 'x11vnc', 'x11vnc','-nopw','-ncache','20','-solid','black','-connect','%s' % host)␊
                elif sys.platform == 'win32':␊

            ␊
            if sys.platform == 'darwin':␊
                if os.path.exists("/Applications/Utilities/X11.app") :␊
                    os.spawnl(os.P_WAIT, '/usr/bin/open', 'open', '/Applications/Utilities/X11.app')␊
                    os.spawnl(os.P_WAIT, '/usr/bin/open', '/usr/bin/open', '/Applications/Utilities/X11.app')␊
                    dlg = wx.MessageDialog(self, "If it doesn't open shortly, please start it manually.", "Please wait while X11.app starts", wx.OK|wx.CENTRE|wx.ICON_INFORMATION)␊
                    dlg.ShowModal()␊
                    self.returnPID = os.spawnlp(os.P_NOWAIT, '%svncviewer/vncviewer' % devPath, 'vncviewer', '-listen', '0')␊
                    self.returnPID = os.spawnlp(os.P_NOWAIT, '%svncviewer/vncviewer' % devPath, '%svncviewer/vncviewer' % devPath, '-listen', '0')␊
                else:␊
                    dlg = wx.MessageDialog(self, "We were unable to find X11.app in /Applications/Utilities", "To Give Support you need X11.app", wx.OK|wx.CENTRE|wx.ICON_ERROR)␊
                    dlg.ShowModal()␊
 ...
                     self.displayHostBox(self.sampleList, host)␊
                 ␊
                 if sys.platform == 'darwin':␊
-                    self.returnPID = os.spawnl(os.P_NOWAIT, '%sOSXvnc/OSXvnc-server' % devPath, 'OSXvnc-server', '-nopw -connectHost', '%s' % host)␊
+                    self.returnPID = os.spawnl(os.P_NOWAIT, '%sOSXvnc/OSXvnc-server' % devPath, '%sOSXvnc/OSXvnc-server' % devPath, '-connectHost', '%s' % host)␊
                 elif sys.platform.find('linux') != -1:␊
                     self.returnPID = os.spawnlp(os.P_NOWAIT, 'x11vnc', 'x11vnc','-nopw','-ncache','20','-solid','black','-connect','%s' % host)␊
                 elif sys.platform == 'win32':␊
             ␊
             if sys.platform == 'darwin':␊
                 if os.path.exists("/Applications/Utilities/X11.app") :␊
-                    os.spawnl(os.P_WAIT, '/usr/bin/open', 'open', '/Applications/Utilities/X11.app')␊
+                    os.spawnl(os.P_WAIT, '/usr/bin/open', '/usr/bin/open', '/Applications/Utilities/X11.app')␊
                     dlg = wx.MessageDialog(self, "If it doesn't open shortly, please start it manually.", "Please wait while X11.app starts", wx.OK|wx.CENTRE|wx.ICON_INFORMATION)␊
                     dlg.ShowModal()␊
-                    self.returnPID = os.spawnlp(os.P_NOWAIT, '%svncviewer/vncviewer' % devPath, 'vncviewer', '-listen', '0')␊
+                    self.returnPID = os.spawnlp(os.P_NOWAIT, '%svncviewer/vncviewer' % devPath, '%svncviewer/vncviewer' % devPath, '-listen', '0')␊
                 else:␊
                     dlg = wx.MessageDialog(self, "We were unable to find X11.app in /Applications/Utilities", "To Give Support you need X11.app", wx.OK|wx.CENTRE|wx.ICON_ERROR)␊
                     dlg.ShowModal()␊

Download the corresponding diff file

gitso

File differences

Branches