Changeset 24068

Timestamp:

06/24/2008 10:05:09 PM (7 months ago)

Author:

sholt

Message:

More updates for synching, including the default sync services client description.

Files:

• branches/adium_syncservices/Adium.xcodeproj/project.pbxproj (modified) (5 diffs)
• branches/adium_syncservices/SyncServices/resources/ClientDescription.plist (added)
• branches/adium_syncservices/SyncServices/source/AdiumSyncHelper.h (modified) (1 diff)
• branches/adium_syncservices/SyncServices/source/AdiumSyncHelper.m (modified) (3 diffs)
• branches/adium_syncservices/SyncServices/source/ASHDummyAdium.h (moved) (moved from branches/adium_syncservices/SyncServices/source/AIASHDummyAdium.h) (2 diffs, 1 prop)
• branches/adium_syncservices/SyncServices/source/ASHDummyAdium.m (moved) (moved from branches/adium_syncservices/SyncServices/source/AIASHDummyAdium.m) (2 diffs, 1 prop)

branches/adium_syncservices/Adium.xcodeproj/project.pbxproj

@@ -1247 +1247 @@
-                6FB330A50C7235BF00B001A8 /* EKEzvIncomingFileTransfer.m in Sources */ = {isa = PBXBuildFile; fileRef = 6FB330A20C7235BF00B001A8 /* EKEzvIncomingFileTransfer.m */; };
-                6FB330A60C7235BF00B001A8 /* EKEzvOutgoingFileTransfer.m in Sources */ = {isa = PBXBuildFile; fileRef = 6FB330A40C7235BF00B001A8 /* EKEzvOutgoingFileTransfer.m */; };
+                7E801DBB0E11B9AB003D48A8 /* AIAccountController.m in Sources */ = {isa = PBXBuildFile; fileRef = F57938AA033E737001A8010A /* AIAccountController.m */; };
+                7E801DC40E11B9F9003D48A8 /* AdiumPasswords.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B8742490840E3D800738987 /* AdiumPasswords.m */; };
+                7E801DC60E11BA07003D48A8 /* AdiumPreferredAccounts.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BE3AD1D085F3EDD005919E7 /* AdiumPreferredAccounts.m */; };
+                7E801DCC0E11BA56003D48A8 /* AIPreferenceController.m in Sources */ = {isa = PBXBuildFile; fileRef = F57938AF033E737001A8010A /* AIPreferenceController.m */; };
+                7E801DCE0E11BA69003D48A8 /* AIPreferenceContainer.m in Sources */ = {isa = PBXBuildFile; fileRef = 347F4B800D340F16006D5A56 /* AIPreferenceContainer.m */; };
-                7E824CDD06387FAF00813072 /* LinkEditor.nib in Resources */ = {isa = PBXBuildFile; fileRef = 7E824CCE06387FAF00813072 /* LinkEditor.nib */; };
-                7E824CE106387FAF00813072 /* SHAutoValidatingTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E824CD206387FAF00813072 /* SHAutoValidatingTextView.m */; };
-                7E824CE306387FAF00813072 /* SHLinkEditorWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E824CD406387FAF00813072 /* SHLinkEditorWindowController.m */; };
-                7E824CEB06387FAF00813072 /* SHLinkManagementPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E824CDC06387FAF00813072 /* SHLinkManagementPlugin.m */; };
-
+
+
+
-                7EC2E1C00DF43AC9008C86B4 /* Developer_Links.plist in Resources */ = {isa = PBXBuildFile; fileRef = 7EC2E1BF0DF43AC8008C86B4 /* Developer_Links.plist */; };
-                7EC2E1C30DF43B6A008C86B4 /* AIDeveloperLinksPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 7EC2E1C20DF43B6A008C86B4 /* AIDeveloperLinksPlugin.m */; };
@@ -4153 +4160 @@
-                7E824CDB06387FAF00813072 /* SHLinkManagementPlugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SHLinkManagementPlugin.h; sourceTree = "<group>"; };
-                7E824CDC06387FAF00813072 /* SHLinkManagementPlugin.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = SHLinkManagementPlugin.m; sourceTree = "<group>"; };
-IASHDummyAdium.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIASHDummyAdium.h; path = SyncServices/source/AI
-IASHDummyAdium.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIASHDummyAdium.m; path = SyncServices/source/AI
+SHDummyAdium.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ASHDummyAdium.h; path = SyncServices/source/
+SHDummyAdium.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ASHDummyAdium.m; path = SyncServices/source/
-                7EC2E1990DF4390A008C86B4 /* Developer Links.AdiumPlugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Developer Links.AdiumPlugin"; sourceTree = BUILT_PRODUCTS_DIR; };
-                7EC2E1BF0DF43AC8008C86B4 /* Developer_Links.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Developer_Links.plist; path = Plists/Developer_Links.plist; sourceTree = "<group>"; };
@@ -4164 +4171 @@
-                7EC2E1E00DF44224008C86B4 /* AIDLLinkScanner.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIDLLinkScanner.m; path = "Plugins/Developer Links/AIDLLinkScanner.m"; sourceTree = "<group>"; };
-                7EC2E1E90DF447C6008C86B4 /* AIDeveloperLinksPlugin.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIDeveloperLinksPlugin.pch; path = "Plugins/Developer Links/AIDeveloperLinksPlugin.pch"; sourceTree = "<group>"; };
+                7ED34BAD0E11D45B00248D64 /* ClientDescription.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = ClientDescription.plist; path = SyncServices/resources/ClientDescription.plist; sourceTree = "<group>"; };
-                7EE32FD90E02DB37000577E8 /* AdiumSyncHelper */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = AdiumSyncHelper; sourceTree = BUILT_PRODUCTS_DIR; };
-                7EE32FE50E02DB55000577E8 /* SyncServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SyncServices.framework; path = System/Library/Frameworks/SyncServices.framework; sourceTree = SDKROOT; };
@@ -7329 +7337 @@
-                                7EE32FFE0E02DBC4000577E8 /* AdiumSyncHelper.h */,
-                                7EE32FFF0E02DBC4000577E8 /* AdiumSyncHelper.m */,
-
-
+
+
+
-                        );
-                        name = "Sync Services";
@@ -10045 +10054 @@
-                        files = (
-                                7EE330000E02DBC4000577E8 /* AdiumSyncHelper.m in Sources */,
-
+
+
+
+
+
+
+
+
-                        );
-                        runOnlyForDeploymentPostprocessing = 0;

branches/adium_syncservices/SyncServices/source/AdiumSyncHelper.h

@@ -10 +10 @@
-#import <AIUtilities/AIUtilities.h>
-#import <Adium/Adium.h>
-IA
+
-        
-#define ADIUM_SYNC_HELPER_IDENTIFIER @"com.adiumx.AdiumSyncHelper"
-#define ADIUM_SYNC_SCHEMA_NAME @"AdiumSyncSchema"
-
+@protocol AIAdium;
-@interface AdiumSyncHelper : NSObject {
-
+
-}
-

branches/adium_syncservices/SyncServices/source/AdiumSyncHelper.m

@@ -12 +12 @@
-@implementation AdiumSyncHelper
-
+- (id)init
+{
+        if((self = [super init])){
+                // Adium.framework requires 
+                // get the shared AIAdium instance which should (please, oh, please, oh please) exist
+                // this will let us keep Adium in the loop when it's running and we're changing prefs around.
+                // else, use our own dummy AIAdium class.
+                if(!(_adium = [AIObject sharedAdiumInstance])) {
+                        // init and configure the dummy class
+                        _adium = [[ASHDummyAdium alloc] init];
+                        [AIObject _setSharedAdiumInstance:_adium];
+                }
+        }
+        
+        return self;
+}
-#pragma mark ISyncSession callbacks
-
-- (void)performSync:(ISyncClient *)syncClient :(ISyncSession *)syncSession
-{
+        if (syncSession) {
+//              [self negotiateSession:syncSession];
+                [self pushDataForSession:syncSession];
+                [self pullDataForSession:syncSession];
+        }
+        
+//      [self syncCleanup];
-}
-
@@ -38 +61 @@
-}
-
-
-
-
+//
+//
+//
-
-#pragma mark push/pull
@@ -56 +79 @@
-        NSAutoreleasePool       *pool = [[NSAutoreleasePool alloc] init];
-        AdiumSyncHelper         *syncHelper = [[AdiumSyncHelper alloc] init];
-        id                                      *adium;
-
-        // Adium.framework requires 
-        // get the shared AIAdium instance which should (please, oh, please, oh please) exist
-        // this will let us keep Adium in the loop when it's running and we're changing prefs around.
-        // else, use our own dummy AIAdium class.
-        if(![AIObject sharedAdiumInstance]) {
-                // init and configure the dummy class
-                adium = [[AIASHDummyAdium alloc] init];
-                [AIObject _setSharedAdiumInstance:adium];
-        }
-        
-        if([[ISyncManager sharedManager] isEnabled]) {

branches/adium_syncservices/SyncServices/source/ASHDummyAdium.h

@@ -1 +1 @@
-//
-IA
+
-//  Adium
-//
@@ -9 +9 @@
-#import <AIUtilities/AIUtilities.h>
-#import <Adium/Adium.h>
+#import "AIAccountController.h"
-
-@protocol AIAccountController
-IA
+
-        NSObject <AIAccountController>  *accountController;
-        NSNotificationCenter                    *notificationCenter;

branches/adium_syncservices/SyncServices/source/ASHDummyAdium.m

@@ -1 +1 @@
-//
-IA
+
-//  Adium
-//
@@ -6 +6 @@
-//
-
-IA
-
-
-IA
+
+
+
+
-#pragma mark init/dealloc
-- (id)init
-{
-        if ((self = [super init])) {
-SH
+
-        }
-        return self;