| Only in .: .DS_Store␊ |
| Only in ./Chicken of the VNC.xcodeproj: gerberad.mode1v3␊ |
| Only in ./Chicken of the VNC.xcodeproj: gerberad.pbxuser␊ |
| diff -aurr ./Chicken of the VNC.xcodeproj/project.pbxproj ../cotvnc/Chicken of the VNC.xcodeproj/project.pbxproj␊ |
| --- ./Chicken of the VNC.xcodeproj/project.pbxproj␉2008-11-10 21:37:35.000000000 -0700␊ |
| +++ ../cotvnc/Chicken of the VNC.xcodeproj/project.pbxproj␉2007-03-28 18:52:50.000000000 -0600␊ |
| @@ -1209,7 +1209,6 @@␊ |
| ␉␉29B97313FDCFA39411CA2CEA /* Project object */ = {␊ |
| ␉␉␉isa = PBXProject;␊ |
| ␉␉␉buildConfigurationList = E20426EA087531990026AA26 /* Build configuration list for PBXProject "Chicken of the VNC" */;␊ |
| -␉␉␉compatibilityVersion = "Xcode 2.4";␊ |
| ␉␉␉hasScannedForEncodings = 1;␊ |
| ␉␉␉knownRegions = (␊ |
| ␉␉␉␉English,␊ |
| @@ -1220,7 +1219,6 @@␊ |
| ␉␉␉);␊ |
| ␉␉␉mainGroup = 29B97314FDCFA39411CA2CEA /* Chicken of the VNC */;␊ |
| ␉␉␉projectDirPath = "";␊ |
| -␉␉␉projectRoot = "";␊ |
| ␉␉␉targets = (␊ |
| ␉␉␉␉7F7A93E305E71B5C00E20416 /* Chicken of the VNC */,␊ |
| ␉␉␉␉7F916AA40BB6E98900E31F20 /* libjpeg */,␊ |
| diff -aurr ./Resources/English.lproj/OSX_RFBViewer.nib/classes.nib ../cotvnc/Resources/English.lproj/OSX_RFBViewer.nib/classes.nib␊ |
| --- ./Resources/English.lproj/OSX_RFBViewer.nib/classes.nib␉2008-11-07 22:54:10.000000000 -0700␊ |
| +++ ../cotvnc/Resources/English.lproj/OSX_RFBViewer.nib/classes.nib␉2005-04-14 18:46:42.000000000 -0600␊ |
| @@ -1,90 +1,130 @@␊ |
| -<?xml version="1.0" encoding="UTF-8"?>␊ |
| -<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">␊ |
| -<plist version="1.0">␊ |
| -<dict>␊ |
| -␉<key>IBClasses</key>␊ |
| -␉<array>␊ |
| -␉␉<dict>␊ |
| -␉␉␉<key>ACTIONS</key>␊ |
| -␉␉␉<dict>␊ |
| -␉␉␉␉<key>changeRendezvousUse</key>␊ |
| -␉␉␉␉<string>id</string>␊ |
| -␉␉␉␉<key>showConnectionDialog</key>␊ |
| -␉␉␉␉<string>id</string>␊ |
| -␉␉␉␉<key>showHelp</key>␊ |
| -␉␉␉␉<string>id</string>␊ |
| -␉␉␉␉<key>showListenerDialog</key>␊ |
| -␉␉␉␉<string>id</string>␊ |
| -␉␉␉␉<key>showNewConnectionDialog</key>␊ |
| -␉␉␉␉<string>id</string>␊ |
| -␉␉␉␉<key>showPreferences</key>␊ |
| -␉␉␉␉<string>id</string>␊ |
| -␉␉␉␉<key>showProfileManager</key>␊ |
| -␉␉␉␉<string>id</string>␊ |
| -␉␉␉</dict>␊ |
| -␉␉␉<key>CLASS</key>␊ |
| -␉␉␉<string>AppDelegate</string>␊ |
| -␉␉␉<key>LANGUAGE</key>␊ |
| -␉␉␉<string>ObjC</string>␊ |
| -␉␉␉<key>OUTLETS</key>␊ |
| -␉␉␉<dict>␊ |
| -␉␉␉␉<key>mInfoVersionNumber</key>␊ |
| -␉␉␉␉<string>NSTextField</string>␊ |
| -␉␉␉␉<key>mRendezvousMenuItem</key>␊ |
| -␉␉␉␉<string>NSMenuItem</string>␊ |
| -␉␉␉</dict>␊ |
| -␉␉␉<key>SUPERCLASS</key>␊ |
| -␉␉␉<string>NSObject</string>␊ |
| -␉␉</dict>␊ |
| -␉␉<dict>␊ |
| -␉␉␉<key>CLASS</key>␊ |
| -␉␉␉<string>NSObject</string>␊ |
| -␉␉␉<key>LANGUAGE</key>␊ |
| -␉␉␉<string>ObjC</string>␊ |
| -␉␉</dict>␊ |
| -␉␉<dict>␊ |
| -␉␉␉<key>ACTIONS</key>␊ |
| -␉␉␉<dict>␊ |
| -␉␉␉␉<key>makeConnectionFullscreen</key>␊ |
| -␉␉␉␉<string>id</string>␊ |
| -␉␉␉␉<key>makeConnectionWindowed</key>␊ |
| -␉␉␉␉<string>id</string>␊ |
| -␉␉␉␉<key>manuallyUpdateFrameBuffer</key>␊ |
| -␉␉␉␉<string>id</string>␊ |
| -␉␉␉␉<key>openNewTitlePanel</key>␊ |
| -␉␉␉␉<string>id</string>␊ |
| -␉␉␉␉<key>openOptions</key>␊ |
| -␉␉␉␉<string>id</string>␊ |
| -␉␉␉␉<key>pasteViaKeypress</key>␊ |
| -␉␉␉␉<string>id</string>␊ |
| -␉␉␉␉<key>sendBreakKeyCode</key>␊ |
| -␉␉␉␉<string>id</string>␊ |
| -␉␉␉␉<key>sendCmdOptEsc</key>␊ |
| -␉␉␉␉<string>id</string>␊ |
| -␉␉␉␉<key>sendCtrlAltDel</key>␊ |
| -␉␉␉␉<string>id</string>␊ |
| -␉␉␉␉<key>sendDeleteKeyCode</key>␊ |
| -␉␉␉␉<string>id</string>␊ |
| -␉␉␉␉<key>sendExecuteKeyCode</key>␊ |
| -␉␉␉␉<string>id</string>␊ |
| -␉␉␉␉<key>sendInsertKeyCode</key>␊ |
| -␉␉␉␉<string>id</string>␊ |
| -␉␉␉␉<key>sendPauseKeyCode</key>␊ |
| -␉␉␉␉<string>id</string>␊ |
| -␉␉␉␉<key>sendPrintKeyCode</key>␊ |
| -␉␉␉␉<string>id</string>␊ |
| -␉␉␉␉<key>toggleFullscreenMode</key>␊ |
| -␉␉␉␉<string>id</string>␊ |
| -␉␉␉</dict>␊ |
| -␉␉␉<key>CLASS</key>␊ |
| -␉␉␉<string>FirstResponder</string>␊ |
| -␉␉␉<key>LANGUAGE</key>␊ |
| -␉␉␉<string>ObjC</string>␊ |
| -␉␉␉<key>SUPERCLASS</key>␊ |
| -␉␉␉<string>NSObject</string>␊ |
| -␉␉</dict>␊ |
| -␉</array>␊ |
| -␉<key>IBVersion</key>␊ |
| -␉<string>1</string>␊ |
| -</dict>␊ |
| -</plist>␊ |
| +{␊ |
| + IBClasses = (␊ |
| + {␊ |
| + ACTIONS = {␊ |
| + changeRendezvousUse = id; ␊ |
| + showConnectionDialog = id; ␊ |
| + showHelp = id; ␊ |
| + showListenerDialog = id; ␊ |
| + showNewConnectionDialog = id; ␊ |
| + showPreferences = id; ␊ |
| + showProfileManager = id; ␊ |
| + }; ␊ |
| + CLASS = AppDelegate; ␊ |
| + LANGUAGE = ObjC; ␊ |
| + OUTLETS = {mInfoVersionNumber = NSTextField; mRendezvousMenuItem = NSMenuItem; }; ␊ |
| + SUPERCLASS = NSObject; ␊ |
| + }, ␊ |
| + {␊ |
| + ACTIONS = {␊ |
| + makeConnectionFullscreen = id; ␊ |
| + makeConnectionWindowed = id; ␊ |
| + manuallyUpdateFrameBuffer = id; ␊ |
| + openNewTitlePanel = id; ␊ |
| + openOptions = id; ␊ |
| + pasteViaKeypress = id; ␊ |
| + sendBreakKeyCode = id; ␊ |
| + sendCmdOptEsc = id; ␊ |
| + sendCtrlAltDel = id; ␊ |
| + sendDeleteKeyCode = id; ␊ |
| + sendExecuteKeyCode = id; ␊ |
| + sendInsertKeyCode = id; ␊ |
| + sendPauseKeyCode = id; ␊ |
| + sendPrintKeyCode = id; ␊ |
| + toggleFullscreenMode = id; ␊ |
| + }; ␊ |
| + CLASS = FirstResponder; ␊ |
| + LANGUAGE = ObjC; ␊ |
| + SUPERCLASS = NSObject; ␊ |
| + }, ␊ |
| + {␊ |
| + ACTIONS = {changeSelectedScenario = id; restoreDefaults = id; }; ␊ |
| + CLASS = KeyEquivalentPrefsController; ␊ |
| + LANGUAGE = ObjC; ␊ |
| + OUTLETS = {mConnectionType = NSPopUpButton; mOutlineView = NSOutlineView; }; ␊ |
| + SUPERCLASS = NSObject; ␊ |
| + }, ␊ |
| + {CLASS = Profile; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, ␊ |
| + {␊ |
| + ACTIONS = {␊ |
| + addProfile = id; ␊ |
| + changeEncodingState = id; ␊ |
| + deleteProfile = id; ␊ |
| + profileChanged = id; ␊ |
| + profileSelected = id; ␊ |
| + reorderEncodings = id; ␊ |
| + }; ␊ |
| + CLASS = ProfileManager; ␊ |
| + LANGUAGE = ObjC; ␊ |
| + OUTLETS = {␊ |
| + altKey = id; ␊ |
| + commandKey = id; ␊ |
| + controlKey = id; ␊ |
| + deleteProfileButton = id; ␊ |
| + enableCopyRect = id; ␊ |
| + encodingTableView = id; ␊ |
| + m3bTimeout = id; ␊ |
| + mkbTimeout = id; ␊ |
| + mkdTimeout = id; ␊ |
| + newProfileButton = id; ␊ |
| + pixelFormatMatrix = id; ␊ |
| + profileBrowser = id; ␊ |
| + profileField = id; ␊ |
| + profilePanel = id; ␊ |
| + shiftKey = id; ␊ |
| + upDownButtonMatrix = id; ␊ |
| + }; ␊ |
| + SUPERCLASS = NSObject; ␊ |
| + }, ␊ |
| + {␊ |
| + ACTIONS = {␊ |
| + addServer = id; ␊ |
| + deleteSelectedServer = id; ␊ |
| + showConnectionDialog = id; ␊ |
| + showNewConnectionDialog = id; ␊ |
| + }; ␊ |
| + CLASS = RFBConnectionManager; ␊ |
| + LANGUAGE = ObjC; ␊ |
| + OUTLETS = {␊ |
| + groupList = NSTableView; ␊ |
| + serverDataBoxLocal = NSBox; ␊ |
| + serverDeleteBtn = NSButton; ␊ |
| + serverGroupBox = NSBox; ␊ |
| + serverList = NSTableView; ␊ |
| + serverListBox = NSBox; ␊ |
| + splitView = NSSplitView; ␊ |
| + }; ␊ |
| + SUPERCLASS = NSWindowController; ␊ |
| + }, ␊ |
| + {CLASS = ServerDataManager; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, ␊ |
| + {␊ |
| + ACTIONS = {␊ |
| + connectToServer = id; ␊ |
| + displayChanged = id; ␊ |
| + hostChanged = id; ␊ |
| + passwordChanged = id; ␊ |
| + profileSelectionChanged = id; ␊ |
| + rememberPwdChanged = id; ␊ |
| + sharedChanged = id; ␊ |
| + }; ␊ |
| + CLASS = ServerDataViewController; ␊ |
| + LANGUAGE = ObjC; ␊ |
| + OUTLETS = {␊ |
| + box = NSBox; ␊ |
| + connectBtn = NSButton; ␊ |
| + connectIndicator = NSProgressIndicator; ␊ |
| + connectIndicatorText = NSTextField; ␊ |
| + display = NSTextField; ␊ |
| + hostName = NSTextField; ␊ |
| + mDelegate = id; ␊ |
| + mServer = id; ␊ |
| + password = NSTextField; ␊ |
| + profilePopup = NSPopUpButton; ␊ |
| + rememberPwd = NSButton; ␊ |
| + shared = NSButton; ␊ |
| + }; ␊ |
| + SUPERCLASS = NSWindowController; ␊ |
| + }␊ |
| + ); ␊ |
| + IBVersion = 1; ␊ |
| +}␊ |
| \ No newline at end of file␊ |
| diff -aurr ./Resources/English.lproj/OSX_RFBViewer.nib/info.nib ../cotvnc/Resources/English.lproj/OSX_RFBViewer.nib/info.nib␊ |
| --- ./Resources/English.lproj/OSX_RFBViewer.nib/info.nib␉2008-11-07 22:54:10.000000000 -0700␊ |
| +++ ../cotvnc/Resources/English.lproj/OSX_RFBViewer.nib/info.nib␉2006-01-18 12:42:18.000000000 -0700␊ |
| @@ -1,20 +1,26 @@␊ |
| <?xml version="1.0" encoding="UTF-8"?>␊ |
| -<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">␊ |
| +<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">␊ |
| <plist version="1.0">␊ |
| <dict>␊ |
| +␉<key>IBDocumentLocation</key>␊ |
| +␉<string>3 4 356 240 0 0 1280 832 </string>␊ |
| +␉<key>IBEditorPositions</key>␊ |
| +␉<dict>␊ |
| +␉␉<key>29</key>␊ |
| +␉␉<string>270 514 419 44 0 0 1280 832 </string>␊ |
| +␉</dict>␊ |
| ␉<key>IBFramework Version</key>␊ |
| -␉<string>629</string>␊ |
| -␉<key>IBLastKnownRelativeProjectPath</key>␊ |
| -␉<string>../../../Chicken of the VNC.xcodeproj</string>␊ |
| -␉<key>IBOldestOS</key>␊ |
| -␉<integer>5</integer>␊ |
| +␉<string>443.0</string>␊ |
| +␉<key>IBLockedObjects</key>␊ |
| +␉<array>␊ |
| +␉␉<integer>1191</integer>␊ |
| +␉␉<integer>1208</integer>␊ |
| +␉</array>␊ |
| ␉<key>IBOpenObjects</key>␊ |
| ␉<array>␊ |
| -␉␉<integer>612</integer>␊ |
| +␉␉<integer>29</integer>␊ |
| ␉</array>␊ |
| ␉<key>IBSystem Version</key>␊ |
| -␉<string>9F33</string>␊ |
| -␉<key>targetFramework</key>␊ |
| -␉<string>IBCocoaFramework</string>␊ |
| +␉<string>8F46</string>␊ |
| </dict>␊ |
| </plist>␊ |
| diff -aurr ./Resources/English.lproj/OSX_RFBViewer.nib/keyedobjects.nib ../cotvnc/Resources/English.lproj/OSX_RFBViewer.nib/keyedobjects.nib␊ |
| --- ./Resources/English.lproj/OSX_RFBViewer.nib/keyedobjects.nib␉2008-11-07 22:54:10.000000000 -0700␊ |
| +++ ../cotvnc/Resources/English.lproj/OSX_RFBViewer.nib/keyedobjects.nib␉2006-01-18 12:42:18.000000000 -0700␊ |
| @@ -1,65 +1,65 @@␊ |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| (helmut.maierhofer@chello.at)␊ |
|
|
|
|
|
| -(helmut.maierhofer@chello.at)␊ |
| -)_␐␑Menu (Connection)_␐vStatic Text (released under the GNU Public License␊ |
| -source code and support available at http://cotvnc.sourceforge.net)_␐␔Menu Item (Show All)[Menu (Edit)[Separator-6_␐␏Menu (Services)TInfo]Menu (Window)_␐␚Menu Item (Send "Execute")[Application_␐␘Menu Item (Send "Break")_␐␔Menu Item (Services)_␐␙Menu (Chicken Of the VNC)\Content View_␐␘Menu Item (Special Keys)_␐␖Menu Item (Connection)_␐␐Menu Item (Undo)_␐␑Menu Item (Paste)_␐␞Menu Item (Bring All to Front)_␐␔Menu Item (Minimize)o␐%␀M␀e␀n␀u␀ ␀I␀t␀e␀m␀ ␀(␀A␀b␀o␀u␀t␀ ␀C␀h␀i␀c␀k␀e␀n␀ ␀o␀f␀ ␀t␀h␀e␀ ␀V␀N␀C &␀)_␐␘Menu Item (Send "Pause")_␐␙Menu Item (Stop Speaking)_␐␚Menu Item (Start Speaking)_␐␛Menu Item (Fullscreen Mode)_␐␏Menu Item (Cut)_␐␒Menu Item (Window)_␐␙Menu Item (Send "Insert")_␐␕Static Text (Version)_␐␗Menu Item (Hide Others)_␐RStatic Text (Administered by Jason Harris␊ |
| -based on VNCViewer by Helmut Maierhofer)[Separator-8YSeparator_␐␞Menu Item (Chicken Of the VNC)_␐␘Menu Item (Close Window)_␐␘Menu Item (Send "Print")_␐␐Menu Item (Copy)_␐$Menu Item (Send "Cmd-Option-Escape")_␐ Static Text (Chicken of the VNC)_␐␞Image View (NSApplicationIcon)_␐␖Menu Item (Select All)[Separator-7_␐␙Menu Item (Send "Delete")_␐␏Horizontal Line_␐␐Menu Item (Edit)XMainMenu[Separator-3_␐␒Menu Item (Speech)[Separator-4_␐␐Menu Item (Help)_␐#Menu Item (Quit Chicken of the VNC)[Separator-1[Menu (Help)[Separator-5_␐␐Menu Item (Redo)_␐ZStatic Text (Copyright 1998-2000 by Helmut Maierhofer␊ |
|
|
|
|
|
|
|
|
|
|
|
|
|
| ␁␊ |
| -␎␊ |
| -␚␊ |
| -␟␊ |
| -!␊ |
| -#␊ |
| +␃␊ |
| +␅␊ |
| +␇␊ |
| +␉␊ |
| +␋␊ |
| +␍␊ |
| +␞␊ |
| %␊ |
| -'␊ |
| -)␊ |
| +(␊ |
| +␊ |
| --␊ |
| +.␊ |
| 1␊ |
| -B␊ |
| -I␊ |
| -P␊ |
| -Y␊ |
| -[␊ |
| -d␊ |
| -f␊ |
| -h␊ |
| -r␊ |
| -{␊ |
|
|
|
|
|
|
|
|
|
|
|
|
|
| +K␊ |
| +M␊ |
| +V␊ |
| +`␊ |
| +k␊ |
| +m␊ |
| +v␊ |
| +}␊ |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| \ No newline at end of file␊ |
|
|
|
|
|
|
|
|
|
|
| \ No newline at end of file␊ |
| Only in ../cotvnc/Resources/English.lproj/OSX_RFBViewer.nib: objects.nib␊ |
| diff -aurr ./Source/ListenerController.m ../cotvnc/Source/ListenerController.m␊ |
| --- ./Source/ListenerController.m␉2008-11-07 22:40:05.000000000 -0700␊ |
| +++ ../cotvnc/Source/ListenerController.m␉2006-01-17 12:20:14.000000000 -0700␊ |
| @@ -86,8 +86,7 @@␊ |
| if (listeningSocket) {␊ |
| [self stopListener];␊ |
| }␊ |
| - //[self savePrefs];␊ |
| -␉␊ |
| + [self savePrefs];␊ |
| ␉[super dealloc];␊ |
| ␉␉␊ |
| ␉[[NSNotificationCenter defaultCenter] removeObserver:self␊ |
| @@ -105,7 +104,7 @@␊ |
| name:ProfileListChangeMsg␊ |
| object:(id)[ProfileDataManager sharedInstance]];␊ |
| ␊ |
| - //[self updateUI];␊ |
| + [self updateUI];␊ |
| }␊ |
| ␊ |
| ␊ |
| @@ -199,7 +198,7 @@␊ |
| ␊ |
| [listeningSocket acceptConnectionInBackgroundAndNotify];␊ |
| ␊ |
| - //[self updateUI];␊ |
| + [self updateUI];␊ |
| ␊ |
| return YES;␊ |
| }␊ |
| @@ -219,7 +218,7 @@␊ |
| [listeningSocket release]; listeningSocket = nil;␊ |
| [listeningProfile release]; listeningProfile = nil;␊ |
| ␊ |
| - //[self updateUI];␊ |
| + [self updateUI];␊ |
| }␊ |
| ␊ |
| ␊ |
| @@ -287,7 +286,7 @@␊ |
| ␊ |
| - (void)updateProfileView:(id)notification␊ |
| {␊ |
| -␉//[self loadProfileIntoView];␊ |
| +␉[self loadProfileIntoView];␊ |
| }␊ |
| ␊ |
| ␊ |
| diff -aurr ./Source/MyApp.m ../cotvnc/Source/MyApp.m␊ |
| --- ./Source/MyApp.m␉2008-11-07 21:28:00.000000000 -0700␊ |
| +++ ../cotvnc/Source/MyApp.m␉2005-07-11 05:22:56.000000000 -0600␊ |
| @@ -14,7 +14,6 @@␊ |
| ␊ |
| @implementation MyApp␊ |
| ␊ |
| -␊ |
| - (void)sendEvent:(NSEvent *)anEvent␊ |
| {␊ |
| ␉/*␊ |
| diff -aurr ./Source/RFBConnection.m ../cotvnc/Source/RFBConnection.m␊ |
| --- ./Source/RFBConnection.m␉2008-11-10 21:24:43.000000000 -0700␊ |
| +++ ../cotvnc/Source/RFBConnection.m␉2007-03-15 23:24:14.000000000 -0600␊ |
| @@ -337,7 +337,7 @@␊ |
| ␉␉[_eventFilter synthesizeRemainingEvents];␊ |
| ␉␉[_eventFilter sendAllPendingQueueEntriesNow];␊ |
| ␊ |
| - if(false) {␊ |
| + if(aReason) {␊ |
| ␉␉␉if ( _autoReconnect ) {␊ |
| NSLog(@"Automatically reconnecting to server. The connection was closed because: \"%@\".", aReason);␊ |
| ␉␉␉␉// Just auto-reconnect (by reinstantiating ourselves)␊ |
| diff -aurr ./Source/RFBConnectionManager.m ../cotvnc/Source/RFBConnectionManager.m␊ |
| --- ./Source/RFBConnectionManager.m␉2008-11-07 22:42:17.000000000 -0700␊ |
| +++ ../cotvnc/Source/RFBConnectionManager.m␉2007-03-15 21:31:56.000000000 -0600␊ |
| @@ -21,7 +21,6 @@␊ |
| #import "RFBConnection.h"␊ |
| #import "PrefController.h"␊ |
| #import "ProfileManager.h"␊ |
| -#import "ListenerController.h"␊ |
| #import "Profile.h"␊ |
| #import "rfbproto.h"␊ |
| #import "vncauth.h"␊ |
| @@ -37,7 +36,7 @@␊ |
| ␉static id sInstance = nil;␊ |
| ␉if ( ! sInstance )␊ |
| ␉{␊ |
| -␉␉sInstance = [self alloc];␊ |
| +␉␉sInstance = [[self alloc] initWithWindowNibName: @"ConnectionDialog"];␊ |
| ␉␉NSParameterAssert( sInstance != nil );␊ |
| ␉␉␊ |
| ␉␉[sInstance wakeup];␊ |
| @@ -145,23 +144,8 @@␊ |
| for (i = 1; i < argCount; i++)␊ |
| ␉{␊ |
| ␉␉arg = [args objectAtIndex:i];␊ |
| -␊ |
| -␉␉if ([arg hasPrefix:@"--listen"])␊ |
| -␉␉{␊ |
| -␉␉␉NSLog(@"Called with --listen.");␊ |
| -␉␉␉␊ |
| -␉␉␉ListenerController* listener = [ListenerController sharedController];␊ |
| -␉␉␉ProfileManager* pm = [ProfileManager sharedManager];␊ |
| -␊ |
| -␉␉␉int port = 5500;␊ |
| -␉␉␉profile = [pm profileNamed: @"Called with --listen."];␊ |
| -␉␉␉BOOL local = false;␊ |
| -␊ |
| -␉␉␉[listener startListenerOnPort:port withProfile:profile localOnly:local];␊ |
| -␉␉␉␊ |
| -␉␉␉return YES;␊ |
| -␉␉} ␊ |
| -␉␉else if ([arg hasPrefix:@"-psn"])␊ |
| +␉␉␊ |
| +␉␉if ([arg hasPrefix:@"-psn"])␊ |
| ␉␉{␊ |
| ␉␉␉// Called from the finder. Do nothing.␊ |
| ␉␉␉continue;␊ |
| diff -aurr ./Source/VNCViewer_main.m ../cotvnc/Source/VNCViewer_main.m␊ |
| --- ./Source/VNCViewer_main.m␉2008-11-07 21:24:00.000000000 -0700␊ |
| +++ ../cotvnc/Source/VNCViewer_main.m␉2003-01-17 04:55:52.000000000 -0700␊ |
| @@ -14,6 +14,5 @@␊ |
| ␉[NSAutoreleasePool setPoolCountHighWaterMark: 2000];␊ |
| ␉[NSAutoreleasePool setPoolCountHighWaterResolution: 2000];␊ |
| #endif␊ |
| -␊ |
| return NSApplicationMain(argc, argv);␊ |
| }␊ |
| Only in .: cotvnc-gitso.diff␊ |
| diff -aurr ./cotvnc-gitso.diff ../cotvnc-gitso/cotvnc-gitso.diff␊ |
| --- ./cotvnc-gitso.diff␉2008-11-11 15:53:29.000000000 -0700␊ |
| +++ ../cotvnc-gitso/cotvnc-gitso.diff␉2008-11-11 15:28:25.000000000 -0700␊ |
| @@ -1,547 +1,547 @@␊ |
| -Only in ../cotvnc-gitso/: .DS_Store␊ |
| -Only in ../cotvnc-gitso/Chicken of the VNC.xcodeproj: gerberad.mode1v3␊ |
| -Only in ../cotvnc-gitso/Chicken of the VNC.xcodeproj: gerberad.pbxuser␊ |
| -diff -aurr ./Chicken of the VNC.xcodeproj/project.pbxproj ../cotvnc-gitso/Chicken of the VNC.xcodeproj/project.pbxproj␊ |
| ---- ./Chicken of the VNC.xcodeproj/project.pbxproj␉2007-03-28 18:52:50.000000000 -0600␊ |
| -+++ ../cotvnc-gitso/Chicken of the VNC.xcodeproj/project.pbxproj␉2008-11-10 21:37:35.000000000 -0700␊ |
| -@@ -1209,6 +1209,7 @@␊ |
| +Only in .: .DS_Store␊ |
| +Only in ./Chicken of the VNC.xcodeproj: gerberad.mode1v3␊ |
| +Only in ./Chicken of the VNC.xcodeproj: gerberad.pbxuser␊ |
| +diff -aurr ./Chicken of the VNC.xcodeproj/project.pbxproj ../cotvnc/Chicken of the VNC.xcodeproj/project.pbxproj␊ |
| +--- ./Chicken of the VNC.xcodeproj/project.pbxproj␉2008-11-10 21:37:35.000000000 -0700␊ |
| ++++ ../cotvnc/Chicken of the VNC.xcodeproj/project.pbxproj␉2007-03-28 18:52:50.000000000 -0600␊ |
| +@@ -1209,7 +1209,6 @@␊ |
| ␉␉29B97313FDCFA39411CA2CEA /* Project object */ = {␊ |
| ␉␉␉isa = PBXProject;␊ |
| ␉␉␉buildConfigurationList = E20426EA087531990026AA26 /* Build configuration list for PBXProject "Chicken of the VNC" */;␊ |
| -+␉␉␉compatibilityVersion = "Xcode 2.4";␊ |
| +-␉␉␉compatibilityVersion = "Xcode 2.4";␊ |
| ␉␉␉hasScannedForEncodings = 1;␊ |
| ␉␉␉knownRegions = (␊ |
| ␉␉␉␉English,␊ |
| -@@ -1219,6 +1220,7 @@␊ |
| +@@ -1220,7 +1219,6 @@␊ |
| ␉␉␉);␊ |
| ␉␉␉mainGroup = 29B97314FDCFA39411CA2CEA /* Chicken of the VNC */;␊ |
| ␉␉␉projectDirPath = "";␊ |
| -+␉␉␉projectRoot = "";␊ |
| +-␉␉␉projectRoot = "";␊ |
| ␉␉␉targets = (␊ |
| ␉␉␉␉7F7A93E305E71B5C00E20416 /* Chicken of the VNC */,␊ |
| ␉␉␉␉7F916AA40BB6E98900E31F20 /* libjpeg */,␊ |
| -Only in ./Chicken of the VNC.xcodeproj: project.pbxproj.rej␊ |
| -diff -aurr ./Resources/English.lproj/OSX_RFBViewer.nib/classes.nib ../cotvnc-gitso/Resources/English.lproj/OSX_RFBViewer.nib/classes.nib␊ |
| ---- ./Resources/English.lproj/OSX_RFBViewer.nib/classes.nib␉2005-04-14 18:46:42.000000000 -0600␊ |
| -+++ ../cotvnc-gitso/Resources/English.lproj/OSX_RFBViewer.nib/classes.nib␉2008-11-07 22:54:10.000000000 -0700␊ |
| -@@ -1,130 +1,90 @@␊ |
| --{␊ |
| -- IBClasses = (␊ |
| -- {␊ |
| -- ACTIONS = {␊ |
| -- changeRendezvousUse = id; ␊ |
| -- showConnectionDialog = id; ␊ |
| -- showHelp = id; ␊ |
| -- showListenerDialog = id; ␊ |
| -- showNewConnectionDialog = id; ␊ |
| -- showPreferences = id; ␊ |
| -- showProfileManager = id; ␊ |
| -- }; ␊ |
| -- CLASS = AppDelegate; ␊ |
| -- LANGUAGE = ObjC; ␊ |
| -- OUTLETS = {mInfoVersionNumber = NSTextField; mRendezvousMenuItem = NSMenuItem; }; ␊ |
| -- SUPERCLASS = NSObject; ␊ |
| -- }, ␊ |
| -- {␊ |
| -- ACTIONS = {␊ |
| -- makeConnectionFullscreen = id; ␊ |
| -- makeConnectionWindowed = id; ␊ |
| -- manuallyUpdateFrameBuffer = id; ␊ |
| -- openNewTitlePanel = id; ␊ |
| -- openOptions = id; ␊ |
| -- pasteViaKeypress = id; ␊ |
| -- sendBreakKeyCode = id; ␊ |
| -- sendCmdOptEsc = id; ␊ |
| -- sendCtrlAltDel = id; ␊ |
| -- sendDeleteKeyCode = id; ␊ |
| -- sendExecuteKeyCode = id; ␊ |
| -- sendInsertKeyCode = id; ␊ |
| -- sendPauseKeyCode = id; ␊ |
| -- sendPrintKeyCode = id; ␊ |
| -- toggleFullscreenMode = id; ␊ |
| -- }; ␊ |
| -- CLASS = FirstResponder; ␊ |
| -- LANGUAGE = ObjC; ␊ |
| -- SUPERCLASS = NSObject; ␊ |
| -- }, ␊ |
| -- {␊ |
| -- ACTIONS = {changeSelectedScenario = id; restoreDefaults = id; }; ␊ |
| -- CLASS = KeyEquivalentPrefsController; ␊ |
| -- LANGUAGE = ObjC; ␊ |
| -- OUTLETS = {mConnectionType = NSPopUpButton; mOutlineView = NSOutlineView; }; ␊ |
| -- SUPERCLASS = NSObject; ␊ |
| -- }, ␊ |
| -- {CLASS = Profile; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, ␊ |
| -- {␊ |
| -- ACTIONS = {␊ |
| -- addProfile = id; ␊ |
| -- changeEncodingState = id; ␊ |
| -- deleteProfile = id; ␊ |
| -- profileChanged = id; ␊ |
| -- profileSelected = id; ␊ |
| -- reorderEncodings = id; ␊ |
| -- }; ␊ |
| -- CLASS = ProfileManager; ␊ |
| -- LANGUAGE = ObjC; ␊ |
| -- OUTLETS = {␊ |
| -- altKey = id; ␊ |
| -- commandKey = id; ␊ |
| -- controlKey = id; ␊ |
| -- deleteProfileButton = id; ␊ |
| -- enableCopyRect = id; ␊ |
| -- encodingTableView = id; ␊ |
| -- m3bTimeout = id; ␊ |
| -- mkbTimeout = id; ␊ |
| -- mkdTimeout = id; ␊ |
| -- newProfileButton = id; ␊ |
| -- pixelFormatMatrix = id; ␊ |
| -- profileBrowser = id; ␊ |
| -- profileField = id; ␊ |
| -- profilePanel = id; ␊ |
| -- shiftKey = id; ␊ |
| -- upDownButtonMatrix = id; ␊ |
| -- }; ␊ |
| -- SUPERCLASS = NSObject; ␊ |
| -- }, ␊ |
| -- {␊ |
| -- ACTIONS = {␊ |
| -- addServer = id; ␊ |
| -- deleteSelectedServer = id; ␊ |
| -- showConnectionDialog = id; ␊ |
| -- showNewConnectionDialog = id; ␊ |
| -- }; ␊ |
| -- CLASS = RFBConnectionManager; ␊ |
| -- LANGUAGE = ObjC; ␊ |
| -- OUTLETS = {␊ |
| -- groupList = NSTableView; ␊ |
| -- serverDataBoxLocal = NSBox; ␊ |
| -- serverDeleteBtn = NSButton; ␊ |
| -- serverGroupBox = NSBox; ␊ |
| -- serverList = NSTableView; ␊ |
| -- serverListBox = NSBox; ␊ |
| -- splitView = NSSplitView; ␊ |
| -- }; ␊ |
| -- SUPERCLASS = NSWindowController; ␊ |
| -- }, ␊ |
| -- {CLASS = ServerDataManager; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, ␊ |
| -- {␊ |
| -- ACTIONS = {␊ |
| -- connectToServer = id; ␊ |
| -- displayChanged = id; ␊ |
| -- hostChanged = id; ␊ |
| -- passwordChanged = id; ␊ |
| -- profileSelectionChanged = id; ␊ |
| -- rememberPwdChanged = id; ␊ |
| -- sharedChanged = id; ␊ |
| -- }; ␊ |
| -- CLASS = ServerDataViewController; ␊ |
| -- LANGUAGE = ObjC; ␊ |
| -- OUTLETS = {␊ |
| -- box = NSBox; ␊ |
| -- connectBtn = NSButton; ␊ |
| -- connectIndicator = NSProgressIndicator; ␊ |
| -- connectIndicatorText = NSTextField; ␊ |
| -- display = NSTextField; ␊ |
| -- hostName = NSTextField; ␊ |
| -- mDelegate = id; ␊ |
| -- mServer = id; ␊ |
| -- password = NSTextField; ␊ |
| -- profilePopup = NSPopUpButton; ␊ |
| -- rememberPwd = NSButton; ␊ |
| -- shared = NSButton; ␊ |
| -- }; ␊ |
| -- SUPERCLASS = NSWindowController; ␊ |
| -- }␊ |
| -- ); ␊ |
| -- IBVersion = 1; ␊ |
| --}␊ |
| +diff -aurr ./Resources/English.lproj/OSX_RFBViewer.nib/classes.nib ../cotvnc/Resources/English.lproj/OSX_RFBViewer.nib/classes.nib␊ |
| +--- ./Resources/English.lproj/OSX_RFBViewer.nib/classes.nib␉2008-11-07 22:54:10.000000000 -0700␊ |
| ++++ ../cotvnc/Resources/English.lproj/OSX_RFBViewer.nib/classes.nib␉2005-04-14 18:46:42.000000000 -0600␊ |
| +@@ -1,90 +1,130 @@␊ |
| +-<?xml version="1.0" encoding="UTF-8"?>␊ |
| +-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">␊ |
| +-<plist version="1.0">␊ |
| +-<dict>␊ |
| +-␉<key>IBClasses</key>␊ |
| +-␉<array>␊ |
| +-␉␉<dict>␊ |
| +-␉␉␉<key>ACTIONS</key>␊ |
| +-␉␉␉<dict>␊ |
| +-␉␉␉␉<key>changeRendezvousUse</key>␊ |
| +-␉␉␉␉<string>id</string>␊ |
| +-␉␉␉␉<key>showConnectionDialog</key>␊ |
| +-␉␉␉␉<string>id</string>␊ |
| +-␉␉␉␉<key>showHelp</key>␊ |
| +-␉␉␉␉<string>id</string>␊ |
| +-␉␉␉␉<key>showListenerDialog</key>␊ |
| +-␉␉␉␉<string>id</string>␊ |
| +-␉␉␉␉<key>showNewConnectionDialog</key>␊ |
| +-␉␉␉␉<string>id</string>␊ |
| +-␉␉␉␉<key>showPreferences</key>␊ |
| +-␉␉␉␉<string>id</string>␊ |
| +-␉␉␉␉<key>showProfileManager</key>␊ |
| +-␉␉␉␉<string>id</string>␊ |
| +-␉␉␉</dict>␊ |
| +-␉␉␉<key>CLASS</key>␊ |
| +-␉␉␉<string>AppDelegate</string>␊ |
| +-␉␉␉<key>LANGUAGE</key>␊ |
| +-␉␉␉<string>ObjC</string>␊ |
| +-␉␉␉<key>OUTLETS</key>␊ |
| +-␉␉␉<dict>␊ |
| +-␉␉␉␉<key>mInfoVersionNumber</key>␊ |
| +-␉␉␉␉<string>NSTextField</string>␊ |
| +-␉␉␉␉<key>mRendezvousMenuItem</key>␊ |
| +-␉␉␉␉<string>NSMenuItem</string>␊ |
| +-␉␉␉</dict>␊ |
| +-␉␉␉<key>SUPERCLASS</key>␊ |
| +-␉␉␉<string>NSObject</string>␊ |
| +-␉␉</dict>␊ |
| +-␉␉<dict>␊ |
| +-␉␉␉<key>CLASS</key>␊ |
| +-␉␉␉<string>NSObject</string>␊ |
| +-␉␉␉<key>LANGUAGE</key>␊ |
| +-␉␉␉<string>ObjC</string>␊ |
| +-␉␉</dict>␊ |
| +-␉␉<dict>␊ |
| +-␉␉␉<key>ACTIONS</key>␊ |
| +-␉␉␉<dict>␊ |
| +-␉␉␉␉<key>makeConnectionFullscreen</key>␊ |
| +-␉␉␉␉<string>id</string>␊ |
| +-␉␉␉␉<key>makeConnectionWindowed</key>␊ |
| +-␉␉␉␉<string>id</string>␊ |
| +-␉␉␉␉<key>manuallyUpdateFrameBuffer</key>␊ |
| +-␉␉␉␉<string>id</string>␊ |
| +-␉␉␉␉<key>openNewTitlePanel</key>␊ |
| +-␉␉␉␉<string>id</string>␊ |
| +-␉␉␉␉<key>openOptions</key>␊ |
| +-␉␉␉␉<string>id</string>␊ |
| +-␉␉␉␉<key>pasteViaKeypress</key>␊ |
| +-␉␉␉␉<string>id</string>␊ |
| +-␉␉␉␉<key>sendBreakKeyCode</key>␊ |
| +-␉␉␉␉<string>id</string>␊ |
| +-␉␉␉␉<key>sendCmdOptEsc</key>␊ |
| +-␉␉␉␉<string>id</string>␊ |
| +-␉␉␉␉<key>sendCtrlAltDel</key>␊ |
| +-␉␉␉␉<string>id</string>␊ |
| +-␉␉␉␉<key>sendDeleteKeyCode</key>␊ |
| +-␉␉␉␉<string>id</string>␊ |
| +-␉␉␉␉<key>sendExecuteKeyCode</key>␊ |
| +-␉␉␉␉<string>id</string>␊ |
| +-␉␉␉␉<key>sendInsertKeyCode</key>␊ |
| +-␉␉␉␉<string>id</string>␊ |
| +-␉␉␉␉<key>sendPauseKeyCode</key>␊ |
| +-␉␉␉␉<string>id</string>␊ |
| +-␉␉␉␉<key>sendPrintKeyCode</key>␊ |
| +-␉␉␉␉<string>id</string>␊ |
| +-␉␉␉␉<key>toggleFullscreenMode</key>␊ |
| +-␉␉␉␉<string>id</string>␊ |
| +-␉␉␉</dict>␊ |
| +-␉␉␉<key>CLASS</key>␊ |
| +-␉␉␉<string>FirstResponder</string>␊ |
| +-␉␉␉<key>LANGUAGE</key>␊ |
| +-␉␉␉<string>ObjC</string>␊ |
| +-␉␉␉<key>SUPERCLASS</key>␊ |
| +-␉␉␉<string>NSObject</string>␊ |
| +-␉␉</dict>␊ |
| +-␉</array>␊ |
| +-␉<key>IBVersion</key>␊ |
| +-␉<string>1</string>␊ |
| +-</dict>␊ |
| +-</plist>␊ |
| ++{␊ |
| ++ IBClasses = (␊ |
| ++ {␊ |
| ++ ACTIONS = {␊ |
| ++ changeRendezvousUse = id; ␊ |
| ++ showConnectionDialog = id; ␊ |
| ++ showHelp = id; ␊ |
| ++ showListenerDialog = id; ␊ |
| ++ showNewConnectionDialog = id; ␊ |
| ++ showPreferences = id; ␊ |
| ++ showProfileManager = id; ␊ |
| ++ }; ␊ |
| ++ CLASS = AppDelegate; ␊ |
| ++ LANGUAGE = ObjC; ␊ |
| ++ OUTLETS = {mInfoVersionNumber = NSTextField; mRendezvousMenuItem = NSMenuItem; }; ␊ |
| ++ SUPERCLASS = NSObject; ␊ |
| ++ }, ␊ |
| ++ {␊ |
| ++ ACTIONS = {␊ |
| ++ makeConnectionFullscreen = id; ␊ |
| ++ makeConnectionWindowed = id; ␊ |
| ++ manuallyUpdateFrameBuffer = id; ␊ |
| ++ openNewTitlePanel = id; ␊ |
| ++ openOptions = id; ␊ |
| ++ pasteViaKeypress = id; ␊ |
| ++ sendBreakKeyCode = id; ␊ |
| ++ sendCmdOptEsc = id; ␊ |
| ++ sendCtrlAltDel = id; ␊ |
| ++ sendDeleteKeyCode = id; ␊ |
| ++ sendExecuteKeyCode = id; ␊ |
| ++ sendInsertKeyCode = id; ␊ |
| ++ sendPauseKeyCode = id; ␊ |
| ++ sendPrintKeyCode = id; ␊ |
| ++ toggleFullscreenMode = id; ␊ |
| ++ }; ␊ |
| ++ CLASS = FirstResponder; ␊ |
| ++ LANGUAGE = ObjC; ␊ |
| ++ SUPERCLASS = NSObject; ␊ |
| ++ }, ␊ |
| ++ {␊ |
| ++ ACTIONS = {changeSelectedScenario = id; restoreDefaults = id; }; ␊ |
| ++ CLASS = KeyEquivalentPrefsController; ␊ |
| ++ LANGUAGE = ObjC; ␊ |
| ++ OUTLETS = {mConnectionType = NSPopUpButton; mOutlineView = NSOutlineView; }; ␊ |
| ++ SUPERCLASS = NSObject; ␊ |
| ++ }, ␊ |
| ++ {CLASS = Profile; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, ␊ |
| ++ {␊ |
| ++ ACTIONS = {␊ |
| ++ addProfile = id; ␊ |
| ++ changeEncodingState = id; ␊ |
| ++ deleteProfile = id; ␊ |
| ++ profileChanged = id; ␊ |
| ++ profileSelected = id; ␊ |
| ++ reorderEncodings = id; ␊ |
| ++ }; ␊ |
| ++ CLASS = ProfileManager; ␊ |
| ++ LANGUAGE = ObjC; ␊ |
| ++ OUTLETS = {␊ |
| ++ altKey = id; ␊ |
| ++ commandKey = id; ␊ |
| ++ controlKey = id; ␊ |
| ++ deleteProfileButton = id; ␊ |
| ++ enableCopyRect = id; ␊ |
| ++ encodingTableView = id; ␊ |
| ++ m3bTimeout = id; ␊ |
| ++ mkbTimeout = id; ␊ |
| ++ mkdTimeout = id; ␊ |
| ++ newProfileButton = id; ␊ |
| ++ pixelFormatMatrix = id; ␊ |
| ++ profileBrowser = id; ␊ |
| ++ profileField = id; ␊ |
| ++ profilePanel = id; ␊ |
| ++ shiftKey = id; ␊ |
| ++ upDownButtonMatrix = id; ␊ |
| ++ }; ␊ |
| ++ SUPERCLASS = NSObject; ␊ |
| ++ }, ␊ |
| ++ {␊ |
| ++ ACTIONS = {␊ |
| ++ addServer = id; ␊ |
| ++ deleteSelectedServer = id; ␊ |
| ++ showConnectionDialog = id; ␊ |
| ++ showNewConnectionDialog = id; ␊ |
| ++ }; ␊ |
| ++ CLASS = RFBConnectionManager; ␊ |
| ++ LANGUAGE = ObjC; ␊ |
| ++ OUTLETS = {␊ |
| ++ groupList = NSTableView; ␊ |
| ++ serverDataBoxLocal = NSBox; ␊ |
| ++ serverDeleteBtn = NSButton; ␊ |
| ++ serverGroupBox = NSBox; ␊ |
| ++ serverList = NSTableView; ␊ |
| ++ serverListBox = NSBox; ␊ |
| ++ splitView = NSSplitView; ␊ |
| ++ }; ␊ |
| ++ SUPERCLASS = NSWindowController; ␊ |
| ++ }, ␊ |
| ++ {CLASS = ServerDataManager; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, ␊ |
| ++ {␊ |
| ++ ACTIONS = {␊ |
| ++ connectToServer = id; ␊ |
| ++ displayChanged = id; ␊ |
| ++ hostChanged = id; ␊ |
| ++ passwordChanged = id; ␊ |
| ++ profileSelectionChanged = id; ␊ |
| ++ rememberPwdChanged = id; ␊ |
| ++ sharedChanged = id; ␊ |
| ++ }; ␊ |
| ++ CLASS = ServerDataViewController; ␊ |
| ++ LANGUAGE = ObjC; ␊ |
| ++ OUTLETS = {␊ |
| ++ box = NSBox; ␊ |
| ++ connectBtn = NSButton; ␊ |
| ++ connectIndicator = NSProgressIndicator; ␊ |
| ++ connectIndicatorText = NSTextField; ␊ |
| ++ display = NSTextField; ␊ |
| ++ hostName = NSTextField; ␊ |
| ++ mDelegate = id; ␊ |
| ++ mServer = id; ␊ |
| ++ password = NSTextField; ␊ |
| ++ profilePopup = NSPopUpButton; ␊ |
| ++ rememberPwd = NSButton; ␊ |
| ++ shared = NSButton; ␊ |
| ++ }; ␊ |
| ++ SUPERCLASS = NSWindowController; ␊ |
| ++ }␊ |
| ++ ); ␊ |
| ++ IBVersion = 1; ␊ |
| ++}␊ |
| \ No newline at end of file␊ |
| -+<?xml version="1.0" encoding="UTF-8"?>␊ |
| -+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">␊ |
| -+<plist version="1.0">␊ |
| -+<dict>␊ |
| -+␉<key>IBClasses</key>␊ |
| -+␉<array>␊ |
| -+␉␉<dict>␊ |
| -+␉␉␉<key>ACTIONS</key>␊ |
| -+␉␉␉<dict>␊ |
| -+␉␉␉␉<key>changeRendezvousUse</key>␊ |
| -+␉␉␉␉<string>id</string>␊ |
| -+␉␉␉␉<key>showConnectionDialog</key>␊ |
| -+␉␉␉␉<string>id</string>␊ |
| -+␉␉␉␉<key>showHelp</key>␊ |
| -+␉␉␉␉<string>id</string>␊ |
| -+␉␉␉␉<key>showListenerDialog</key>␊ |
| -+␉␉␉␉<string>id</string>␊ |
| -+␉␉␉␉<key>showNewConnectionDialog</key>␊ |
| -+␉␉␉␉<string>id</string>␊ |
| -+␉␉␉␉<key>showPreferences</key>␊ |
| -+␉␉␉␉<string>id</string>␊ |
| -+␉␉␉␉<key>showProfileManager</key>␊ |
| -+␉␉␉␉<string>id</string>␊ |
| -+␉␉␉</dict>␊ |
| -+␉␉␉<key>CLASS</key>␊ |
| -+␉␉␉<string>AppDelegate</string>␊ |
| -+␉␉␉<key>LANGUAGE</key>␊ |
| -+␉␉␉<string>ObjC</string>␊ |
| -+␉␉␉<key>OUTLETS</key>␊ |
| -+␉␉␉<dict>␊ |
| -+␉␉␉␉<key>mInfoVersionNumber</key>␊ |
| -+␉␉␉␉<string>NSTextField</string>␊ |
| -+␉␉␉␉<key>mRendezvousMenuItem</key>␊ |
| -+␉␉␉␉<string>NSMenuItem</string>␊ |
| -+␉␉␉</dict>␊ |
| -+␉␉␉<key>SUPERCLASS</key>␊ |
| -+␉␉␉<string>NSObject</string>␊ |
| -+␉␉</dict>␊ |
| -+␉␉<dict>␊ |
| -+␉␉␉<key>CLASS</key>␊ |
| -+␉␉␉<string>NSObject</string>␊ |
| -+␉␉␉<key>LANGUAGE</key>␊ |
| -+␉␉␉<string>ObjC</string>␊ |
| -+␉␉</dict>␊ |
| -+␉␉<dict>␊ |
| -+␉␉␉<key>ACTIONS</key>␊ |
| -+␉␉␉<dict>␊ |
| -+␉␉␉␉<key>makeConnectionFullscreen</key>␊ |
| -+␉␉␉␉<string>id</string>␊ |
| -+␉␉␉␉<key>makeConnectionWindowed</key>␊ |
| -+␉␉␉␉<string>id</string>␊ |
| -+␉␉␉␉<key>manuallyUpdateFrameBuffer</key>␊ |
| -+␉␉␉␉<string>id</string>␊ |
| -+␉␉␉␉<key>openNewTitlePanel</key>␊ |
| -+␉␉␉␉<string>id</string>␊ |
| -+␉␉␉␉<key>openOptions</key>␊ |
| -+␉␉␉␉<string>id</string>␊ |
| -+␉␉␉␉<key>pasteViaKeypress</key>␊ |
| -+␉␉␉␉<string>id</string>␊ |
| -+␉␉␉␉<key>sendBreakKeyCode</key>␊ |
| -+␉␉␉␉<string>id</string>␊ |
| -+␉␉␉␉<key>sendCmdOptEsc</key>␊ |
| -+␉␉␉␉<string>id</string>␊ |
| -+␉␉␉␉<key>sendCtrlAltDel</key>␊ |
| -+␉␉␉␉<string>id</string>␊ |
| -+␉␉␉␉<key>sendDeleteKeyCode</key>␊ |
| -+␉␉␉␉<string>id</string>␊ |
| -+␉␉␉␉<key>sendExecuteKeyCode</key>␊ |
| -+␉␉␉␉<string>id</string>␊ |
| -+␉␉␉␉<key>sendInsertKeyCode</key>␊ |
| -+␉␉␉␉<string>id</string>␊ |
| -+␉␉␉␉<key>sendPauseKeyCode</key>␊ |
| -+␉␉␉␉<string>id</string>␊ |
| -+␉␉␉␉<key>sendPrintKeyCode</key>␊ |
| -+␉␉␉␉<string>id</string>␊ |
| -+␉␉␉␉<key>toggleFullscreenMode</key>␊ |
| -+␉␉␉␉<string>id</string>␊ |
| -+␉␉␉</dict>␊ |
| -+␉␉␉<key>CLASS</key>␊ |
| -+␉␉␉<string>FirstResponder</string>␊ |
| -+␉␉␉<key>LANGUAGE</key>␊ |
| -+␉␉␉<string>ObjC</string>␊ |
| -+␉␉␉<key>SUPERCLASS</key>␊ |
| -+␉␉␉<string>NSObject</string>␊ |
| -+␉␉</dict>␊ |
| -+␉</array>␊ |
| -+␉<key>IBVersion</key>␊ |
| -+␉<string>1</string>␊ |
| -+</dict>␊ |
| -+</plist>␊ |
| -diff -aurr ./Resources/English.lproj/OSX_RFBViewer.nib/info.nib ../cotvnc-gitso/Resources/English.lproj/OSX_RFBViewer.nib/info.nib␊ |
| ---- ./Resources/English.lproj/OSX_RFBViewer.nib/info.nib␉2006-01-18 12:42:18.000000000 -0700␊ |
| -+++ ../cotvnc-gitso/Resources/English.lproj/OSX_RFBViewer.nib/info.nib␉2008-11-07 22:54:10.000000000 -0700␊ |
| -@@ -1,26 +1,20 @@␊ |
| +diff -aurr ./Resources/English.lproj/OSX_RFBViewer.nib/info.nib ../cotvnc/Resources/English.lproj/OSX_RFBViewer.nib/info.nib␊ |
| +--- ./Resources/English.lproj/OSX_RFBViewer.nib/info.nib␉2008-11-07 22:54:10.000000000 -0700␊ |
| ++++ ../cotvnc/Resources/English.lproj/OSX_RFBViewer.nib/info.nib␉2006-01-18 12:42:18.000000000 -0700␊ |
| +@@ -1,20 +1,26 @@␊ |
| <?xml version="1.0" encoding="UTF-8"?>␊ |
| --<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">␊ |
| -+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">␊ |
| +-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">␊ |
| ++<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">␊ |
| <plist version="1.0">␊ |
| <dict>␊ |
| --␉<key>IBDocumentLocation</key>␊ |
| --␉<string>3 4 356 240 0 0 1280 832 </string>␊ |
| --␉<key>IBEditorPositions</key>␊ |
| --␉<dict>␊ |
| --␉␉<key>29</key>␊ |
| --␉␉<string>270 514 419 44 0 0 1280 832 </string>␊ |
| --␉</dict>␊ |
| ++␉<key>IBDocumentLocation</key>␊ |
| ++␉<string>3 4 356 240 0 0 1280 832 </string>␊ |
| ++␉<key>IBEditorPositions</key>␊ |
| ++␉<dict>␊ |
| ++␉␉<key>29</key>␊ |
| ++␉␉<string>270 514 419 44 0 0 1280 832 </string>␊ |
| ++␉</dict>␊ |
| ␉<key>IBFramework Version</key>␊ |
| --␉<string>443.0</string>␊ |
| --␉<key>IBLockedObjects</key>␊ |
| --␉<array>␊ |
| --␉␉<integer>1191</integer>␊ |
| --␉␉<integer>1208</integer>␊ |
| --␉</array>␊ |
| -+␉<string>629</string>␊ |
| -+␉<key>IBLastKnownRelativeProjectPath</key>␊ |
| -+␉<string>../../../Chicken of the VNC.xcodeproj</string>␊ |
| -+␉<key>IBOldestOS</key>␊ |
| -+␉<integer>5</integer>␊ |
| +-␉<string>629</string>␊ |
| +-␉<key>IBLastKnownRelativeProjectPath</key>␊ |
| +-␉<string>../../../Chicken of the VNC.xcodeproj</string>␊ |
| +-␉<key>IBOldestOS</key>␊ |
| +-␉<integer>5</integer>␊ |
| ++␉<string>443.0</string>␊ |
| ++␉<key>IBLockedObjects</key>␊ |
| ++␉<array>␊ |
| ++␉␉<integer>1191</integer>␊ |
| ++␉␉<integer>1208</integer>␊ |
| ++␉</array>␊ |
| ␉<key>IBOpenObjects</key>␊ |
| ␉<array>␊ |
| --␉␉<integer>29</integer>␊ |
| -+␉␉<integer>612</integer>␊ |
| +-␉␉<integer>612</integer>␊ |
| ++␉␉<integer>29</integer>␊ |
| ␉</array>␊ |
| ␉<key>IBSystem Version</key>␊ |
| --␉<string>8F46</string>␊ |
| -+␉<string>9F33</string>␊ |
| -+␉<key>targetFramework</key>␊ |
| -+␉<string>IBCocoaFramework</string>␊ |
| +-␉<string>9F33</string>␊ |
| +-␉<key>targetFramework</key>␊ |
| +-␉<string>IBCocoaFramework</string>␊ |
| ++␉<string>8F46</string>␊ |
| </dict>␊ |
| </plist>␊ |
| -diff -aurr ./Resources/English.lproj/OSX_RFBViewer.nib/keyedobjects.nib ../cotvnc-gitso/Resources/English.lproj/OSX_RFBViewer.nib/keyedobjects.nib␊ |
| ---- ./Resources/English.lproj/OSX_RFBViewer.nib/keyedobjects.nib␉2006-01-18 12:42:18.000000000 -0700␊ |
| -+++ ../cotvnc-gitso/Resources/English.lproj/OSX_RFBViewer.nib/keyedobjects.nib␉2008-11-07 22:54:10.000000000 -0700␊ |
| +diff -aurr ./Resources/English.lproj/OSX_RFBViewer.nib/keyedobjects.nib ../cotvnc/Resources/English.lproj/OSX_RFBViewer.nib/keyedobjects.nib␊ |
| +--- ./Resources/English.lproj/OSX_RFBViewer.nib/keyedobjects.nib␉2008-11-07 22:54:10.000000000 -0700␊ |
| ++++ ../cotvnc/Resources/English.lproj/OSX_RFBViewer.nib/keyedobjects.nib␉2006-01-18 12:42:18.000000000 -0700␊ |
| @@ -1,65 +1,65 @@␊ |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| (helmut.maierhofer@chello.at)␊ |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| -+(helmut.maierhofer@chello.at)␊ |
| -+)_␐␑Menu (Connection)_␐vStatic Text (released under the GNU Public License␊ |
| -+source code and support available at http://cotvnc.sourceforge.net)_␐␔Menu Item (Show All)[Menu (Edit)[Separator-6_␐␏Menu (Services)TInfo]Menu (Window)_␐␚Menu Item (Send "Execute")[Application_␐␘Menu Item (Send "Break")_␐␔Menu Item (Services)_␐␙Menu (Chicken Of the VNC)\Content View_␐␘Menu Item (Special Keys)_␐␖Menu Item (Connection)_␐␐Menu Item (Undo)_␐␑Menu Item (Paste)_␐␞Menu Item (Bring All to Front)_␐␔Menu Item (Minimize)o␐%␀M␀e␀n␀u␀ ␀I␀t␀e␀m␀ ␀(␀A␀b␀o␀u␀t␀ ␀C␀h␀i␀c␀k␀e␀n␀ ␀o␀f␀ ␀t␀h␀e␀ ␀V␀N␀C &␀)_␐␘Menu Item (Send "Pause")_␐␙Menu Item (Stop Speaking)_␐␚Menu Item (Start Speaking)_␐␛Menu Item (Fullscreen Mode)_␐␏Menu Item (Cut)_␐␒Menu Item (Window)_␐␙Menu Item (Send "Insert")_␐␕Static Text (Version)_␐␗Menu Item (Hide Others)_␐RStatic Text (Administered by Jason Harris␊ |
| -+based on VNCViewer by Helmut Maierhofer)[Separator-8YSeparator_␐␞Menu Item (Chicken Of the VNC)_␐␘Menu Item (Close Window)_␐␘Menu Item (Send "Print")_␐␐Menu Item (Copy)_␐$Menu Item (Send "Cmd-Option-Escape")_␐ Static Text (Chicken of the VNC)_␐␞Image View (NSApplicationIcon)_␐␖Menu Item (Select All)[Separator-7_␐␙Menu Item (Send "Delete")_␐␏Horizontal Line_␐␐Menu Item (Edit)XMainMenu[Separator-3_␐␒Menu Item (Speech)[Separator-4_␐␐Menu Item (Help)_␐#Menu Item (Quit Chicken of the VNC)[Separator-1[Menu (Help)[Separator-5_␐␐Menu Item (Redo)_␐ZStatic Text (Copyright 1998-2000 by Helmut Maierhofer␊ |
|
|
|
|
|
|
|
| +-(helmut.maierhofer@chello.at)␊ |
| +-)_␐␑Menu (Connection)_␐vStatic Text (released under the GNU Public License␊ |
| +-source code and support available at http://cotvnc.sourceforge.net)_␐␔Menu Item (Show All)[Menu (Edit)[Separator-6_␐␏Menu (Services)TInfo]Menu (Window)_␐␚Menu Item (Send "Execute")[Application_␐␘Menu Item (Send "Break")_␐␔Menu Item (Services)_␐␙Menu (Chicken Of the VNC)\Content View_␐␘Menu Item (Special Keys)_␐␖Menu Item (Connection)_␐␐Menu Item (Undo)_␐␑Menu Item (Paste)_␐␞Menu Item (Bring All to Front)_␐␔Menu Item (Minimize)o␐%␀M␀e␀n␀u␀ ␀I␀t␀e␀m␀ ␀(␀A␀b␀o␀u␀t␀ ␀C␀h␀i␀c␀k␀e␀n␀ ␀o␀f␀ ␀t␀h␀e␀ ␀V␀N␀C &␀)_␐␘Menu Item (Send "Pause")_␐␙Menu Item (Stop Speaking)_␐␚Menu Item (Start Speaking)_␐␛Menu Item (Fullscreen Mode)_␐␏Menu Item (Cut)_␐␒Menu Item (Window)_␐␙Menu Item (Send "Insert")_␐␕Static Text (Version)_␐␗Menu Item (Hide Others)_␐RStatic Text (Administered by Jason Harris␊ |
| +-based on VNCViewer by Helmut Maierhofer)[Separator-8YSeparator_␐␞Menu Item (Chicken Of the VNC)_␐␘Menu Item (Close Window)_␐␘Menu Item (Send "Print")_␐␐Menu Item (Copy)_␐$Menu Item (Send "Cmd-Option-Escape")_␐ Static Text (Chicken of the VNC)_␐␞Image View (NSApplicationIcon)_␐␖Menu Item (Select All)[Separator-7_␐␙Menu Item (Send "Delete")_␐␏Horizontal Line_␐␐Menu Item (Edit)XMainMenu[Separator-3_␐␒Menu Item (Speech)[Separator-4_␐␐Menu Item (Help)_␐#Menu Item (Quit Chicken of the VNC)[Separator-1[Menu (Help)[Separator-5_␐␐Menu Item (Redo)_␐ZStatic Text (Copyright 1998-2000 by Helmut Maierhofer␊ |
|
|
|
|
|
|
|
|
|
|
|
|
|
| ␁␊ |
| --␃␊ |
| --␅␊ |
| --␇␊ |
| --␉␊ |
| --␋␊ |
| --␍␊ |
| --␞␊ |
| -+␎␊ |
| -+␚␊ |
| -+␟␊ |
| -+!␊ |
| -+#␊ |
| +-␎␊ |
| +-␚␊ |
| +-␟␊ |
| +-!␊ |
| +-#␊ |
| ++␃␊ |
| ++␅␊ |
| ++␇␊ |
| ++␉␊ |
| ++␋␊ |
| ++␍␊ |
| ++␞␊ |
| %␊ |
| --(␊ |
| -+'␊ |
| -+)␊ |
| +-'␊ |
| +-)␊ |
| ++(␊ |
| +␊ |
| --.␊ |
| -+-␊ |
| +--␊ |
| ++.␊ |
| 1␊ |
| --K␊ |
| --M␊ |
| --V␊ |
| --`␊ |
| --k␊ |
| --m␊ |
| --v␊ |
| --}␊ |
|
|
|
|
|
|
|
|
|
|
|
|
|
| -+B␊ |
| -+I␊ |
| -+P␊ |
| -+Y␊ |
| -+[␊ |
| -+d␊ |
| -+f␊ |
| -+h␊ |
| -+r␊ |
| -+{␊ |
|
|
|
|
|
|
|
|
|
|
|
|
|
| +-B␊ |
| +-I␊ |
| +-P␊ |
| +-Y␊ |
| +-[␊ |
| +-d␊ |
| +-f␊ |
| +-h␊ |
| +-r␊ |
| +-{␊ |
|
|
|
|
|
|
|
|
|
|
|
|
|
| ++K␊ |
| ++M␊ |
| ++V␊ |
| ++`␊ |
| ++k␊ |
| ++m␊ |
| ++v␊ |
| ++}␊ |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| \ No newline at end of file␊ |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| \ No newline at end of file␊ |
| -Only in ./Resources/English.lproj/OSX_RFBViewer.nib: objects.nib␊ |
| -diff -aurr ./Source/ListenerController.m ../cotvnc-gitso/Source/ListenerController.m␊ |
| ---- ./Source/ListenerController.m␉2006-01-17 12:20:14.000000000 -0700␊ |
| -+++ ../cotvnc-gitso/Source/ListenerController.m␉2008-11-07 22:40:05.000000000 -0700␊ |
| -@@ -86,7 +86,8 @@␊ |
| +Only in ../cotvnc/Resources/English.lproj/OSX_RFBViewer.nib: objects.nib␊ |
| +diff -aurr ./Source/ListenerController.m ../cotvnc/Source/ListenerController.m␊ |
| +--- ./Source/ListenerController.m␉2008-11-07 22:40:05.000000000 -0700␊ |
| ++++ ../cotvnc/Source/ListenerController.m␉2006-01-17 12:20:14.000000000 -0700␊ |
| +@@ -86,8 +86,7 @@␊ |
| if (listeningSocket) {␊ |
| [self stopListener];␊ |
| }␊ |
| -- [self savePrefs];␊ |
| -+ //[self savePrefs];␊ |
| -+␉␊ |
| +- //[self savePrefs];␊ |
| +-␉␊ |
| ++ [self savePrefs];␊ |
| ␉[super dealloc];␊ |
| ␉␉␊ |
| ␉[[NSNotificationCenter defaultCenter] removeObserver:self␊ |
| -@@ -104,7 +105,7 @@␊ |
| +@@ -105,7 +104,7 @@␊ |
| name:ProfileListChangeMsg␊ |
| object:(id)[ProfileDataManager sharedInstance]];␊ |
| ␊ |
| -- [self updateUI];␊ |
| -+ //[self updateUI];␊ |
| +- //[self updateUI];␊ |
| ++ [self updateUI];␊ |
| }␊ |
| ␊ |
| ␊ |
| -@@ -198,7 +199,7 @@␊ |
| +@@ -199,7 +198,7 @@␊ |
| ␊ |
| [listeningSocket acceptConnectionInBackgroundAndNotify];␊ |
| ␊ |
| -- [self updateUI];␊ |
| -+ //[self updateUI];␊ |
| +- //[self updateUI];␊ |
| ++ [self updateUI];␊ |
| ␊ |
| return YES;␊ |
| }␊ |
| -@@ -218,7 +219,7 @@␊ |
| +@@ -219,7 +218,7 @@␊ |
| [listeningSocket release]; listeningSocket = nil;␊ |
| [listeningProfile release]; listeningProfile = nil;␊ |
| ␊ |
| -- [self updateUI];␊ |
| -+ //[self updateUI];␊ |
| +- //[self updateUI];␊ |
| ++ [self updateUI];␊ |
| }␊ |
| ␊ |
| ␊ |
| -@@ -286,7 +287,7 @@␊ |
| +@@ -287,7 +286,7 @@␊ |
| ␊ |
| - (void)updateProfileView:(id)notification␊ |
| {␊ |
| --␉[self loadProfileIntoView];␊ |
| -+␉//[self loadProfileIntoView];␊ |
| +-␉//[self loadProfileIntoView];␊ |
| ++␉[self loadProfileIntoView];␊ |
| }␊ |
| ␊ |
| ␊ |
| -diff -aurr ./Source/MyApp.m ../cotvnc-gitso/Source/MyApp.m␊ |
| ---- ./Source/MyApp.m␉2005-07-11 05:22:56.000000000 -0600␊ |
| -+++ ../cotvnc-gitso/Source/MyApp.m␉2008-11-07 21:28:00.000000000 -0700␊ |
| -@@ -14,6 +14,7 @@␊ |
| +diff -aurr ./Source/MyApp.m ../cotvnc/Source/MyApp.m␊ |
| +--- ./Source/MyApp.m␉2008-11-07 21:28:00.000000000 -0700␊ |
| ++++ ../cotvnc/Source/MyApp.m␉2005-07-11 05:22:56.000000000 -0600␊ |
| +@@ -14,7 +14,6 @@␊ |
| ␊ |
| @implementation MyApp␊ |
| ␊ |
| -+␊ |
| +-␊ |
| - (void)sendEvent:(NSEvent *)anEvent␊ |
| {␊ |
| ␉/*␊ |
| -diff -aurr ./Source/RFBConnection.m ../cotvnc-gitso/Source/RFBConnection.m␊ |
| ---- ./Source/RFBConnection.m␉2007-03-15 23:24:14.000000000 -0600␊ |
| -+++ ../cotvnc-gitso/Source/RFBConnection.m␉2008-11-10 21:24:43.000000000 -0700␊ |
| +diff -aurr ./Source/RFBConnection.m ../cotvnc/Source/RFBConnection.m␊ |
| +--- ./Source/RFBConnection.m␉2008-11-10 21:24:43.000000000 -0700␊ |
| ++++ ../cotvnc/Source/RFBConnection.m␉2007-03-15 23:24:14.000000000 -0600␊ |
| @@ -337,7 +337,7 @@␊ |
| ␉␉[_eventFilter synthesizeRemainingEvents];␊ |
| ␉␉[_eventFilter sendAllPendingQueueEntriesNow];␊ |
| ␊ |
| -- if(aReason) {␊ |
| -+ if(false) {␊ |
| +- if(false) {␊ |
| ++ if(aReason) {␊ |
| ␉␉␉if ( _autoReconnect ) {␊ |
| NSLog(@"Automatically reconnecting to server. The connection was closed because: \"%@\".", aReason);␊ |
| ␉␉␉␉// Just auto-reconnect (by reinstantiating ourselves)␊ |
| -diff -aurr ./Source/RFBConnectionManager.m ../cotvnc-gitso/Source/RFBConnectionManager.m␊ |
| ---- ./Source/RFBConnectionManager.m␉2007-03-15 21:31:56.000000000 -0600␊ |
| -+++ ../cotvnc-gitso/Source/RFBConnectionManager.m␉2008-11-07 22:42:17.000000000 -0700␊ |
| -@@ -21,6 +21,7 @@␊ |
| +diff -aurr ./Source/RFBConnectionManager.m ../cotvnc/Source/RFBConnectionManager.m␊ |
| +--- ./Source/RFBConnectionManager.m␉2008-11-07 22:42:17.000000000 -0700␊ |
| ++++ ../cotvnc/Source/RFBConnectionManager.m␉2007-03-15 21:31:56.000000000 -0600␊ |
| +@@ -21,7 +21,6 @@␊ |
| #import "RFBConnection.h"␊ |
| #import "PrefController.h"␊ |
| #import "ProfileManager.h"␊ |
| -+#import "ListenerController.h"␊ |
| +-#import "ListenerController.h"␊ |
| #import "Profile.h"␊ |
| #import "rfbproto.h"␊ |
| #import "vncauth.h"␊ |
| -@@ -36,7 +37,7 @@␊ |
| +@@ -37,7 +36,7 @@␊ |
| ␉static id sInstance = nil;␊ |
| ␉if ( ! sInstance )␊ |
| ␉{␊ |
| --␉␉sInstance = [[self alloc] initWithWindowNibName: @"ConnectionDialog"];␊ |
| -+␉␉sInstance = [self alloc];␊ |
| +-␉␉sInstance = [self alloc];␊ |
| ++␉␉sInstance = [[self alloc] initWithWindowNibName: @"ConnectionDialog"];␊ |
| ␉␉NSParameterAssert( sInstance != nil );␊ |
| ␉␉␊ |
| ␉␉[sInstance wakeup];␊ |
| -@@ -144,8 +145,23 @@␊ |
| +@@ -145,23 +144,8 @@␊ |
| for (i = 1; i < argCount; i++)␊ |
| ␉{␊ |
| ␉␉arg = [args objectAtIndex:i];␊ |
| --␉␉␊ |
| --␉␉if ([arg hasPrefix:@"-psn"])␊ |
| -+␊ |
| -+␉␉if ([arg hasPrefix:@"--listen"])␊ |
| -+␉␉{␊ |
| -+␉␉␉NSLog(@"Called with --listen.");␊ |
| -+␉␉␉␊ |
| -+␉␉␉ListenerController* listener = [ListenerController sharedController];␊ |
| -+␉␉␉ProfileManager* pm = [ProfileManager sharedManager];␊ |
| -+␊ |
| -+␉␉␉int port = 5500;␊ |
| -+␉␉␉profile = [pm profileNamed: @"Called with --listen."];␊ |
| -+␉␉␉BOOL local = false;␊ |
| -+␊ |
| -+␉␉␉[listener startListenerOnPort:port withProfile:profile localOnly:local];␊ |
| -+␉␉␉␊ |
| -+␉␉␉return YES;␊ |
| -+␉␉} ␊ |
| -+␉␉else if ([arg hasPrefix:@"-psn"])␊ |
| +-␊ |
| +-␉␉if ([arg hasPrefix:@"--listen"])␊ |
| +-␉␉{␊ |
| +-␉␉␉NSLog(@"Called with --listen.");␊ |
| +-␉␉␉␊ |
| +-␉␉␉ListenerController* listener = [ListenerController sharedController];␊ |
| +-␉␉␉ProfileManager* pm = [ProfileManager sharedManager];␊ |
| +-␊ |
| +-␉␉␉int port = 5500;␊ |
| +-␉␉␉profile = [pm profileNamed: @"Called with --listen."];␊ |
| +-␉␉␉BOOL local = false;␊ |
| +-␊ |
| +-␉␉␉[listener startListenerOnPort:port withProfile:profile localOnly:local];␊ |
| +-␉␉␉␊ |
| +-␉␉␉return YES;␊ |
| +-␉␉} ␊ |
| +-␉␉else if ([arg hasPrefix:@"-psn"])␊ |
| ++␉␉␊ |
| ++␉␉if ([arg hasPrefix:@"-psn"])␊ |
| ␉␉{␊ |
| ␉␉␉// Called from the finder. Do nothing.␊ |
| ␉␉␉continue;␊ |
| -diff -aurr ./Source/VNCViewer_main.m ../cotvnc-gitso/Source/VNCViewer_main.m␊ |
| ---- ./Source/VNCViewer_main.m␉2003-01-17 04:55:52.000000000 -0700␊ |
| -+++ ../cotvnc-gitso/Source/VNCViewer_main.m␉2008-11-07 21:24:00.000000000 -0700␊ |
| -@@ -14,5 +14,6 @@␊ |
| +diff -aurr ./Source/VNCViewer_main.m ../cotvnc/Source/VNCViewer_main.m␊ |
| +--- ./Source/VNCViewer_main.m␉2008-11-07 21:24:00.000000000 -0700␊ |
| ++++ ../cotvnc/Source/VNCViewer_main.m␉2003-01-17 04:55:52.000000000 -0700␊ |
| +@@ -14,6 +14,5 @@␊ |
| ␉[NSAutoreleasePool setPoolCountHighWaterMark: 2000];␊ |
| ␉[NSAutoreleasePool setPoolCountHighWaterResolution: 2000];␊ |
| #endif␊ |
| -+␊ |
| +-␊ |
| return NSApplicationMain(argc, argv);␊ |
| }␊ |
| +Only in .: cotvnc-gitso.diff␊ |