From a2d2dfeb32ffa5312c6470556f327484a7de83a7 Mon Sep 17 00:00:00 2001 From: Michael Lamb Date: Thu, 7 Mar 2013 17:17:05 -0800 Subject: [PATCH] adium: General fixes in preparation for release - Fixed typo in defaultServiceIconOfType - Enable purple debugging, if Adium is in debug - Use AILog to send debug output - Fixed backwards compatibility issue with connection type preference - Added C declarations for external symbols - Added preference groupings in ESSIPEAccountView.xib to visually separate --- src/adium/ESPurpleSIPEAccount.m | 14 +- src/adium/ESSIPEAccountViewController.h | 3 +- src/adium/ESSIPELibpurpleServicePlugin.m | 22 +- src/adium/ESSIPEService.m | 2 +- src/adium/English.lproj/ESSIPEAccountView.xib | 1580 +++++++++++--------- .../SIPEAdiumPlugin.xcodeproj/project.pbxproj | 12 + 6 files changed, 895 insertions(+), 738 deletions(-) diff --git a/src/adium/ESPurpleSIPEAccount.m b/src/adium/ESPurpleSIPEAccount.m index 850133f4..923ab8b1 100644 --- a/src/adium/ESPurpleSIPEAccount.m +++ b/src/adium/ESPurpleSIPEAccount.m @@ -17,6 +17,9 @@ #include "sipe-core.h" #include "sipe-backend.h" +// C Declarations +extern void AILog(NSString *fmt, ...); + @implementation ESPurpleSIPEAccount - (const char*)protocolPlugin @@ -24,7 +27,6 @@ return "prpl-sipe"; } - - (NSString *)hostForPurple { NSString *server = [self preferenceForKey:KEY_SIPE_CONNECT_HOST group:GROUP_ACCOUNT_STATUS]; @@ -44,7 +46,7 @@ [super configurePurpleAccount]; // Account preferences - NSLog(@"Configuring account: %s\n", self.purpleAccountName); + AILog(@"Configuring account: %s\n", self.purpleAccountName); // !!! ------ HACK/Kludge alert! ------ /* @@ -97,7 +99,13 @@ } // Connection preferences - NSString *connType = [self preferenceForKey:KEY_SIPE_CONNECTION_TYPE group:GROUP_ACCOUNT_STATUS]; + id connType = [self preferenceForKey:KEY_SIPE_CONNECTION_TYPE group:GROUP_ACCOUNT_STATUS]; + if([connType isKindOfClass:[NSNumber class]]) + { + // For backwards compatibility, we pick from an array if the preference is a NSNumber + NSMutableArray *myArray = [[NSMutableArray alloc] initWithObjects:@"auto", @"tls", @"tcp", nil]; + connType = (NSString *)[myArray objectAtIndex:[self preferenceForKey:KEY_SIPE_CONNECTION_TYPE group:GROUP_ACCOUNT_STATUS]]; + } purple_account_set_string(account, "transport", [connType UTF8String]); NSString *authScheme = [self preferenceForKey:KEY_SIPE_AUTH_SCHEME group:GROUP_ACCOUNT_STATUS]; diff --git a/src/adium/ESSIPEAccountViewController.h b/src/adium/ESSIPEAccountViewController.h index db1a1725..f731e6c2 100644 --- a/src/adium/ESSIPEAccountViewController.h +++ b/src/adium/ESSIPEAccountViewController.h @@ -14,9 +14,7 @@ @interface ESSIPEAccountViewController : PurpleAccountViewController { IBOutlet NSTextField *textField_windowsLogin; - IBOutlet NSTextField *textField_server; - IBOutlet NSTextField *textField_userAgent; IBOutlet NSTextField *textField_emailURL; IBOutlet NSTextField *textField_email; @@ -24,6 +22,7 @@ IBOutlet NSTextField *textField_emailPassword; IBOutlet NSTextField *textField_groupchatUser; + IBOutlet NSButton *checkBox_autoDiscover; IBOutlet NSButton *checkBox_singleSignOn; IBOutlet NSPopUpButton *popup_connectionType; diff --git a/src/adium/ESSIPELibpurpleServicePlugin.m b/src/adium/ESSIPELibpurpleServicePlugin.m index 8ae0afdc..6ef70842 100644 --- a/src/adium/ESSIPELibpurpleServicePlugin.m +++ b/src/adium/ESSIPELibpurpleServicePlugin.m @@ -7,13 +7,14 @@ // Copyright 2013 Michael Lamb/Harris Kauffman. All rights reserved. // -//#import +#import #import "ESSIPEService.h" #import "ESSIPELibpurpleServicePlugin.h" -//#include "sipe-core.h" - +// C declarations +extern BOOL AIDebugLoggingIsEnabled(); extern void purple_init_sipe_plugin(void); +extern void purple_debug_set_enabled(gboolean); @implementation ESSIPELibpurpleServicePlugin @@ -24,8 +25,12 @@ extern void purple_init_sipe_plugin(void); - (void)loadLibpurplePlugin { purple_init_sipe_plugin(); - // TODO: Check that Adium is in debug mode rather than blindly enabling - purple_debug_set_enabled(true); + + if(AIDebugLoggingIsEnabled()) { + purple_debug_set_enabled(true); + purple_debug_set_verbose(true); + } + } - (void)installPlugin @@ -48,12 +53,12 @@ extern void purple_init_sipe_plugin(void); } - (NSString*) pluginAuthor { - return @"Harris Kauffman/Michael Lamb"; + return @"Harris Kauffman, Michael Lamb"; } - (NSString*) pluginVersion { - // TODO: Get this dynamically from the sipe-core release version - return @"1.13.3"; + // TODO: Get this dynamically from sipe-core + return @"1.15.0"; } - (NSString*) pluginDescription { @@ -61,6 +66,7 @@ extern void purple_init_sipe_plugin(void); } - (NSString*) pluginWebsite { + // TODO: Get this dynamically from sipe-core return @"sipe.sf.net"; } diff --git a/src/adium/ESSIPEService.m b/src/adium/ESSIPEService.m index 2baf449c..c4d0a661 100644 --- a/src/adium/ESSIPEService.m +++ b/src/adium/ESSIPEService.m @@ -71,7 +71,7 @@ - (NSImage *)defaultServiceIconOfType:(AIServiceIconType)iconType { NSImage *baseImage = [NSImage imageNamed:@"sipe" forClass:[self class]]; - if ((iconType == AIServiceIconSmall) || (iconType == AIServiceIconList)) { { + if ((iconType == AIServiceIconSmall) || (iconType == AIServiceIconList)) { [baseImage setSize:NSMakeSize(16, 16)]; } diff --git a/src/adium/English.lproj/ESSIPEAccountView.xib b/src/adium/English.lproj/ESSIPEAccountView.xib index 95750508..7b536e1d 100644 --- a/src/adium/English.lproj/ESSIPEAccountView.xib +++ b/src/adium/English.lproj/ESSIPEAccountView.xib @@ -1,7 +1,7 @@ - 1060 + 1070 11G63b 2844 1138.51 @@ -11,6 +11,7 @@ 2844 + NSBox NSButton NSButtonCell NSCustomObject @@ -43,53 +44,24 @@ 268 - - - 268 - {{18, 188}, {144, 18}} - - - _NS:9 - YES - - -2080374784 - 268435456 - Use Single Sign-On - - LucidaGrande - 13 - 1044 - - _NS:9 - - 1211912448 - 2 - - NSImage - NSSwitch - - - NSSwitch - - - - 200 - 25 - - 268 - {{184, 20}, {156, 22}} + {{184, 182}, {156, 22}} - + + _NS:9 YES -1804599231 272630784 - + + LucidaGrande + 13 + 1044 + _NS:9 YES @@ -113,91 +85,12 @@ - - - 268 - {{184, 52}, {156, 22}} - - - _NS:9 - YES - - -1804599231 - 272630784 - - - _NS:9 - - YES - - - - - - - 268 - {{184, 84}, {156, 22}} - - - _NS:9 - YES - - -1804599231 - 272630784 - - - _NS:9 - - YES - - - - - - - 268 - {{184, 116}, {156, 22}} - - - _NS:9 - YES - - -1804599231 - 272630784 - - - _NS:9 - - YES - - - - - - - 268 - {{184, 148}, {156, 22}} - - - _NS:9 - YES - - -1804599231 - 272630784 - - - _NS:9 - - YES - - - - 268 - {{17, 23}, {120, 17}} + {{17, 185}, {120, 17}} + _NS:1535 YES @@ -225,360 +118,572 @@ - - - 268 - {{17, 55}, {107, 17}} - - - _NS:1535 - YES - - 68157504 - 272630784 - Email password: - - _NS:1535 - - - - - - - - 268 - {{17, 87}, {78, 17}} - - - _NS:1535 - YES - - 68157504 - 272630784 - Email login: - - _NS:1535 - - - - - - - - 268 - {{17, 119}, {96, 17}} - - - _NS:1535 - YES - - 68157504 - 272630784 - Email address: - - _NS:1535 - - - - - - - - 268 - {{17, 151}, {125, 17}} - - - _NS:1535 - YES - - 68157504 - 272630784 - Email services URL: - - _NS:1535 - - - - - - + - 268 - {{181, 215}, {162, 26}} - - - _NS:9 - YES - - -2076049856 - 2048 - - _NS:9 - - 109199360 - 129 - - - 400 - 75 - - - NTLM - - 1048576 - 2147483647 - 1 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - _popUpItemAction: - - - YES - - OtherViews - - - - - Kerberos - - 1048576 - 2147483647 - - - _popUpItemAction: - 1 - + 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 + + + + - - - TLS-DSK - - 1048576 - 2147483647 - - - _popUpItemAction: - 2 - + + + 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 - -1 - 1 - YES - YES - 2 - - - - - 268 - {{184, 247}, {156, 22}} + + {{7, 16}, {349, 158}} - + + _NS:9 - YES - - -1804599231 - 272630784 - - - _NS:9 - - YES + {0, 0} + + 67108864 + 0 + Email Settings + + LucidaGrande + 11 + 3100 + - + + 3 + MCAwLjgwMDAwMDAxMTkAA + + + 1 + 0 + 2 + NO - + - 268 - {{181, 276}, {162, 26}} - - - _NS:9 - YES - - -2076049856 - 2048 - - _NS:9 - - 109199360 - 129 - - - 400 - 75 - - - Auto - - 1048576 - 2147483647 - 1 - - - _popUpItemAction: - - - YES - - OtherViews - - - - - SSL/TLS - - 1048576 - 2147483647 - - - _popUpItemAction: - 1 - + 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 + + + + - - - TCP - - 1048576 - 2147483647 - - - _popUpItemAction: - 2 - + + + 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 - 1 - YES - YES - 2 - - - - - 268 - {{184, 314}, {156, 22}} + + {{5, 214}, {351, 180}} - + + _NS:9 - YES - - -1804599231 - 272630784 - - - _NS:9 - - YES + {0, 0} + + 67108864 + 0 + Connection Settings + - - - - - - 268 - {{17, 220}, {153, 17}} - - - _NS:1535 - YES - - 68157504 - 272630784 - Authentication scheme: - - _NS:1535 - - - - - - - - 268 - {{17, 250}, {78, 17}} - - - _NS:1535 - YES - - 68157504 - 272630784 - User Agent: - - _NS:1535 - - - - - - - - 268 - {{17, 281}, {111, 17}} - - - _NS:1535 - YES - - 68157504 - 272630784 - Connection type: - - _NS:1535 - - - - - - - - 268 - {{17, 317}, {81, 17}} - - - _NS:1535 - YES - - 68157504 - 272630784 - Server[:Port] - - _NS:1535 - - - + + 3 + MCAwLjgwMDAwMDAxMTkAA + + + 1 + 0 + 2 + NO - {360, 348} + {360, 414} - + + NSView - + 268 264 - {{123, 61}, {231, 22}} + {{123, 61}, {213, 22}} + YES @@ -596,8 +701,10 @@ 268 - {{123, 31}, {231, 22}} + {{123, 31}, {213, 22}} + + _NS:9 YES @@ -615,8 +722,9 @@ 268 - {{123, 91}, {231, 22}} + {{123, 91}, {213, 22}} + _NS:9 YES @@ -638,6 +746,7 @@ 268 {{12, 34}, {68, 17}} + _NS:1535 YES @@ -657,6 +766,7 @@ 268 {{12, 64}, {103, 17}} + _NS:1535 YES @@ -676,6 +786,7 @@ 268 {{12, 94}, {71, 17}} + _NS:1535 YES @@ -691,7 +802,9 @@ - {374, 132} + {360, 132} + + _NS:9 NSView @@ -725,99 +838,99 @@ - textField_userAgent + textField_groupchatUser - + - 227 + 232 - textField_emailURL + textField_accountUID - + - 228 + 252 - textField_email + textField_windowsLogin - + - 229 + 259 - textField_emailLogin + textField_userAgent - + - 230 + 227 - textField_emailPassword + checkBox_singleSignOn - + - 231 + 235 - textField_groupchatUser + textField_server - + - 232 + 260 - popup_connectionType + popup_authenticationScheme - + - 233 + 234 - popup_authenticationScheme + popup_connectionType - + - 234 + 233 - checkBox_singleSignOn + textField_email - + - 235 + 229 - textField_accountUID + textField_emailPassword - + - 252 + 231 - textField_windowsLogin + textField_emailURL - + - 259 + 228 - textField_server + textField_emailLogin - + - 260 + 230 @@ -850,134 +963,196 @@ 1 - - - - - - - - - - - - - - - - - + + Options - 4 - + 104 + - + - 5 - - + 105 + + - 10 - + 136 + - + - 11 - - + 137 + + - 16 - + 157 + - + + + + + + - + + Setup - 17 - - + 163 + + + + + - 25 - + 164 + + + + + 160 + - + - + - 26 - - + 167 + + - 31 - + 158 + - + - + - 32 - - + 169 + + - 39 - + 161 + - + + + + + + 166 + + + + + 253 + + + + + + windowslogin + + + 256 + + + + + 257 + + + + + + + + 258 + + + + + 272 + + + + + + + + + + + - 40 - + 4 + - + - + - 41 - + 31 + - - - + - + - 42 - - + 10 + + + + + - 43 - - + 16 + + + + + - 44 - - + 25 + + + + + + + + 39 + + + + + 49 @@ -985,12 +1160,7 @@ - - - - 50 - - + 65 @@ -998,7 +1168,20 @@ - + + + + 225 + + + + + + + + 226 + + 66 @@ -1034,240 +1217,186 @@ - 76 - - - - - - - - 77 - - + 50 + + - 82 - + 40 + - + - - - - 83 - - + - 96 - + 41 + - + + + - - - - 97 - - + - 100 - - - - - + 42 + + - 101 - - + 43 + + - 104 - - - - - + 44 + + - 105 - - + 26 + + - 111 - - - - - + 17 + + - 112 - - + 11 + + - 118 - - - - - + 32 + + - 119 - - + 5 + + - 124 - + 273 + - + + + + + + + + - 125 - - - - 130 - + - 131 - - - - - 136 - + 124 + - + - - - - 137 - - + - 157 - + 118 + - - - - - - + - - Setup + - 163 - + 111 + - + - - - - 164 - - + - 160 - + 100 + - + - - - - 167 - - + - 158 - + 96 + - + - + - 169 - - + 82 + + + + + - 161 - + 76 + - + - + - 166 - - + 77 + + - 225 - - - - - + 83 + + - 226 - - + 97 + + - 253 - - - - - - windowslogin + 101 + + - 256 - - + 112 + + - 257 - - - - - + 119 + + - 258 - - + 125 + + + + + 131 + + @@ -1313,6 +1442,8 @@ 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 @@ -1342,7 +1473,7 @@ - 260 + 349 @@ -1483,6 +1614,7 @@ ESSIPEAccountViewController PurpleAccountViewController + NSButton NSButton NSPopUpButton NSPopUpButton @@ -1496,6 +1628,10 @@ NSTextField + + checkBox_autoDiscover + NSButton + checkBox_singleSignOn NSButton @@ -1590,13 +1726,9 @@ 0 IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 - + YES 3 diff --git a/src/adium/SIPEAdiumPlugin.xcodeproj/project.pbxproj b/src/adium/SIPEAdiumPlugin.xcodeproj/project.pbxproj index 1133d49f..67d9c533 100644 --- a/src/adium/SIPEAdiumPlugin.xcodeproj/project.pbxproj +++ b/src/adium/SIPEAdiumPlugin.xcodeproj/project.pbxproj @@ -70,11 +70,14 @@ 7B5DD2F216DB1E0A00B3D188 /* libnspr4.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 1C1DC3C514A7FFED001F6A0F /* libnspr4.dylib */; }; 7B78055816DEC73400B844A6 /* ESSIPEAccountView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7B78055716DEC73400B844A6 /* ESSIPEAccountView.xib */; }; 7B78059A16DFF8D300B844A6 /* sip-sec-negotiate.c in Sources */ = {isa = PBXBuildFile; fileRef = 7B78059916DFF8D200B844A6 /* sip-sec-negotiate.c */; }; + 7B7805B516E02AC400B844A6 /* DCPurpleSIPEJoinChatViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 7B7805B316E02AC400B844A6 /* DCPurpleSIPEJoinChatViewController.h */; }; + 7B7805B616E02AC400B844A6 /* DCPurpleSIPEJoinChatViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7B7805B416E02AC400B844A6 /* DCPurpleSIPEJoinChatViewController.m */; }; 7B85598F166F1875005868B4 /* libnss3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B57773F166EC5FB000DBCD5 /* libnss3.dylib */; }; 7B855990166F1878005868B4 /* libsoftokn3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B577733166EBF7D000DBCD5 /* libsoftokn3.dylib */; }; 7B855991166F187B005868B4 /* libfreebl3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B577730166EBEB6000DBCD5 /* libfreebl3.dylib */; }; 7B855992166F187F005868B4 /* libplds4.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B5777121668103B000DBCD5 /* libplds4.dylib */; }; 7B855993166F1882005868B4 /* libplc4.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B5777101668102A000DBCD5 /* libplc4.dylib */; }; + 7BA9BC6116E83A7E003457AA /* DCPurpleSIPEJoinChatView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7BA9BC6016E83A7E003457AA /* DCPurpleSIPEJoinChatView.xib */; }; 8D5B49B0048680CD000E48DA /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C167DFE841241C02AAC07 /* InfoPlist.strings */; }; 8D5B49B4048680CD000E48DA /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7ADFEA557BF11CA2CBB /* Cocoa.framework */; }; B13FAB5F119D5155001CE037 /* purple-connection.c in Sources */ = {isa = PBXBuildFile; fileRef = B13FAB4F119D5155001CE037 /* purple-connection.c */; }; @@ -277,6 +280,9 @@ 7B57773F166EC5FB000DBCD5 /* libnss3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libnss3.dylib; path = mozilla/security/nss/lib/nss/Darwin11.4.2_64_OPT.OBJ/libnss3.dylib; sourceTree = NSS_SRCPATH; }; 7B78055716DEC73400B844A6 /* ESSIPEAccountView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = ESSIPEAccountView.xib; path = English.lproj/ESSIPEAccountView.xib; sourceTree = ""; }; 7B78059916DFF8D200B844A6 /* sip-sec-negotiate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "sip-sec-negotiate.c"; sourceTree = ""; }; + 7B7805B316E02AC400B844A6 /* DCPurpleSIPEJoinChatViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DCPurpleSIPEJoinChatViewController.h; sourceTree = ""; }; + 7B7805B416E02AC400B844A6 /* DCPurpleSIPEJoinChatViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DCPurpleSIPEJoinChatViewController.m; sourceTree = ""; }; + 7BA9BC6016E83A7E003457AA /* DCPurpleSIPEJoinChatView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DCPurpleSIPEJoinChatView.xib; sourceTree = ""; }; 8D5B49B6048680CD000E48DA /* SIPEAdiumPlugin.AdiumLibpurplePlugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SIPEAdiumPlugin.AdiumLibpurplePlugin; sourceTree = BUILT_PRODUCTS_DIR; }; 8D5B49B7048680CD000E48DA /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = SOURCE_ROOT; }; B13FAB4F119D5155001CE037 /* purple-connection.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "purple-connection.c"; sourceTree = ""; }; @@ -396,6 +402,7 @@ 089C167CFE841241C02AAC07 /* Resources */ = { isa = PBXGroup; children = ( + 7BA9BC6016E83A7E003457AA /* DCPurpleSIPEJoinChatView.xib */, 7B78055716DEC73400B844A6 /* ESSIPEAccountView.xib */, 7B50EFAA16DB326100F897D1 /* PurpleDefaultsSIPE.plist */, C9FDAEF4109ADF97004EEEAF /* sipe.png */, @@ -408,6 +415,8 @@ 08FB77AFFE84173DC02AAC07 /* Classes */ = { isa = PBXGroup; children = ( + 7B7805B316E02AC400B844A6 /* DCPurpleSIPEJoinChatViewController.h */, + 7B7805B416E02AC400B844A6 /* DCPurpleSIPEJoinChatViewController.m */, C99F358D109AE68400E79CB2 /* ESPurpleSIPEAccount.h */, C99F358E109AE68400E79CB2 /* ESPurpleSIPEAccount.m */, C9488444109B352000ABFAF7 /* ESSIPELibpurpleServicePlugin.h */, @@ -606,6 +615,7 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( + 7B7805B516E02AC400B844A6 /* DCPurpleSIPEJoinChatViewController.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -755,6 +765,7 @@ C9FDAEF6109ADF97004EEEAF /* sipe.png in Resources */, 7B50EFAB16DB326100F897D1 /* PurpleDefaultsSIPE.plist in Resources */, 7B78055816DEC73400B844A6 /* ESSIPEAccountView.xib in Resources */, + 7BA9BC6116E83A7E003457AA /* DCPurpleSIPEJoinChatView.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -770,6 +781,7 @@ 1CF2612E12C2E7430045B6CC /* ESSIPELibpurpleServicePlugin.m in Sources */, 1CDEE46112C35DAD00790CAF /* ESSIPEAccountViewController.m in Sources */, 7B78059A16DFF8D300B844A6 /* sip-sec-negotiate.c in Sources */, + 7B7805B616E02AC400B844A6 /* DCPurpleSIPEJoinChatViewController.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; -- 2.11.4.GIT