From ca38bbf30415a4ec23fd801f1b917b88866df8fa Mon Sep 17 00:00:00 2001 From: Stefan Becker Date: Sat, 16 Nov 2013 02:17:11 +0200 Subject: [PATCH] adium: add "don't publish calendar" to account UI Checkbox which controls the libpurple "dont-publish" account option. (cherry picked from commit 3b50332e8dfb2742b3b13a0e95c92810fcbc2fce) --- src/adium/ESPurpleSIPEAccount.h | 1 + src/adium/ESPurpleSIPEAccount.m | 3 + src/adium/ESSIPEAccountViewController.h | 1 + src/adium/ESSIPEAccountViewController.m | 5 + src/adium/English.lproj/ESSIPEAccountView.xib | 2051 ++++--------------------- src/adium/PurpleDefaultsSIPE.plist | 2 + 6 files changed, 322 insertions(+), 1741 deletions(-) rewrite src/adium/English.lproj/ESSIPEAccountView.xib (99%) diff --git a/src/adium/ESPurpleSIPEAccount.h b/src/adium/ESPurpleSIPEAccount.h index aaaf3055..6c9c2700 100644 --- a/src/adium/ESPurpleSIPEAccount.h +++ b/src/adium/ESPurpleSIPEAccount.h @@ -20,6 +20,7 @@ #define KEY_SIPE_GROUP_CHAT_PROXY @"SIPE:Group Chat Proxy" #define KEY_SIPE_USER_AGENT @"SIPE:User Agent" #define KEY_SIPE_SINGLE_SIGN_ON @"SIPE:Single Sign On" +#define KEY_SIPE_DONT_PUBLISH @"SIPE:Dont Publish" #define KEY_SIPE_AUTH_SCHEME @"SIPE:Authentication Scheme" #define KEY_SIPE_AUTODISCOVER @"SIPE:Autodiscover" diff --git a/src/adium/ESPurpleSIPEAccount.m b/src/adium/ESPurpleSIPEAccount.m index c3615fcd..478b84c5 100644 --- a/src/adium/ESPurpleSIPEAccount.m +++ b/src/adium/ESPurpleSIPEAccount.m @@ -130,6 +130,9 @@ extern void AILog(NSString *fmt, ...); [self setPasswordTemporarily:@"placeholder"]; } + BOOL dont_publish = [[self preferenceForKey:KEY_SIPE_DONT_PUBLISH group:GROUP_ACCOUNT_STATUS] boolValue]; + purple_account_set_bool(account, "dont-publish", dont_publish); + // Connection preferences id connType = [self preferenceForKey:KEY_SIPE_CONNECTION_TYPE group:GROUP_ACCOUNT_STATUS]; if([connType isKindOfClass:[NSNumber class]]) diff --git a/src/adium/ESSIPEAccountViewController.h b/src/adium/ESSIPEAccountViewController.h index f731e6c2..750fd215 100644 --- a/src/adium/ESSIPEAccountViewController.h +++ b/src/adium/ESSIPEAccountViewController.h @@ -24,6 +24,7 @@ IBOutlet NSButton *checkBox_autoDiscover; IBOutlet NSButton *checkBox_singleSignOn; + IBOutlet NSButton *checkbox_dontPublish; IBOutlet NSPopUpButton *popup_connectionType; IBOutlet NSPopUpButton *popup_authenticationScheme; diff --git a/src/adium/ESSIPEAccountViewController.m b/src/adium/ESSIPEAccountViewController.m index b9ce0823..3d5cf0f2 100644 --- a/src/adium/ESSIPEAccountViewController.m +++ b/src/adium/ESSIPEAccountViewController.m @@ -34,6 +34,8 @@ [checkBox_singleSignOn setState:[[account preferenceForKey:KEY_SIPE_SINGLE_SIGN_ON group:GROUP_ACCOUNT_STATUS] boolValue]]; + [checkbox_dontPublish setState:[[account preferenceForKey:KEY_SIPE_DONT_PUBLISH group:GROUP_ACCOUNT_STATUS] boolValue]]; + NSString *userAgent = [account preferenceForKey:KEY_SIPE_USER_AGENT group:GROUP_ACCOUNT_STATUS]; [textField_userAgent setStringValue:(userAgent ? userAgent : @"")]; @@ -86,6 +88,9 @@ [account setPreference:[NSNumber numberWithBool:[checkBox_singleSignOn state]] forKey:KEY_SIPE_SINGLE_SIGN_ON group:GROUP_ACCOUNT_STATUS]; + [account setPreference:[NSNumber numberWithBool:[checkbox_dontPublish state]] + forKey:KEY_SIPE_DONT_PUBLISH group:GROUP_ACCOUNT_STATUS]; + [account setPreference: ([[textField_userAgent stringValue] length] ? [textField_userAgent stringValue] : nil) forKey:KEY_SIPE_USER_AGENT group:GROUP_ACCOUNT_STATUS]; diff --git a/src/adium/English.lproj/ESSIPEAccountView.xib b/src/adium/English.lproj/ESSIPEAccountView.xib dissimilarity index 99% index 7b536e1d..f2499e33 100644 --- a/src/adium/English.lproj/ESSIPEAccountView.xib +++ b/src/adium/English.lproj/ESSIPEAccountView.xib @@ -1,1741 +1,310 @@ - - - - 1070 - 11G63b - 2844 - 1138.51 - 569.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 2844 - - - NSBox - NSButton - NSButtonCell - NSCustomObject - NSCustomView - NSMenu - NSMenuItem - NSPopUpButton - NSPopUpButtonCell - NSTextField - NSTextFieldCell - - - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - - ESSIPEAccountViewController - - - FirstResponder - - - NSApplication - - - - 268 - - - - 268 - {{184, 182}, {156, 22}} - - - - _NS:9 - YES - - -1804599231 - 272630784 - - - LucidaGrande - 13 - 1044 - - _NS:9 - - YES - - 6 - System - textBackgroundColor - - 3 - MQA - - - - 6 - System - textColor - - 3 - MAA - - - - - - - 268 - {{17, 185}, {120, 17}} - - - - _NS:1535 - YES - - 68157504 - 272630784 - Group Chat Proxy: - - _NS:1535 - - - 6 - System - controlColor - - 3 - MC42NjY2NjY2NjY3AA - - - - 6 - System - controlTextColor - - - - - - - 12 - - - - 274 - - - - 268 - {{6, 113}, {125, 17}} - - - - _NS:1535 - YES - - 68157504 - 272630784 - Email services URL: - - _NS:1535 - - - - - - - - 268 - {{6, 81}, {96, 17}} - - - - _NS:1535 - YES - - 68157504 - 272630784 - Email address: - - _NS:1535 - - - - - - - - 268 - {{6, 49}, {78, 17}} - - - - _NS:1535 - YES - - 68157504 - 272630784 - Email login: - - _NS:1535 - - - - - - - - 268 - {{6, 17}, {107, 17}} - - - - _NS:1535 - YES - - 68157504 - 272630784 - Email password: - - _NS:1535 - - - - - - - - 268 - {{173, 110}, {156, 22}} - - - - _NS:9 - YES - - -1804599231 - 272630784 - - - _NS:9 - - YES - - - - - - - 268 - {{173, 78}, {156, 22}} - - - - _NS:9 - YES - - -1804599231 - 272630784 - - - _NS:9 - - YES - - - - - - - 268 - {{173, 46}, {156, 22}} - - - - _NS:9 - YES - - -1804599231 - 272630784 - - - _NS:9 - - YES - - - - - - - 268 - {{173, 14}, {156, 22}} - - - - _NS:9 - YES - - -1804599231 - 272630784 - - - _NS:9 - - YES - - - - - - {{1, 1}, {347, 142}} - - - - _NS:11 - - - {{7, 16}, {349, 158}} - - - - _NS:9 - {0, 0} - - 67108864 - 0 - Email Settings - - LucidaGrande - 11 - 3100 - - - - 3 - MCAwLjgwMDAwMDAxMTkAA - - - - 1 - 0 - 2 - NO - - - - 12 - - - - 274 - - - - 12 - {{8, 135}, {81, 17}} - - - - _NS:1535 - YES - - 68157504 - 272630784 - Server[:Port] - - _NS:1535 - - - - - - - - 268 - {{175, 132}, {156, 22}} - - - - _NS:9 - YES - - -1804599231 - 272630784 - - - _NS:9 - - YES - - - - - - - 268 - {{8, 106}, {111, 17}} - - - - _NS:1535 - YES - - 68157504 - 272630784 - Connection type: - - _NS:1535 - - - - - - - - 268 - {{8, 44}, {78, 17}} - - - - _NS:1535 - YES - - 68157504 - 272630784 - User Agent: - - _NS:1535 - - - - - - - - 268 - {{8, 76}, {153, 17}} - - - - _NS:1535 - YES - - 68157504 - 272630784 - Authentication scheme: - - _NS:1535 - - - - - - - - 268 - {{172, 100}, {162, 26}} - - - - _NS:9 - YES - - -2076049856 - 2048 - - _NS:9 - - 109199360 - 129 - - - 400 - 75 - - - Auto - - 1048576 - 2147483647 - 1 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - _popUpItemAction: - - - YES - - OtherViews - - - - - SSL/TLS - - 1048576 - 2147483647 - - - _popUpItemAction: - 1 - - - - - TCP - - 1048576 - 2147483647 - - - _popUpItemAction: - 2 - - - - - - 1 - YES - YES - 2 - - - - - 268 - {{175, 41}, {156, 22}} - - - - _NS:9 - YES - - -1804599231 - 272630784 - - - _NS:9 - - YES - - - - - - - 268 - {{172, 70}, {162, 26}} - - - - _NS:9 - YES - - -2076049856 - 2048 - - _NS:9 - - 112345088 - 129 - - - - 400 - 75 - - - NTLM - - 1048576 - 2147483647 - 1 - - - _popUpItemAction: - - - YES - - OtherViews - - - - - Kerberos - - 1048576 - 2147483647 - - - _popUpItemAction: - 1 - - - - - TLS-DSK - - 1048576 - 2147483647 - - - _popUpItemAction: - 2 - - - - - - -1 - 1 - YES - YES - 2 - - - - - 268 - {{9, 12}, {144, 18}} - - - - _NS:9 - YES - - -2080374784 - 268435456 - Use Single Sign-On - - _NS:9 - - 1211912448 - 2 - - NSImage - NSSwitch - - - NSSwitch - - - - 200 - 25 - - - - {{1, 1}, {349, 164}} - - - - _NS:11 - - - {{5, 214}, {351, 180}} - - - - _NS:9 - {0, 0} - - 67108864 - 0 - Connection Settings - - - - 3 - MCAwLjgwMDAwMDAxMTkAA - - - - 1 - 0 - 2 - NO - - - {360, 414} - - - - NSView - - - - 268 - - - - 264 - {{123, 61}, {213, 22}} - - - - YES - - -1804468671 - 4195328 - - - DOMAIN\username - - YES - - - - - - - 268 - {{123, 31}, {213, 22}} - - - - _NS:9 - YES - - -1804599231 - 272630784 - - - _NS:9 - - YES - - - - - - - 268 - {{123, 91}, {213, 22}} - - - - _NS:9 - YES - - -1804599231 - 272630784 - - - user@company.com - _NS:9 - - YES - - - - - - - 268 - {{12, 34}, {68, 17}} - - - - _NS:1535 - YES - - 68157504 - 272630784 - Password: - - _NS:1535 - - - - - - - - 268 - {{12, 64}, {103, 17}} - - - - _NS:1535 - YES - - 68157504 - 272630784 - Windows Login: - - _NS:1535 - - - - - - - - 268 - {{12, 94}, {71, 17}} - - - - _NS:1535 - YES - - 68157504 - 272630784 - Username: - - _NS:1535 - - - - - - - {360, 132} - - - - _NS:9 - NSView - - - - - - - view_setup - - - - 215 - - - - view_options - - - - 216 - - - - textField_password - - - - 218 - - - - textField_groupchatUser - - - - 232 - - - - textField_accountUID - - - - 252 - - - - textField_windowsLogin - - - - 259 - - - - textField_userAgent - - - - 227 - - - - checkBox_singleSignOn - - - - 235 - - - - textField_server - - - - 260 - - - - popup_authenticationScheme - - - - 234 - - - - popup_connectionType - - - - 233 - - - - textField_email - - - - 229 - - - - textField_emailPassword - - - - 231 - - - - textField_emailURL - - - - 228 - - - - textField_emailLogin - - - - 230 - - - - - - 0 - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 1 - - - - - - - - - Options - - - 104 - - - - - - - - 105 - - - - - 136 - - - - - - - - 137 - - - - - 157 - - - - - - - - - - - Setup - - - 163 - - - - - - - - 164 - - - - - 160 - - - - - - - - 167 - - - - - 158 - - - - - - - - 169 - - - - - 161 - - - - - - - - 166 - - - - - 253 - - - - - - windowslogin - - - 256 - - - - - 257 - - - - - - - - 258 - - - - - 272 - - - - - - - - - - - - - - - - 4 - - - - - - - - 31 - - - - - - - - 10 - - - - - - - - 16 - - - - - - - - 25 - - - - - - - - 39 - - - - - - - - 49 - - - - - - - - 65 - - - - - - - - 225 - - - - - - - - 226 - - - - - 66 - - - - - - - - 67 - - - - - - - - - - 68 - - - - - 69 - - - - - 70 - - - - - 50 - - - - - 40 - - - - - - - - 41 - - - - - - - - - - 42 - - - - - 43 - - - - - 44 - - - - - 26 - - - - - 17 - - - - - 11 - - - - - 32 - - - - - 5 - - - - - 273 - - - - - - - - - - - - - - - 130 - - - - - - - - 124 - - - - - - - - 118 - - - - - - - - 111 - - - - - - - - 100 - - - - - - - - 96 - - - - - - - - 82 - - - - - - - - 76 - - - - - - - - 77 - - - - - 83 - - - - - 97 - - - - - 101 - - - - - 112 - - - - - 119 - - - - - 125 - - - - - 131 - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - NSSecureTextField - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - NSSecureTextFieldCell - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - 349 - - - - - AIAccountViewController - NSObject - - changedPreference: - id - - - changedPreference: - - changedPreference: - id - - - - NSButton - NSButton - NSTextField - NSTextField - NSTextField - NSTextField - NSTextField - NSTextField - NSPopUpButton - NSProgressIndicator - NSTextField - NSTextField - NSTextField - NSTextField - NSTextField - NSTextField - NSTextField - NSTabView - NSView - NSView - NSView - NSView - - - - checkBox_checkMail - NSButton - - - checkBox_sendTyping - NSButton - - - label_alias - NSTextField - - - label_encryption - NSTextField - - - label_password - NSTextField - - - label_port - NSTextField - - - label_server - NSTextField - - - label_typing - NSTextField - - - popUp_encryption - NSPopUpButton - - - progressIndicator_registering - NSProgressIndicator - - - textField_accountUID - NSTextField - - - textField_accountUIDLabel - NSTextField - - - textField_alias - NSTextField - - - textField_connectHost - NSTextField - - - textField_connectPort - NSTextField - - - textField_password - NSTextField - - - textField_registering - NSTextField - - - view_auxiliaryTabView - NSTabView - - - view_options - NSView - - - view_privacy - NSView - - - view_profile - NSView - - - view_setup - NSView - - - - IBProjectSource - ./Classes/AIAccountViewController.h - - - - ESSIPEAccountViewController - PurpleAccountViewController - - NSButton - NSButton - NSPopUpButton - NSPopUpButton - NSTextField - NSTextField - NSTextField - NSTextField - NSTextField - NSTextField - NSTextField - NSTextField - - - - checkBox_autoDiscover - NSButton - - - checkBox_singleSignOn - NSButton - - - popup_authenticationScheme - NSPopUpButton - - - popup_connectionType - NSPopUpButton - - - textField_email - NSTextField - - - textField_emailLogin - NSTextField - - - textField_emailPassword - NSTextField - - - textField_emailURL - NSTextField - - - textField_groupchatUser - NSTextField - - - textField_server - NSTextField - - - textField_userAgent - NSTextField - - - textField_windowsLogin - NSTextField - - - - IBProjectSource - ./Classes/ESSIPEAccountViewController.h - - - - NSObject - - selectServiceType: - id - - - selectServiceType: - - selectServiceType: - id - - - - IBProjectSource - ./Classes/NSObject.h - - - - PurpleAccountViewController - AIAccountViewController - - NSButton - NSButton - - - - checkBox_broadcastMusic - NSButton - - - checkBox_displayCustomEmoticons - NSButton - - - - IBProjectSource - ./Classes/PurpleAccountViewController.h - - - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 - - - YES - 3 - - {11, 11} - {10, 3} - {15, 15} - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/adium/PurpleDefaultsSIPE.plist b/src/adium/PurpleDefaultsSIPE.plist index 47beeeb1..bd47dc41 100644 --- a/src/adium/PurpleDefaultsSIPE.plist +++ b/src/adium/PurpleDefaultsSIPE.plist @@ -4,6 +4,8 @@ SIPE:Single Sign On + SIPE:Dont Publish + SIPE:Connection Type auto Connect Host -- 2.11.4.GIT