diff --git a/English.lproj/MainMenu.nib/classes.nib b/English.lproj/MainMenu.nib/classes.nib deleted file mode 100644 index 5ce617e..0000000 --- a/English.lproj/MainMenu.nib/classes.nib +++ /dev/null @@ -1,216 +0,0 @@ - - - - - IBClasses - - - ACTIONS - - cancelConnectHost - id - changeAuthenticationType - id - changeDisplayName - id - changeDisplayNumber - id - changePassword - id - changePort - id - changeSharing - id - changeSystemServerAuthentication - id - changeSystemServerPort - id - connectHost - id - installAsService - id - loadUserDefaults - id - openFile - id - openFirewall - id - openGPL - id - openLog - id - openReleaseNotes - id - optionChanged - id - removeService - id - reverseConnection - id - saveUserDefaults - id - setInitialAuthentication - id - startServer - id - stopServer - id - terminateRequest - id - validateInitialAuthentication - id - - CLASS - VNCController - LANGUAGE - ObjC - OUTLETS - - allowDimmingCheckbox - NSButton - allowRendezvousCheckbox - NSButton - allowScreenSaverCheckbox - NSButton - allowSleepCheckbox - NSButton - authenticationType - NSMatrix - connectHost - NSTextField - connectPort - NSTextField - disableRemoteEventsCheckbox - NSButton - disableRichClipboardCheckbox - NSButton - disableStartupButton - NSButton - displayNameField - NSTextField - displayNumText - NSTextField - displayNumberField - NSPopUpButton - dontDisconnectCheckbox - NSButton - eventSourcePopup - NSPopUpButton - hostNamesBox - NSBox - hostNamesField - NSTextField - initialAuthenticationType - NSMatrix - initialDoneButton - NSButton - initialPasswordText - NSTextField - initialWindow - NSWindow - ipAddressesBox - NSBox - ipAddressesView - NSMatrix - keyboardEvents - NSPopUpButton - keyboardLayout - NSPopUpButton - limitToLocalConnections - NSButton - openGLCheckbox - NSButton - optionsTabView - NSTabView - otherArguments - NSTextField - passwordField - NSTextField - portField - NSTextField - portNumText - NSTextField - preferenceWindow - NSWindow - preferencesMessageTestField - NSTextField - protocolVersion - NSPopUpButton - reverseConnectionMessageField - NSTextField - reverseConnectionWindow - NSWindow - serverKeepAliveCheckbox - NSButton - serverMenuItem - NSMenuItem - setStartupButton - NSButton - sharingMatrix - NSMatrix - startServerButton - NSButton - startServerMenuItem - NSMenuItem - startServerOnLaunchCheckbox - NSButton - startupItemStatusMessageField - NSTextField - statusMessageField - NSTextView - statusWindow - NSWindow - stopServerButton - NSButton - stopServerMenuItem - NSMenuItem - swapMouseButtonsCheckbox - NSButton - systemServerAuthenticationType - NSMatrix - systemServerDisplayNameField - NSTextField - systemServerDisplayNumberField - NSPopUpButton - systemServerLimitToLocalConnections - NSButton - systemServerMenu - NSMenuItem - systemServerPasswordField - NSTextField - systemServerPortField - NSTextField - systemServerWindow - NSWindow - terminateOnFastUserSwitch - NSButton - - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - ACTIONS - - - id - optionChanged - id - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - IBVersion - 1 - - diff --git a/English.lproj/MainMenu.nib/info.nib b/English.lproj/MainMenu.nib/info.nib deleted file mode 100644 index 49e4461..0000000 --- a/English.lproj/MainMenu.nib/info.nib +++ /dev/null @@ -1,21 +0,0 @@ - - - - - IBFramework Version - 680 - IBLastKnownRelativeProjectPath - ../../OSXvnc.xcodeproj - IBOldestOS - 5 - IBOpenObjects - - 627 - 923 - - IBSystem Version - 11D50b - targetFramework - IBCocoaFramework - - diff --git a/English.lproj/MainMenu.nib/keyedobjects.nib b/English.lproj/MainMenu.nib/keyedobjects.nib deleted file mode 100644 index c492cab..0000000 Binary files a/English.lproj/MainMenu.nib/keyedobjects.nib and /dev/null differ diff --git a/French.lproj/MainMenu.nib/classes.nib b/French.lproj/MainMenu.nib/classes.nib deleted file mode 100644 index 3cfaf3e..0000000 --- a/French.lproj/MainMenu.nib/classes.nib +++ /dev/null @@ -1,74 +0,0 @@ -{ - IBClasses = ( - { - ACTIONS = {optionChanged = id; }; - CLASS = FirstResponder; - LANGUAGE = ObjC; - SUPERCLASS = NSObject; - }, - { - ACTIONS = { - changeDisplayName = id; - changeDisplayNumber = id; - changePassword = id; - changePort = id; - changeSharing = id; - connectHost = id; - installAsService = id; - loadUserDefaults = id; - openFile = id; - openGPL = id; - openLog = id; - openReleaseNotes = id; - optionChanged = id; - removeService = id; - saveUserDefaults = id; - startServer = id; - stopServer = id; - }; - CLASS = VNCController; - LANGUAGE = ObjC; - OUTLETS = { - allowDimmingCheckbox = NSButton; - allowKeyboardLoading = NSButton; - allowPressModsForKeys = NSButton; - allowRendezvousCheckbox = NSButton; - allowScreenSaverCheckbox = NSButton; - allowSleepCheckbox = NSButton; - connectHost = NSTextField; - connectPort = NSTextField; - disableRemoteEventsCheckbox = NSButton; - disableRichClipboardCheckbox = NSButton; - disableStartupButton = NSButton; - displayNameField = NSTextField; - displayNumberField = NSPopUpButton; - dontDisconnectCheckbox = NSButton; - hostNamesField = NSTextField; - hostNamesLabel = NSTextField; - ipAddressesField = NSTextField; - ipAddressesLabel = NSTextField; - limitToLocalConnections = NSButton; - optionsTabView = NSTabView; - otherArguments = NSTextField; - passwordField = NSTextField; - portField = NSTextField; - protocolVersion = NSPopUpButton; - serverKeepAliveCheckbox = NSButton; - setStartupButton = NSButton; - sharingMatrix = NSMatrix; - startServerButton = NSButton; - startServerMenuItem = NSMenuItem; - startServerOnLaunchCheckbox = NSButton; - startupItemStatusMessageField = NSTextField; - statusMessageField = NSTextField; - stopServerButton = NSButton; - stopServerMenuItem = NSMenuItem; - swapMouseButtonsCheckbox = NSButton; - terminateOnFastUserSwitch = NSButton; - window = NSWindow; - }; - SUPERCLASS = NSObject; - } - ); - IBVersion = 1; -} diff --git a/French.lproj/MainMenu.nib/info.nib b/French.lproj/MainMenu.nib/info.nib deleted file mode 100644 index da3c002..0000000 --- a/French.lproj/MainMenu.nib/info.nib +++ /dev/null @@ -1,24 +0,0 @@ - - - - - IBDocumentLocation - 336 328 356 240 0 0 1920 1178 - IBEditorPositions - - 29 - 141 1134 319 44 0 0 1920 1178 - 404 - 800 835 192 99 0 0 1920 1178 - - IBFramework Version - 446.1 - IBOpenObjects - - 21 - 29 - - IBSystem Version - 8L2127 - - diff --git a/French.lproj/MainMenu.nib/objects.nib b/French.lproj/MainMenu.nib/objects.nib deleted file mode 100644 index c894547..0000000 Binary files a/French.lproj/MainMenu.nib/objects.nib and /dev/null differ diff --git a/German.lproj/MainMenu.nib/classes.nib b/German.lproj/MainMenu.nib/classes.nib deleted file mode 100644 index c051ebf..0000000 --- a/German.lproj/MainMenu.nib/classes.nib +++ /dev/null @@ -1,73 +0,0 @@ -{ - IBClasses = ( - { - ACTIONS = {"" = id; optionChanged = id; }; - CLASS = FirstResponder; - LANGUAGE = ObjC; - SUPERCLASS = NSObject; - }, - { - ACTIONS = { - changeDisplayName = id; - changeDisplayNumber = id; - changePassword = id; - changePort = id; - changeSharing = id; - connectHost = id; - installAsService = id; - loadUserDefaults = id; - openFile = id; - openGPL = id; - openLog = id; - openReleaseNotes = id; - optionChanged = id; - removeService = id; - saveUserDefaults = id; - startServer = id; - stopServer = id; - }; - CLASS = VNCController; - LANGUAGE = ObjC; - OUTLETS = { - allowDimmingCheckbox = NSButton; - allowKeyboardLoading = NSButton; - allowPressModsForKeys = NSButton; - allowRendezvousCheckbox = NSButton; - allowScreenSaverCheckbox = NSButton; - allowSleepCheckbox = NSButton; - connectHost = NSTextField; - connectPort = NSTextField; - disableRemoteEventsCheckbox = NSButton; - disableStartupButton = NSButton; - displayNameField = NSTextField; - displayNumberField = NSPopUpButton; - dontDisconnectCheckbox = NSButton; - hostNamesField = NSTextField; - hostNamesLabel = NSTextField; - ipAddressesField = NSTextField; - ipAddressesLabel = NSTextField; - limitToLocalConnections = NSButton; - optionsTabView = NSTabView; - otherArguments = NSTextField; - passwordField = NSTextField; - portField = NSTextField; - protocolVersion = NSPopUpButton; - serverKeepAliveCheckbox = NSButton; - setStartupButton = NSButton; - sharingMatrix = NSMatrix; - startServerButton = NSButton; - startServerMenuItem = NSMenuItem; - startServerOnLaunchCheckbox = NSButton; - startupItemStatusMessageField = NSTextField; - statusMessageField = NSTextField; - stopServerButton = NSButton; - stopServerMenuItem = NSMenuItem; - swapMouseButtonsCheckbox = NSButton; - terminateOnFastUserSwitch = NSButton; - window = NSWindow; - }; - SUPERCLASS = NSObject; - } - ); - IBVersion = 1; -} diff --git a/German.lproj/MainMenu.nib/info.nib b/German.lproj/MainMenu.nib/info.nib deleted file mode 100644 index 6129718..0000000 --- a/German.lproj/MainMenu.nib/info.nib +++ /dev/null @@ -1,25 +0,0 @@ - - - - - IBDocumentLocation - 116 836 356 240 0 0 1920 1178 - IBEditorPositions - - 29 - 117 1133 279 44 0 0 1920 1178 - 404 - 792 835 114 99 0 0 1920 1178 - - IBFramework Version - 443.0 - IBOpenObjects - - 21 - 404 - 29 - - IBSystem Version - 8I127 - - diff --git a/German.lproj/MainMenu.nib/objects.nib b/German.lproj/MainMenu.nib/objects.nib deleted file mode 100644 index bb19363..0000000 Binary files a/German.lproj/MainMenu.nib/objects.nib and /dev/null differ diff --git a/Italian.lproj/MainMenu.nib/classes.nib b/Italian.lproj/MainMenu.nib/classes.nib deleted file mode 100644 index c051ebf..0000000 --- a/Italian.lproj/MainMenu.nib/classes.nib +++ /dev/null @@ -1,73 +0,0 @@ -{ - IBClasses = ( - { - ACTIONS = {"" = id; optionChanged = id; }; - CLASS = FirstResponder; - LANGUAGE = ObjC; - SUPERCLASS = NSObject; - }, - { - ACTIONS = { - changeDisplayName = id; - changeDisplayNumber = id; - changePassword = id; - changePort = id; - changeSharing = id; - connectHost = id; - installAsService = id; - loadUserDefaults = id; - openFile = id; - openGPL = id; - openLog = id; - openReleaseNotes = id; - optionChanged = id; - removeService = id; - saveUserDefaults = id; - startServer = id; - stopServer = id; - }; - CLASS = VNCController; - LANGUAGE = ObjC; - OUTLETS = { - allowDimmingCheckbox = NSButton; - allowKeyboardLoading = NSButton; - allowPressModsForKeys = NSButton; - allowRendezvousCheckbox = NSButton; - allowScreenSaverCheckbox = NSButton; - allowSleepCheckbox = NSButton; - connectHost = NSTextField; - connectPort = NSTextField; - disableRemoteEventsCheckbox = NSButton; - disableStartupButton = NSButton; - displayNameField = NSTextField; - displayNumberField = NSPopUpButton; - dontDisconnectCheckbox = NSButton; - hostNamesField = NSTextField; - hostNamesLabel = NSTextField; - ipAddressesField = NSTextField; - ipAddressesLabel = NSTextField; - limitToLocalConnections = NSButton; - optionsTabView = NSTabView; - otherArguments = NSTextField; - passwordField = NSTextField; - portField = NSTextField; - protocolVersion = NSPopUpButton; - serverKeepAliveCheckbox = NSButton; - setStartupButton = NSButton; - sharingMatrix = NSMatrix; - startServerButton = NSButton; - startServerMenuItem = NSMenuItem; - startServerOnLaunchCheckbox = NSButton; - startupItemStatusMessageField = NSTextField; - statusMessageField = NSTextField; - stopServerButton = NSButton; - stopServerMenuItem = NSMenuItem; - swapMouseButtonsCheckbox = NSButton; - terminateOnFastUserSwitch = NSButton; - window = NSWindow; - }; - SUPERCLASS = NSObject; - } - ); - IBVersion = 1; -} diff --git a/Italian.lproj/MainMenu.nib/info.nib b/Italian.lproj/MainMenu.nib/info.nib deleted file mode 100644 index 02c65e5..0000000 --- a/Italian.lproj/MainMenu.nib/info.nib +++ /dev/null @@ -1,23 +0,0 @@ - - - - - IBDocumentLocation - 1000 258 356 240 0 0 1440 878 - IBEditorPositions - - 29 - 101 636 382 44 0 0 1024 746 - 404 - 591 584 158 99 0 0 1440 878 - - IBFramework Version - 446.1 - IBOpenObjects - - 404 - - IBSystem Version - 8J2135a - - diff --git a/Italian.lproj/MainMenu.nib/objects.nib b/Italian.lproj/MainMenu.nib/objects.nib deleted file mode 100644 index e0419c6..0000000 Binary files a/Italian.lproj/MainMenu.nib/objects.nib and /dev/null differ diff --git a/Japanese.lproj/MainMenu.nib/classes.nib b/Japanese.lproj/MainMenu.nib/classes.nib deleted file mode 100644 index fd50e57..0000000 --- a/Japanese.lproj/MainMenu.nib/classes.nib +++ /dev/null @@ -1,73 +0,0 @@ -{ - IBClasses = ( - { - ACTIONS = {optionChanged = id; }; - CLASS = FirstResponder; - LANGUAGE = ObjC; - SUPERCLASS = NSObject; - }, - { - ACTIONS = { - changeDisplayName = id; - changeDisplayNumber = id; - changePassword = id; - changePort = id; - changeSharing = id; - connectHost = id; - installAsService = id; - loadUserDefaults = id; - openFile = id; - openGPL = id; - openLog = id; - openReleaseNotes = id; - optionChanged = id; - removeService = id; - saveUserDefaults = id; - startServer = id; - stopServer = id; - }; - CLASS = VNCController; - LANGUAGE = ObjC; - OUTLETS = { - allowDimmingCheckbox = NSButton; - allowKeyboardLoading = NSButton; - allowPressModsForKeys = NSButton; - allowRendezvousCheckbox = NSButton; - allowScreenSaverCheckbox = NSButton; - allowSleepCheckbox = NSButton; - connectHost = NSTextField; - connectPort = NSTextField; - disableRemoteEventsCheckbox = NSButton; - disableStartupButton = NSButton; - displayNameField = NSTextField; - displayNumberField = NSPopUpButton; - dontDisconnectCheckbox = NSButton; - hostNamesField = NSTextField; - hostNamesLabel = NSTextField; - ipAddressesField = NSTextField; - ipAddressesLabel = NSTextField; - limitToLocalConnections = NSButton; - optionsTabView = NSTabView; - otherArguments = NSTextField; - passwordField = NSTextField; - portField = NSTextField; - protocolVersion = NSPopUpButton; - serverKeepAliveCheckbox = NSButton; - setStartupButton = NSButton; - sharingMatrix = NSMatrix; - startServerButton = NSButton; - startServerMenuItem = NSMenuItem; - startServerOnLaunchCheckbox = NSButton; - startupItemStatusMessageField = NSTextField; - statusMessageField = NSTextField; - stopServerButton = NSButton; - stopServerMenuItem = NSMenuItem; - swapMouseButtonsCheckbox = NSButton; - terminateOnFastUserSwitch = NSButton; - window = NSWindow; - }; - SUPERCLASS = NSObject; - } - ); - IBVersion = 1; -} diff --git a/Japanese.lproj/MainMenu.nib/info.nib b/Japanese.lproj/MainMenu.nib/info.nib deleted file mode 100644 index 5222b2d..0000000 --- a/Japanese.lproj/MainMenu.nib/info.nib +++ /dev/null @@ -1,24 +0,0 @@ - - - - - IBDocumentLocation - 451 77 356 240 0 0 1024 746 - IBEditorPositions - - 29 - 102 661 342 44 0 0 1024 746 - 404 - 400 501 108 99 0 0 1024 746 - - IBFramework Version - 443.0 - IBOpenObjects - - 29 - 21 - - IBSystem Version - 8H14 - - diff --git a/Japanese.lproj/MainMenu.nib/objects.nib b/Japanese.lproj/MainMenu.nib/objects.nib deleted file mode 100644 index 661dc0e..0000000 Binary files a/Japanese.lproj/MainMenu.nib/objects.nib and /dev/null differ diff --git a/OSXvnc-server/VNCServer.h b/OSXvnc-server/VNCServer.h index 001ec8d..6304ce1 100644 --- a/OSXvnc-server/VNCServer.h +++ b/OSXvnc-server/VNCServer.h @@ -55,7 +55,7 @@ NSInteger modifierDelay; } -+ sharedServer; ++ (instancetype)sharedServer; - (void) loadKeyboard: (TISInputSourceRef) keyboardLayoutRef; - (void) registerRendezvous; diff --git a/OSXvnc.xcodeproj/project.pbxproj b/OSXvnc.xcodeproj/project.pbxproj index e5fad85..4bcb064 100644 --- a/OSXvnc.xcodeproj/project.pbxproj +++ b/OSXvnc.xcodeproj/project.pbxproj @@ -57,7 +57,7 @@ AB25D9400868707E0065843D /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; AB25D992086877000065843D /* storepasswd.c in Sources */ = {isa = PBXBuildFile; fileRef = F538E11902F9812C01A80186 /* storepasswd.c */; }; AB25DA3B0868842E0065843D /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AB25DA3A0868842E0065843D /* IOKit.framework */; }; - AB25DA3D086884420065843D /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = AB25DA3C086884420065843D /* libz.dylib */; }; + AB25DA3D086884420065843D /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = AB25DA3C086884420065843D /* libz.tbd */; }; AB3E27F80AF947FB004AF567 /* Vine Server.pdf in Resources */ = {isa = PBXBuildFile; fileRef = AB3E27F70AF947FB004AF567 /* Vine Server.pdf */; }; AB82605A08689AC00010AB63 /* storepasswd in CopyFiles */ = {isa = PBXBuildFile; fileRef = AB82605708689AC00010AB63 /* storepasswd */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; AB82605E08689AC00010AB63 /* OSXvnc-server in CopyFiles */ = {isa = PBXBuildFile; fileRef = AB82605B08689AC00010AB63 /* OSXvnc-server */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; @@ -137,17 +137,22 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 096B69DC0097995A7F000001 /* OSXvnc.html */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.html; path = OSXvnc.html; sourceTree = ""; }; - 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; - 29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; - 919999420B11348C0099EA7A /* getMACAddress.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = getMACAddress.h; sourceTree = ""; }; - 919999430B11348E0099EA7A /* getMACAddress.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.objc; fileEncoding = 30; path = getMACAddress.c; sourceTree = ""; }; + 096B69DC0097995A7F000001 /* OSXvnc.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = OSXvnc.html; sourceTree = ""; }; + 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; }; + 29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; + 556D01312CA293E100C60682 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = fr; path = fr.lproj/Credits.rtf; sourceTree = ""; }; + 556D01322CA293E500C60682 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = de; path = de.lproj/Credits.rtf; sourceTree = ""; }; + 556D01332CA293E800C60682 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = it; path = it.lproj/Credits.rtf; sourceTree = ""; }; + 556D01342CA293EB00C60682 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = ja; path = ja.lproj/Credits.rtf; sourceTree = ""; }; + 556D01352CA293F100C60682 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = it; path = it.lproj/Copying.rtf; sourceTree = ""; }; + 919999420B11348C0099EA7A /* getMACAddress.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = getMACAddress.h; sourceTree = ""; }; + 919999430B11348E0099EA7A /* getMACAddress.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.objc; fileEncoding = 4; path = getMACAddress.c; sourceTree = ""; }; AB25D83708686B520065843D /* VineServer-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "VineServer-Info.plist"; sourceTree = ""; }; AB25D83808686B520065843D /* Vine Server.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Vine Server.app"; sourceTree = BUILT_PRODUCTS_DIR; }; - AB25DA3A0868842E0065843D /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = ""; }; - AB25DA3C086884420065843D /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = /usr/lib/libz.dylib; sourceTree = ""; }; + AB25DA3A0868842E0065843D /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; }; + AB25DA3C086884420065843D /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; }; AB3E27F70AF947FB004AF567 /* Vine Server.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "Vine Server.pdf"; sourceTree = ""; }; - AB41881F04C5986E00A80117 /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = /System/Library/Frameworks/ApplicationServices.framework; sourceTree = ""; }; + AB41881F04C5986E00A80117 /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = System/Library/Frameworks/ApplicationServices.framework; sourceTree = SDKROOT; }; AB82605708689AC00010AB63 /* storepasswd */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = storepasswd; sourceTree = BUILT_PRODUCTS_DIR; }; AB82605B08689AC00010AB63 /* OSXvnc-server */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "OSXvnc-server"; sourceTree = BUILT_PRODUCTS_DIR; }; AB82E81904FA629800A80117 /* kbdptr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = kbdptr.h; sourceTree = ""; }; @@ -155,109 +160,109 @@ AB83C53A12724F8B0096F6A7 /* Version.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Version.txt; sourceTree = ""; }; AB95E3650FD497F600D063EC /* screencapture.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = screencapture.c; sourceTree = ""; }; AB95E3B20FD4A68800D063EC /* screencapture.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = screencapture.h; sourceTree = ""; }; - AB95E3ED0FD4AA3700D063EC /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = ""; }; - ABA7B3D10948CB5D00CD7499 /* d3des.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = d3des.c; sourceTree = ""; }; - ABA7B3D20948CB5D00CD7499 /* d3des.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = d3des.h; sourceTree = ""; }; - ABA7B3D30948CB5D00CD7499 /* vncauth.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = vncauth.c; sourceTree = ""; }; - ABA7B3D40948CB5D00CD7499 /* vncauth.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = vncauth.h; sourceTree = ""; }; - ABA7B3D50948CB5D00CD7499 /* zrleEncode.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = zrleEncode.h; sourceTree = ""; }; + AB95E3ED0FD4AA3700D063EC /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; }; + ABA7B3D10948CB5D00CD7499 /* d3des.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = d3des.c; sourceTree = ""; }; + ABA7B3D20948CB5D00CD7499 /* d3des.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = d3des.h; sourceTree = ""; }; + ABA7B3D30948CB5D00CD7499 /* vncauth.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = vncauth.c; sourceTree = ""; }; + ABA7B3D40948CB5D00CD7499 /* vncauth.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vncauth.h; sourceTree = ""; }; + ABA7B3D50948CB5D00CD7499 /* zrleEncode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zrleEncode.h; sourceTree = ""; }; ABA7B52D094A053000CD7499 /* librdr.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = librdr.a; sourceTree = BUILT_PRODUCTS_DIR; }; ABCCC8B203D9C60A00A80117 /* OSXvnc */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = folder; path = OSXvnc; sourceTree = ""; }; ABD8EC07058A0BD600C84739 /* NSAuthorization.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSAuthorization.h; sourceTree = ""; }; ABD8EC08058A0BD600C84739 /* NSAuthorization.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSAuthorization.m; sourceTree = ""; }; - ABEE28F804C8745B00A80117 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = /System/Library/Frameworks/Security.framework; sourceTree = ""; }; - ABF191B704E447A400A80117 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = ""; }; + ABEE28F804C8745B00A80117 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; }; + ABF191B704E447A400A80117 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = System/Library/Frameworks/Carbon.framework; sourceTree = SDKROOT; }; ABFC222B0AF08CBA00BCE727 /* VineServer.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = VineServer.icns; sourceTree = ""; }; - F538E01002F9812901A80186 /* auth.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.objc; fileEncoding = 30; path = auth.c; sourceTree = ""; }; - F538E01302F9812901A80186 /* corre.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = corre.c; sourceTree = ""; }; - F538E01402F9812901A80186 /* cutpaste.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.objc; fileEncoding = 30; path = cutpaste.c; sourceTree = ""; }; - F538E01502F9812901A80186 /* dimming.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = dimming.c; sourceTree = ""; }; - F538E01602F9812901A80186 /* hextile.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 30; path = hextile.c; sourceTree = ""; }; - F538E01902F9812901A80186 /* keysym.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = keysym.h; sourceTree = ""; }; - F538E01A02F9812901A80186 /* keysymdef.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = keysymdef.h; sourceTree = ""; }; - F538E01B02F9812901A80186 /* X.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = X.h; sourceTree = ""; }; - F538E01C02F9812901A80186 /* Xalloca.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Xalloca.h; sourceTree = ""; }; - F538E01D02F9812901A80186 /* Xfuncproto.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Xfuncproto.h; sourceTree = ""; }; - F538E01E02F9812901A80186 /* Xfuncs.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Xfuncs.h; sourceTree = ""; }; - F538E01F02F9812901A80186 /* Xmd.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Xmd.h; sourceTree = ""; }; - F538E02002F9812901A80186 /* Xos.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Xos.h; sourceTree = ""; }; - F538E02102F9812901A80186 /* Xosdefs.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Xosdefs.h; sourceTree = ""; }; - F538E02202F9812901A80186 /* Xproto.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Xproto.h; sourceTree = ""; }; - F538E02302F9812901A80186 /* Xprotostr.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Xprotostr.h; sourceTree = ""; }; - F538E02502F9812901A80186 /* colormap.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = colormap.h; sourceTree = ""; }; - F538E02602F9812901A80186 /* cursor.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = cursor.h; sourceTree = ""; }; - F538E02702F9812901A80186 /* dix.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = dix.h; sourceTree = ""; }; - F538E02802F9812901A80186 /* gc.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = gc.h; sourceTree = ""; }; - F538E02902F9812901A80186 /* input.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = input.h; sourceTree = ""; }; - F538E02A02F9812901A80186 /* misc.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = misc.h; sourceTree = ""; }; - F538E02B02F9812901A80186 /* miscstruct.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = miscstruct.h; sourceTree = ""; }; - F538E02C02F9812901A80186 /* opaque.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = opaque.h; sourceTree = ""; }; - F538E02D02F9812901A80186 /* os.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = os.h; sourceTree = ""; }; - F538E02E02F9812901A80186 /* pixmap.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = pixmap.h; sourceTree = ""; }; - F538E02F02F9812901A80186 /* region.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = region.h; sourceTree = ""; }; - F538E03002F9812901A80186 /* regionstr.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = regionstr.h; sourceTree = ""; }; - F538E03102F9812901A80186 /* screenint.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = screenint.h; sourceTree = ""; }; - F538E03202F9812901A80186 /* scrnintstr.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = scrnintstr.h; sourceTree = ""; }; - F538E03302F9812901A80186 /* validate.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = validate.h; sourceTree = ""; }; - F538E03402F9812901A80186 /* window.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = window.h; sourceTree = ""; }; - F538E03502F9812901A80186 /* kbdptr.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.objc; fileEncoding = 30; path = kbdptr.c; sourceTree = ""; }; - F538E10E02F9812C01A80186 /* main.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.objc; fileEncoding = 30; path = main.c; sourceTree = ""; }; - F538E10F02F9812C01A80186 /* Makefile */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = ""; }; - F538E11002F9812C01A80186 /* miregion.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = miregion.c; sourceTree = ""; }; - F538E11302F9812C01A80186 /* rfb.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = rfb.h; sourceTree = ""; }; - F538E11402F9812C01A80186 /* rfbproto.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = rfbproto.h; sourceTree = ""; }; - F538E11502F9812C01A80186 /* rfbserver.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.objc; fileEncoding = 30; lineEnding = 0; path = rfbserver.c; sourceTree = ""; }; - F538E11602F9812C01A80186 /* rre.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = rre.c; sourceTree = ""; }; - F538E11702F9812C01A80186 /* sockets.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = sockets.c; sourceTree = ""; }; - F538E11802F9812C01A80186 /* stats.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = stats.c; sourceTree = ""; }; - F538E11902F9812C01A80186 /* storepasswd.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = storepasswd.c; sourceTree = ""; }; - F538E11A02F9812C01A80186 /* tableinitcmtemplate.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = tableinitcmtemplate.c; sourceTree = ""; }; - F538E11B02F9812C01A80186 /* tableinittctemplate.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = tableinittctemplate.c; sourceTree = ""; }; - F538E11C02F9812C01A80186 /* tabletranstemplate.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = tabletranstemplate.c; sourceTree = ""; }; - F538E11D02F9812C01A80186 /* tight.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = tight.c; sourceTree = ""; }; - F538E11F02F9812C01A80186 /* translate.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = translate.c; sourceTree = ""; }; - F538E12002F9812C01A80186 /* xalloc.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = xalloc.c; sourceTree = ""; }; - F538E12102F9812C01A80186 /* zlib.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = zlib.c; sourceTree = ""; }; - F538E12202F9812C01A80186 /* zlibhex.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = zlibhex.c; sourceTree = ""; }; - F5456A2802FAD08901A80117 /* VNCController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = VNCController.m; sourceTree = ""; }; - F5456A2902FAD08901A80117 /* VNCController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = VNCController.h; sourceTree = ""; }; + F538E01002F9812901A80186 /* auth.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.objc; fileEncoding = 4; path = auth.c; sourceTree = ""; }; + F538E01302F9812901A80186 /* corre.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = corre.c; sourceTree = ""; }; + F538E01402F9812901A80186 /* cutpaste.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.objc; fileEncoding = 4; path = cutpaste.c; sourceTree = ""; }; + F538E01502F9812901A80186 /* dimming.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dimming.c; sourceTree = ""; }; + F538E01602F9812901A80186 /* hextile.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 4; path = hextile.c; sourceTree = ""; }; + F538E01902F9812901A80186 /* keysym.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = keysym.h; sourceTree = ""; }; + F538E01A02F9812901A80186 /* keysymdef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = keysymdef.h; sourceTree = ""; }; + F538E01B02F9812901A80186 /* X.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = X.h; sourceTree = ""; }; + F538E01C02F9812901A80186 /* Xalloca.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Xalloca.h; sourceTree = ""; }; + F538E01D02F9812901A80186 /* Xfuncproto.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Xfuncproto.h; sourceTree = ""; }; + F538E01E02F9812901A80186 /* Xfuncs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Xfuncs.h; sourceTree = ""; }; + F538E01F02F9812901A80186 /* Xmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Xmd.h; sourceTree = ""; }; + F538E02002F9812901A80186 /* Xos.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Xos.h; sourceTree = ""; }; + F538E02102F9812901A80186 /* Xosdefs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Xosdefs.h; sourceTree = ""; }; + F538E02202F9812901A80186 /* Xproto.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Xproto.h; sourceTree = ""; }; + F538E02302F9812901A80186 /* Xprotostr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Xprotostr.h; sourceTree = ""; }; + F538E02502F9812901A80186 /* colormap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = colormap.h; sourceTree = ""; }; + F538E02602F9812901A80186 /* cursor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cursor.h; sourceTree = ""; }; + F538E02702F9812901A80186 /* dix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dix.h; sourceTree = ""; }; + F538E02802F9812901A80186 /* gc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gc.h; sourceTree = ""; }; + F538E02902F9812901A80186 /* input.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = input.h; sourceTree = ""; }; + F538E02A02F9812901A80186 /* misc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = misc.h; sourceTree = ""; }; + F538E02B02F9812901A80186 /* miscstruct.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = miscstruct.h; sourceTree = ""; }; + F538E02C02F9812901A80186 /* opaque.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = opaque.h; sourceTree = ""; }; + F538E02D02F9812901A80186 /* os.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = os.h; sourceTree = ""; }; + F538E02E02F9812901A80186 /* pixmap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pixmap.h; sourceTree = ""; }; + F538E02F02F9812901A80186 /* region.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = region.h; sourceTree = ""; }; + F538E03002F9812901A80186 /* regionstr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = regionstr.h; sourceTree = ""; }; + F538E03102F9812901A80186 /* screenint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = screenint.h; sourceTree = ""; }; + F538E03202F9812901A80186 /* scrnintstr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scrnintstr.h; sourceTree = ""; }; + F538E03302F9812901A80186 /* validate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = validate.h; sourceTree = ""; }; + F538E03402F9812901A80186 /* window.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = window.h; sourceTree = ""; }; + F538E03502F9812901A80186 /* kbdptr.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.objc; fileEncoding = 4; path = kbdptr.c; sourceTree = ""; }; + F538E10E02F9812C01A80186 /* main.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.objc; fileEncoding = 4; path = main.c; sourceTree = ""; }; + F538E10F02F9812C01A80186 /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = ""; }; + F538E11002F9812C01A80186 /* miregion.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = miregion.c; sourceTree = ""; }; + F538E11302F9812C01A80186 /* rfb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rfb.h; sourceTree = ""; }; + F538E11402F9812C01A80186 /* rfbproto.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rfbproto.h; sourceTree = ""; }; + F538E11502F9812C01A80186 /* rfbserver.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.objc; fileEncoding = 4; lineEnding = 0; path = rfbserver.c; sourceTree = ""; }; + F538E11602F9812C01A80186 /* rre.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = rre.c; sourceTree = ""; }; + F538E11702F9812C01A80186 /* sockets.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sockets.c; sourceTree = ""; }; + F538E11802F9812C01A80186 /* stats.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = stats.c; sourceTree = ""; }; + F538E11902F9812C01A80186 /* storepasswd.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = storepasswd.c; sourceTree = ""; }; + F538E11A02F9812C01A80186 /* tableinitcmtemplate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tableinitcmtemplate.c; sourceTree = ""; }; + F538E11B02F9812C01A80186 /* tableinittctemplate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tableinittctemplate.c; sourceTree = ""; }; + F538E11C02F9812C01A80186 /* tabletranstemplate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tabletranstemplate.c; sourceTree = ""; }; + F538E11D02F9812C01A80186 /* tight.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tight.c; sourceTree = ""; }; + F538E11F02F9812C01A80186 /* translate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = translate.c; sourceTree = ""; }; + F538E12002F9812C01A80186 /* xalloc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = xalloc.c; sourceTree = ""; }; + F538E12102F9812C01A80186 /* zlib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = zlib.c; sourceTree = ""; }; + F538E12202F9812C01A80186 /* zlibhex.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = zlibhex.c; sourceTree = ""; }; + F5456A2802FAD08901A80117 /* VNCController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VNCController.m; sourceTree = ""; }; + F5456A2902FAD08901A80117 /* VNCController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VNCController.h; sourceTree = ""; }; F54B48D8038C32FA01A80117 /* OSXvnc.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = OSXvnc.tiff; sourceTree = ""; }; F570ED1002F9DA7601A80186 /* OSXvnc.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = OSXvnc.icns; sourceTree = SOURCE_ROOT; }; - F58DDDE7056A861001A8015E /* VNCServer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VNCServer.h; sourceTree = ""; }; - F58DDDE8056A861001A8015E /* VNCServer.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VNCServer.m; sourceTree = ""; }; - F5C9A8F1038C6F5D01A80117 /* mousecursor.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = mousecursor.c; sourceTree = ""; }; - F5C9A8F6038C74D301A80117 /* CGS.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CGS.h; sourceTree = ""; }; - F5C9B02C038DA64501A80117 /* zrle.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = zrle.cc; sourceTree = ""; }; - F5C9B02F038DA99401A80117 /* Exception.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Exception.h; sourceTree = ""; }; - F5C9B030038DA99401A80117 /* FdInStream.cxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = FdInStream.cxx; sourceTree = ""; }; - F5C9B031038DA99401A80117 /* FdInStream.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FdInStream.h; sourceTree = ""; }; - F5C9B032038DA99401A80117 /* FdOutStream.cxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = FdOutStream.cxx; sourceTree = ""; }; - F5C9B033038DA99401A80117 /* FdOutStream.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FdOutStream.h; sourceTree = ""; }; - F5C9B034038DA99401A80117 /* FixedMemOutStream.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FixedMemOutStream.h; sourceTree = ""; }; - F5C9B035038DA99401A80117 /* InStream.cxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = InStream.cxx; sourceTree = ""; }; - F5C9B036038DA99401A80117 /* InStream.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = InStream.h; sourceTree = ""; }; - F5C9B038038DA99401A80117 /* MemInStream.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MemInStream.h; sourceTree = ""; }; - F5C9B039038DA99401A80117 /* MemOutStream.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MemOutStream.h; sourceTree = ""; }; - F5C9B03A038DA99401A80117 /* NullOutStream.cxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = NullOutStream.cxx; sourceTree = ""; }; - F5C9B03B038DA99401A80117 /* NullOutStream.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = NullOutStream.h; sourceTree = ""; }; - F5C9B03C038DA99401A80117 /* OutStream.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = OutStream.h; sourceTree = ""; }; - F5C9B03E038DA99401A80117 /* types.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = types.h; sourceTree = ""; }; - F5C9B03F038DA99401A80117 /* ZlibInStream.cxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = ZlibInStream.cxx; sourceTree = ""; }; - F5C9B040038DA99401A80117 /* ZlibInStream.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ZlibInStream.h; sourceTree = ""; }; - F5C9B041038DA99401A80117 /* ZlibOutStream.cxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = ZlibOutStream.cxx; sourceTree = ""; }; - F5C9B042038DA99401A80117 /* ZlibOutStream.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ZlibOutStream.h; sourceTree = ""; }; + F58DDDE7056A861001A8015E /* VNCServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VNCServer.h; sourceTree = ""; }; + F58DDDE8056A861001A8015E /* VNCServer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VNCServer.m; sourceTree = ""; }; + F5C9A8F1038C6F5D01A80117 /* mousecursor.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mousecursor.c; sourceTree = ""; }; + F5C9A8F6038C74D301A80117 /* CGS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CGS.h; sourceTree = ""; }; + F5C9B02C038DA64501A80117 /* zrle.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = zrle.cc; sourceTree = ""; }; + F5C9B02F038DA99401A80117 /* Exception.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Exception.h; sourceTree = ""; }; + F5C9B030038DA99401A80117 /* FdInStream.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FdInStream.cxx; sourceTree = ""; }; + F5C9B031038DA99401A80117 /* FdInStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FdInStream.h; sourceTree = ""; }; + F5C9B032038DA99401A80117 /* FdOutStream.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FdOutStream.cxx; sourceTree = ""; }; + F5C9B033038DA99401A80117 /* FdOutStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FdOutStream.h; sourceTree = ""; }; + F5C9B034038DA99401A80117 /* FixedMemOutStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FixedMemOutStream.h; sourceTree = ""; }; + F5C9B035038DA99401A80117 /* InStream.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InStream.cxx; sourceTree = ""; }; + F5C9B036038DA99401A80117 /* InStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InStream.h; sourceTree = ""; }; + F5C9B038038DA99401A80117 /* MemInStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MemInStream.h; sourceTree = ""; }; + F5C9B039038DA99401A80117 /* MemOutStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MemOutStream.h; sourceTree = ""; }; + F5C9B03A038DA99401A80117 /* NullOutStream.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NullOutStream.cxx; sourceTree = ""; }; + F5C9B03B038DA99401A80117 /* NullOutStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NullOutStream.h; sourceTree = ""; }; + F5C9B03C038DA99401A80117 /* OutStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OutStream.h; sourceTree = ""; }; + F5C9B03E038DA99401A80117 /* types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = types.h; sourceTree = ""; }; + F5C9B03F038DA99401A80117 /* ZlibInStream.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ZlibInStream.cxx; sourceTree = ""; }; + F5C9B040038DA99401A80117 /* ZlibInStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZlibInStream.h; sourceTree = ""; }; + F5C9B041038DA99401A80117 /* ZlibOutStream.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ZlibOutStream.cxx; sourceTree = ""; }; + F5C9B042038DA99401A80117 /* ZlibOutStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZlibOutStream.h; sourceTree = ""; }; F5F3A78903B395AA01A80117 /* OSXvnc.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = OSXvnc.jpg; sourceTree = ""; }; F89837A525B78CE3003BFE25 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = fr; path = fr.lproj/Copying.rtf; sourceTree = ""; }; - F89837A625B78CE3003BFE25 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Localizable.strings; sourceTree = ""; }; + F89837A625B78CE3003BFE25 /* fr */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Localizable.strings; sourceTree = ""; }; F89837A825B78CFB003BFE25 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = en; path = en.lproj/Copying.rtf; sourceTree = ""; }; F89837A925B78CFB003BFE25 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = en; path = en.lproj/Credits.rtf; sourceTree = ""; }; - F89837AA25B78CFB003BFE25 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = ""; }; + F89837AA25B78CFB003BFE25 /* en */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = ""; }; F89837AB25B78CFB003BFE25 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = en; path = "en.lproj/Vine Server Release Notes.rtf"; sourceTree = ""; }; F89837AC25B78D00003BFE25 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = de; path = de.lproj/Copying.rtf; sourceTree = ""; }; - F89837AD25B78D00003BFE25 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = ""; }; + F89837AD25B78D00003BFE25 /* de */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = ""; }; F89837AE25B78D05003BFE25 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = ja; path = ja.lproj/Copying.rtf; sourceTree = ""; }; - F89837AF25B78D05003BFE25 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/Localizable.strings; sourceTree = ""; }; - F89837B025B78D09003BFE25 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/Localizable.strings; sourceTree = ""; }; + F89837AF25B78D05003BFE25 /* ja */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/Localizable.strings; sourceTree = ""; }; + F89837B025B78D09003BFE25 /* it */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/Localizable.strings; sourceTree = ""; }; F89837B125B78D15003BFE25 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = ""; }; /* End PBXFileReference section */ @@ -280,7 +285,7 @@ AB25DA3B0868842E0065843D /* IOKit.framework in Frameworks */, AB95E3EE0FD4AA3800D063EC /* OpenGL.framework in Frameworks */, ABA7B560094A080200CD7499 /* librdr.a in Frameworks */, - AB25DA3D086884420065843D /* libz.dylib in Frameworks */, + AB25DA3D086884420065843D /* libz.tbd in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -308,6 +313,7 @@ ); name = OSXvnc; sourceTree = ""; + usesTabs = 0; }; 29B97315FDCFA39411CA2CEA /* Other Sources */ = { isa = PBXGroup; @@ -339,7 +345,7 @@ 29B97323FDCFA39411CA2CEA /* Frameworks */ = { isa = PBXGroup; children = ( - AB25DA3C086884420065843D /* libz.dylib */, + AB25DA3C086884420065843D /* libz.tbd */, AB25DA3A0868842E0065843D /* IOKit.framework */, ABF191B704E447A400A80117 /* Carbon.framework */, AB95E3ED0FD4AA3700D063EC /* OpenGL.framework */, @@ -774,6 +780,7 @@ F89837A825B78CFB003BFE25 /* en */, F89837AC25B78D00003BFE25 /* de */, F89837AE25B78D05003BFE25 /* ja */, + 556D01352CA293F100C60682 /* it */, ); name = Copying.rtf; sourceTree = ""; @@ -802,6 +809,10 @@ isa = PBXVariantGroup; children = ( F89837A925B78CFB003BFE25 /* en */, + 556D01312CA293E100C60682 /* fr */, + 556D01322CA293E500C60682 /* de */, + 556D01332CA293E800C60682 /* it */, + 556D01342CA293EB00C60682 /* ja */, ); name = Credits.rtf; sourceTree = ""; @@ -964,6 +975,7 @@ COMBINE_HIDPI_IMAGES = YES; DSTROOT = ""; INFOPLIST_FILE = "VineServer-Info.plist"; + INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.productivity"; INSTALL_PATH = ""; PRODUCT_BUNDLE_IDENTIFIER = "de.uni-mannheim.VineServer"; PRODUCT_NAME = "Vine Server"; @@ -983,6 +995,7 @@ DEPLOYMENT_POSTPROCESSING = YES; DSTROOT = ""; INFOPLIST_FILE = "VineServer-Info.plist"; + INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.productivity"; INSTALL_PATH = ""; PRODUCT_BUNDLE_IDENTIFIER = "de.uni-mannheim.VineServer"; PRODUCT_NAME = "Vine Server"; diff --git a/VNCController.m b/VNCController.m index 19f71d9..f91652b 100644 --- a/VNCController.m +++ b/VNCController.m @@ -37,8 +37,6 @@ #define PasswordProxy @"********" -#define LocalizedString(X) [[NSBundle mainBundle] localizedStringForKey:(X) value:nil table:nil] - @interface NSString (VNCExtensions) @property (NS_NONATOMIC_IOSONLY, readonly, copy) NSString *string; @end @@ -58,7 +56,7 @@ - (void) setStringValue: (NSString *) newString { @interface NSFileManager (VNCExtensions) - (BOOL) directoryExistsAtPath: (NSString *) path; -- (BOOL) createFullDirectoryAtPath:(NSString *)path attributes:(NSDictionary *)attributes; +- (BOOL) createFullDirectoryAtPath:(NSString *)path attributes:(NSDictionary *)attributes; - (BOOL) canWriteToFile: (NSString *) path; @end @@ -216,11 +214,11 @@ - (instancetype) init { - (IBAction) terminateRequest: sender { if (clientList.count && !shutdownSignal) - NSBeginAlertSheet(LocalizedString(@"Quit Vine Server"), - LocalizedString(@"Cancel"), - LocalizedString(@"Quit"), + NSBeginAlertSheet(NSLocalizedString(@"Quit Vine Server", nil), + NSLocalizedString(@"Cancel", nil), + NSLocalizedString(@"Quit", nil), nil, statusWindow, self, @selector(terminateSheetDidEnd:returnCode:contextInfo:), NULL, NULL, - LocalizedString(@"Disconnect %lu clients and quit Vine Server?"), (unsigned long)clientList.count); + NSLocalizedString(@"Disconnect %lu clients and quit Vine Server?", nil), (unsigned long)clientList.count); else [NSApp terminate: self]; } @@ -336,15 +334,15 @@ - (void) updateHostNames: (NSArray *) newHostNames { [commonHostNames removeObject:@"localhost"]; if (commonHostNames.count > 1) { - [hostNamesBox setTitle:LocalizedString(@"Host Names")]; + [hostNamesBox setTitle:NSLocalizedString(@"Host Names", nil)]; hostNamesField.stringValue = [commonHostNames componentsJoinedByString:@"\n"]; } else if (commonHostNames.count == 1) { - [hostNamesBox setTitle:LocalizedString(@"Host Name")]; + [hostNamesBox setTitle:NSLocalizedString(@"Host Name", nil)]; hostNamesField.stringValue = [commonHostNames componentsJoinedByString:@"\n"]; } else { - [hostNamesBox setTitle:LocalizedString(@"Host Name")]; + [hostNamesBox setTitle:NSLocalizedString(@"Host Name", nil)]; hostNamesField.stringValue = @""; } } @@ -389,11 +387,11 @@ - (void) updateIPAddresses: (NSArray *) commonIPAddresses { [ipAddressesView sizeToCells]; if (commonIPAddresses.count > 1) { - [ipAddressesBox setTitle:LocalizedString(@"IP Addresses")]; + [ipAddressesBox setTitle:NSLocalizedString(@"IP Addresses", nil)]; //[ipAddressesField setStringValue:[commonIPAddresses componentsJoinedByString:@"\n"]]; } else { - [ipAddressesBox setTitle:LocalizedString(@"IP Address")]; + [ipAddressesBox setTitle:NSLocalizedString(@"IP Address", nil)]; //[ipAddressesField setStringValue:@""]; } } @@ -511,7 +509,7 @@ - (void)applicationDidBecomeActive:(NSNotification *)aNotification { // the server can't handle this right now so we'll restart. - (void)applicationDidChangeScreenParameters:(NSNotification *)aNotification { [self addStatusMessage:@"\n"]; - [self addStatusMessage:LocalizedString(@"Screen Resolution changed - Server Reinitialized")]; + [self addStatusMessage:NSLocalizedString(@"Screen Resolution changed - Server Reinitialized", nil)]; } - (void) updateUIForConnectionList: (NSArray *) connectionList { @@ -523,23 +521,23 @@ - (void) updateUIForConnectionList: (NSArray *) connectionList { NSUInteger activeConnectionsCount = clientList.count; if (!passwordField.stringValue.length) - [statusMessage appendFormat:@"%@(%@)", LocalizedString(@"Server Running"), - LocalizedString(@"No Authentication")]; + [statusMessage appendFormat:@"%@(%@)", NSLocalizedString(@"Server Running", nil), + NSLocalizedString(@"No Authentication", nil)]; else - [statusMessage appendString: LocalizedString(@"Server Running")]; + [statusMessage appendString: NSLocalizedString(@"Server Running", nil)]; [statusMessage appendString:@"\n"]; if (activeConnectionsCount == 0) - [statusMessage appendString: LocalizedString(@"No Clients Connected")]; + [statusMessage appendString: NSLocalizedString(@"No Clients Connected", nil)]; else if (activeConnectionsCount == 1) { [statusMessage appendFormat: @"%d ", 1]; - [statusMessage appendString: LocalizedString(@"Client Connected: ")]; + [statusMessage appendString: NSLocalizedString(@"Client Connected: ", nil)]; [statusMessage appendString: [clientList[0] valueForKey:@"clientIP"]]; } else if (activeConnectionsCount > 1) { [statusMessage appendFormat: @"%lu ", (unsigned long)activeConnectionsCount]; - [statusMessage appendString: LocalizedString(@"Clients Connected: ")]; + [statusMessage appendString: NSLocalizedString(@"Clients Connected: ", nil)]; [statusMessage appendString: [[clientList valueForKey:@"clientIP"] componentsJoinedByString:@", "]]; } @@ -625,7 +623,7 @@ - (int) scanForOpenPort: (int) tryPort { tryPort++; } - [statusMessageField setStringValue:LocalizedString(@"Unable to find open port 5900-5909")]; + [statusMessageField setStringValue:NSLocalizedString(@"Unable to find open port 5900-5909", nil)]; return 0; } @@ -638,16 +636,16 @@ - (int) runningPortNum { - (void) loadUIForSystemServer { if (systemServerIsConfigured) { startupItemStatusMessageField.textColor = successColor; - [startupItemStatusMessageField setStringValue:LocalizedString(@"Startup Item Configured (Started)")]; + [startupItemStatusMessageField setStringValue:NSLocalizedString(@"Startup Item Configured (Started)", nil)]; } else { startupItemStatusMessageField.textColor = failureColor; - [startupItemStatusMessageField setStringValue:LocalizedString(@"Startup Item Disabled (Stopped)")]; + [startupItemStatusMessageField setStringValue:NSLocalizedString(@"Startup Item Disabled (Stopped)", nil)]; } disableStartupButton.enabled = systemServerIsConfigured; - systemServerMenu.state = (systemServerIsConfigured ? NSOnState : NSOffState); - setStartupButton.title = (systemServerIsConfigured ? LocalizedString(@"Restart System Server") : LocalizedString(@"Start System Server")); + systemServerMenu.state = (systemServerIsConfigured ? NSControlStateValueOn : NSControlStateValueOff); + setStartupButton.title = (systemServerIsConfigured ? NSLocalizedString(@"Restart System Server", nil) : NSLocalizedString(@"Start System Server", nil)); } - (void) loadAuthenticationUI { @@ -885,17 +883,17 @@ - (void) startServer: sender { lastLaunchTime = [[NSDate date] retain]; [[NSNotificationCenter defaultCenter] addObserver: self - selector: NSSelectorFromString(@"serverStopped:") + selector: @selector(serverStopped:) name: NSTaskDidTerminateNotification object: controller]; if (!passwordField.stringValue.length) - [statusMessageField setStringValue:[NSString stringWithFormat:@"%@ - %@", LocalizedString(@"Server Running"), LocalizedString(@"No Authentication")]]; + [statusMessageField setStringValue:[NSString stringWithFormat:@"%@ - %@", NSLocalizedString(@"Server Running", nil), NSLocalizedString(@"No Authentication", nil)]]; else - [statusMessageField setStringValue:LocalizedString(@"Server Running")]; + [statusMessageField setStringValue:NSLocalizedString(@"Server Running", nil)]; //[startServerButton setEnabled:FALSE]; - [startServerButton setTitle:LocalizedString(@"Restart Server")]; - [startServerMenuItem setTitle:LocalizedString(@"Restart Server")]; + [startServerButton setTitle:NSLocalizedString(@"Restart Server", nil)]; + [startServerMenuItem setTitle:NSLocalizedString(@"Restart Server", nil)]; [stopServerButton setEnabled:TRUE]; serverMenuItem.state = NSOnState; // We really don't want people to accidentally stop the server @@ -905,7 +903,7 @@ - (void) startServer: sender { /* Only auto-connect the very first time ??; */ if (automaticReverseHost.length) { - [self addStatusMessage:[NSString stringWithFormat:@"\n%@: %@", LocalizedString(@"Initiating Reverse Connection To Host"), automaticReverseHost]]; + [self addStatusMessage:[NSString stringWithFormat:@"\n%@: %@", NSLocalizedString(@"Initiating Reverse Connection To Host", nil), automaticReverseHost]]; // [automaticReverseHost release]; // automaticReverseHost = nil; // [automaticReversePort release]; @@ -925,7 +923,7 @@ - (void) stopServer: sender { [controller terminate]; } else { - [statusMessageField setStringValue:LocalizedString(@"The server is stopped.")]; + [statusMessageField setStringValue:NSLocalizedString(@"The server is stopped.", nil)]; } } @@ -946,30 +944,30 @@ - (void) serverStopped: (NSNotification *) aNotification { [self updateUIForConnectionList:[NSArray array]]; preferencesMessageTestField.stringValue = @""; - [startServerButton setTitle:LocalizedString(@"Start Server")]; - [startServerMenuItem setTitle:LocalizedString(@"Start Server")]; + [startServerButton setTitle:NSLocalizedString(@"Start Server", nil)]; + [startServerMenuItem setTitle:NSLocalizedString(@"Start Server", nil)]; //[startServerButton setEnabled:TRUE]; [stopServerButton setEnabled:FALSE]; - serverMenuItem.state = NSOffState; + serverMenuItem.state = NSControlStateValueOff; //[stopServerButton setKeyEquivalent:@""]; //[startServerButton setKeyEquivalent:@"\r"]; if (userStopped) - [statusMessageField setStringValue:LocalizedString(@"The server is stopped.")]; + [statusMessageField setStringValue:NSLocalizedString(@"The server is stopped.", nil)]; else if (controller.terminationStatus==250) { - NSMutableString *messageString = [NSMutableString stringWithFormat: LocalizedString(@"Vine Server can't listen on the specified port (%d)."), self.runningPortNum]; + NSMutableString *messageString = [NSMutableString stringWithFormat: NSLocalizedString(@"Vine Server can't listen on the specified port (%d).", nil), self.runningPortNum]; [messageString appendString:@"\n"]; if (systemServerIsConfigured) - [messageString appendString:LocalizedString(@"Probably because the VNC server is already running as a Startup Item.")]; + [messageString appendString:NSLocalizedString(@"Probably because the VNC server is already running as a Startup Item.", nil)]; else - [messageString appendString:LocalizedString(@"Probably because another VNC is already using this port.")]; + [messageString appendString:NSLocalizedString(@"Probably because another VNC is already using this port.", nil)]; [statusMessageField setStringValue:messageString]; } else if (controller.terminationStatus) { - [statusMessageField setStringValue:[NSString stringWithFormat:LocalizedString(@"The server has stopped running. See Log (%d)\n"), controller.terminationStatus]]; + [statusMessageField setStringValue:[NSString stringWithFormat:NSLocalizedString(@"The server has stopped running. See Log (%d)\n", nil), controller.terminationStatus]]; } else - [statusMessageField setStringValue:LocalizedString(@"The server has stopped running")]; + [statusMessageField setStringValue:NSLocalizedString(@"The server has stopped running.", nil)]; if (!userStopped && serverKeepAliveCheckbox.state && @@ -1017,7 +1015,7 @@ - (NSMutableArray *) formCommandLineForSystemServer: (BOOL) isSystemServer { [argv addObject:passwordFile]; } else { - [startupItemStatusMessageField setStringValue:LocalizedString(@"Error: Valid VNC password required to start server")]; + [startupItemStatusMessageField setStringValue:NSLocalizedString(@"Error: Valid VNC password required to start server", nil)]; return nil; } break; @@ -1054,7 +1052,7 @@ - (NSMutableArray *) formCommandLineForSystemServer: (BOOL) isSystemServer { [argv addObject:passwordFile]; } else { - [self addStatusMessage:[NSString stringWithFormat:@"\n%@", LocalizedString(@"Valid VNC password required to start server")]]; + [self addStatusMessage:[NSString stringWithFormat:@"\n%@", NSLocalizedString(@"Valid VNC password required to start server", nil)]]; return nil; } break; @@ -1360,7 +1358,7 @@ - (IBAction) connectHost: sender { NSMutableDictionary *argumentsDict = [NSMutableDictionary dictionaryWithObjectsAndKeys:connectHost.stringValue,@"ConnectHost",connectPort.stringValue,@"ConnectPort",nil]; if (!connectHost.stringValue.length) { - [reverseConnectionMessageField setStringValue:LocalizedString(@"Please specify a Connect Host to establish a connection")]; + [reverseConnectionMessageField setStringValue:NSLocalizedString(@"Please specify a Connect Host to establish a connection", nil)]; return; } if (!connectPort.intValue) { @@ -1381,11 +1379,11 @@ - (IBAction) connectHost: sender { if (kill(controller.processIdentifier, SIGCONT) == 0) { [self addStatusMessage: @"\n"]; - [self addStatusMessage: LocalizedString(@"Connection invitation sent to Connect Host")]; + [self addStatusMessage: NSLocalizedString(@"Connection invitation sent to Connect Host", nil)]; } else { [self addStatusMessage: @"\n"]; - [self addStatusMessage:[NSString stringWithFormat:LocalizedString(@"Error sending invitation: %s"), strerror(errno)]]; + [self addStatusMessage:[NSString stringWithFormat:NSLocalizedString(@"Error sending invitation: %s", nil), strerror(errno)]]; } if (statusWindow.attachedSheet == reverseConnectionWindow) { @@ -1396,12 +1394,12 @@ - (IBAction) connectHost: sender { - (void) checkForRestart { if (controller) { - if (![statusMessageField.textStorage.string hasSuffix: LocalizedString(@"Option Change Requires a Restart")]) { + if (![statusMessageField.textStorage.string hasSuffix: NSLocalizedString(@"Option Change Requires a Restart", nil)]) { [self addStatusMessage: @"\n"]; - [self addStatusMessage: LocalizedString(@"Option Change Requires a Restart")]; + [self addStatusMessage: NSLocalizedString(@"Option Change Requires a Restart", nil)]; } - [preferencesMessageTestField setStringValue:LocalizedString(@"Option Change Requires a Restart")]; + [preferencesMessageTestField setStringValue:NSLocalizedString(@"Option Change Requires a Restart", nil)]; } } @@ -1427,7 +1425,8 @@ - (BOOL) validateMenuItem: (NSMenuItem *) menuItem { } - (IBAction) openFirewall:(id) sender { - [[NSWorkspace sharedWorkspace] openFile: @"/System/Library/PreferencePanes/Security.prefPane"]; + NSURL *aURL = [NSURL fileURLWithPath:@"/System/Library/PreferencePanes/Security.prefPane"]; + [[NSWorkspace sharedWorkspace] openURL: aURL]; } - (IBAction) openLog:(id) sender { @@ -1435,31 +1434,31 @@ - (IBAction) openLog:(id) sender { } - (IBAction) openGPL:(id) sender { - NSString *openPath = [[NSBundle mainBundle] pathForResource:@"Copying" ofType:@"rtf"]; + NSURL *openPath = [[NSBundle mainBundle] URLForResource:@"Copying" withExtension:@"rtf"]; - [[NSWorkspace sharedWorkspace] openFile:openPath]; + [[NSWorkspace sharedWorkspace] openURL:openPath]; } - (IBAction) openReleaseNotes:(id) sender { - NSString *openPath = [[NSBundle mainBundle] pathForResource:@"Vine Server Release Notes" ofType:@"rtf"]; + NSURL *openPath = [[NSBundle mainBundle] URLForResource:@"Vine Server Release Notes" withExtension:@"rtf"]; - [[NSWorkspace sharedWorkspace] openFile:openPath]; + [[NSWorkspace sharedWorkspace] openURL:openPath]; } - (IBAction) openFile:(id) sender { - NSString *openPath = [[NSBundle mainBundle] pathForResource:[sender title] ofType:@"rtf"]; + NSURL *openPath = [[NSBundle mainBundle] URLForResource:[sender title] withExtension:@"rtf"]; if (!openPath) { - openPath = [[NSBundle mainBundle] pathForResource:[sender title] ofType:@"pdf"]; + openPath = [[NSBundle mainBundle] URLForResource:[sender title] withExtension:@"pdf"]; } if (!openPath) { - openPath = [[NSBundle mainBundle] pathForResource:[sender title] ofType:@"txt"]; + openPath = [[NSBundle mainBundle] URLForResource:[sender title] withExtension:@"txt"]; } if (!openPath) { - openPath = [[NSBundle mainBundle] pathForResource:[sender title] ofType:nil]; + openPath = [[NSBundle mainBundle] URLForResource:[sender title] withExtension:nil]; } - [[NSWorkspace sharedWorkspace] openFile:openPath]; + [[NSWorkspace sharedWorkspace] openURL:openPath]; } - (BOOL) installLaunchd { @@ -1479,7 +1478,7 @@ - (BOOL) installLaunchd { success &= [myAuthorization executeCommand:@"/usr/sbin/chown" withArgs:@[@"-R", @"root:wheel", launchdResources]]; if (!success) { - [startupItemStatusMessageField setStringValue:LocalizedString(@"Error: Unable to setup VineServer folder")]; + [startupItemStatusMessageField setStringValue:NSLocalizedString(@"Error: Unable to setup VineServer folder", nil)]; success = FALSE; } } @@ -1489,7 +1488,7 @@ - (BOOL) installLaunchd { [vncauth writeToFile:@"/tmp/.vinevncauth" atomically:YES]; if (![myAuthorization executeCommand:@"/bin/mv" withArgs:@[@"-f", @"/tmp/.vinevncauth", passwordFile]]) { - [startupItemStatusMessageField setStringValue:LocalizedString(@"Error: Unable To Setup Password File")]; + [startupItemStatusMessageField setStringValue:NSLocalizedString(@"Error: Unable To Setup Password File", nil)]; success = FALSE; } } @@ -1509,7 +1508,7 @@ - (BOOL) installLaunchd { [copyArgsArray addObject:launchdResources]; if (![myAuthorization executeCommand:@"/bin/cp" withArgs:copyArgsArray]) { - [startupItemStatusMessageField setStringValue:LocalizedString(@"Error: Unable to copy OSXvnc-server executable")]; + [startupItemStatusMessageField setStringValue:NSLocalizedString(@"Error: Unable to copy OSXvnc-server executable", nil)]; return FALSE; } @@ -1569,7 +1568,7 @@ - (BOOL) installLaunchd { withArgs:@[@"load", @"-S", @"Aqua", launchdPath]]; if (!success) { - [startupItemStatusMessageField setStringValue:LocalizedString(@"Error: Unable To Setup Vine Server using launchd")]; + [startupItemStatusMessageField setStringValue:NSLocalizedString(@"Error: Unable To Setup Vine Server using launchd", nil)]; } } @@ -1581,7 +1580,7 @@ - (void) installAsService { myAuthorization = [[NSAuthorization alloc] init]; if (!myAuthorization) { - [startupItemStatusMessageField setStringValue:LocalizedString(@"Error: No Authorization")]; + [startupItemStatusMessageField setStringValue:NSLocalizedString(@"Error: No Authorization", nil)]; return; } @@ -1598,12 +1597,12 @@ - (void) installAsService { - (IBAction) installAsService: sender { // No password, so double check if (!passwordField.stringValue.length) { - NSBeginAlertSheet(LocalizedString(@"System Server"), - LocalizedString(@"Cancel"), - LocalizedString(@"Start Server"), + NSBeginAlertSheet(NSLocalizedString(@"System Server", nil), + NSLocalizedString(@"Cancel", nil), + NSLocalizedString(@"Start Server", nil), nil, systemServerWindow, self, @selector(serviceSheetDidEnd:returnCode:contextInfo:), NULL, NULL, @"%@", - LocalizedString(@"No password has been specified for the System Server. The System Server will automatic launch every time your machine is restarted. Are you sure that you want to install a System Server with no password")); + NSLocalizedString(@"No password has been specified for the System Server. The System Server will automatically launch every time your machine is restarted. Are you sure that you want to install a System Server with no password", nil)); } else { [self installAsService]; @@ -1626,7 +1625,7 @@ - (IBAction) removeService: sender { myAuthorization = [[NSAuthorization alloc] init]; if (!myAuthorization) { - [startupItemStatusMessageField setStringValue:LocalizedString(@"Error: No Authorization")]; + [startupItemStatusMessageField setStringValue:NSLocalizedString(@"Error: No Authorization", nil)]; return; } @@ -1649,7 +1648,7 @@ - (IBAction) removeService: sender { [self loadUIForSystemServer]; } else { - [startupItemStatusMessageField setStringValue:LocalizedString(@"Error: Unabled to remove startup item")]; + [startupItemStatusMessageField setStringValue:NSLocalizedString(@"Error: Unabled to remove startup item", nil)]; } if (sender != self) { diff --git a/German.lproj/Credits.rtf b/de.lproj/Credits.rtf similarity index 100% rename from German.lproj/Credits.rtf rename to de.lproj/Credits.rtf diff --git a/de.lproj/Localizable.strings b/de.lproj/Localizable.strings index 3e5ced1..6b9af34 100644 --- a/de.lproj/Localizable.strings +++ b/de.lproj/Localizable.strings @@ -1,4 +1,3 @@ -{ "Host Name" = "Host-Name"; "Host Names" = "Host-Namen"; "IP Address" = "IP-Adresse"; @@ -24,4 +23,3 @@ "Error: Unabled to remove startup item" = "Fehler: Kann das Startup-Item nicht entfernen"; "Please specify a Connect Host to establish a connection" = "Bitte einen Zielhost angeben, um eine Verbindung aufbauen zu können"; "Connection invitation sent to Connect Host" = "Verbindungsanforderung an den Zielhost gesendet"; -} diff --git a/en.lproj/Localizable.strings b/en.lproj/Localizable.strings index 7ee89d3..2b5afad 100644 --- a/en.lproj/Localizable.strings +++ b/en.lproj/Localizable.strings @@ -1,4 +1,3 @@ -{ "The server is stopped."="The server is not running."; "No Authentication"="no password protection"; "Startup Item Configured (Started)"="The System Server is running"; @@ -8,4 +7,4 @@ "Probably because another VNC is already using this port." = "(There is already a VNC server running on this port)"; "Option Change Requires a Restart" = "Restart Server to Affect Changes"; "No password has been specified for the System Server. The System Server will automatically launch every time your machine is restarted. Are you sure that you want to install a System Server with no password"="This server is not password-protected, and will start automatically whenever your computer is turned on. Do you want to proceed with no password protection?"; -} +"Error: Unabled to remove startup item" = "Error: Unable to remove startup item"; diff --git a/French.lproj/Credits.rtf b/fr.lproj/Credits.rtf similarity index 100% rename from French.lproj/Credits.rtf rename to fr.lproj/Credits.rtf diff --git a/fr.lproj/Localizable.strings b/fr.lproj/Localizable.strings index c7bb3fa..8fa0bc1 100644 --- a/fr.lproj/Localizable.strings +++ b/fr.lproj/Localizable.strings @@ -1,4 +1,3 @@ -{ "Host Name" = "Nom du poste"; "Host Names" = "Noms du poste"; "IP Address" = "Address IP"; @@ -24,5 +23,3 @@ "Error: Unabled to remove startup item" = "Erreur: Impossible de supprimer le service de démarrage"; "Please specify a Connect Host to establish a connection" = "Veuillez spécifier un hôte cible vers lequel établir une connexion"; "Connection invitation sent to Connect Host" = "Invitation de connexion envoyée à l'hôte cible"; -} - diff --git a/Italian.lproj/Copying.rtf b/it.lproj/Copying.rtf similarity index 100% rename from Italian.lproj/Copying.rtf rename to it.lproj/Copying.rtf diff --git a/Italian.lproj/Credits.rtf b/it.lproj/Credits.rtf similarity index 100% rename from Italian.lproj/Credits.rtf rename to it.lproj/Credits.rtf diff --git a/it.lproj/Localizable.strings b/it.lproj/Localizable.strings index 5da7511..01369e2 100644 --- a/it.lproj/Localizable.strings +++ b/it.lproj/Localizable.strings @@ -1,4 +1,3 @@ -{ "Host Name" = "Nome dell'Host"; "Host Names" = "Nomi degli Host"; "IP Address" = "Indirizzo IP"; @@ -24,5 +23,3 @@ "Error: Unabled to remove startup item" = "Errore: Impossibile rimuovere l'elemento di avvio"; "Please specify a Connect Host to establish a connection" = "Per favore specifica un'host di connessione per stabilire un collegamento"; "Connection invitation sent to Connect Host" = "Invito alla connessione inviato all'host"; -} - diff --git a/Japanese.lproj/Credits.rtf b/ja.lproj/Credits.rtf similarity index 100% rename from Japanese.lproj/Credits.rtf rename to ja.lproj/Credits.rtf diff --git a/ja.lproj/Localizable.strings b/ja.lproj/Localizable.strings index a1ad228..db85cc5 100644 --- a/ja.lproj/Localizable.strings +++ b/ja.lproj/Localizable.strings @@ -1,4 +1,3 @@ -{ "Host Name" = "ホスト名"; "Host Names" = "ホスト名"; "IP Address" = "IP アドレス"; @@ -24,5 +23,3 @@ //"Error: Unabled to remove startup item" = "エラー：起動項目を削除できない"; "Please specify a Connect Host to establish a connection" = "「接続ホスト」を指定して下さい。"; "Connection invitation sent to Connect Host" = "接続依頼を「接続ホスト」へ送信しました。"; -} -