Changeset 15624

Timestamp:

04/01/2006 02:33:18 PM (3 years ago)

Author:

catfish_man

Message:

Quit confirmation dialog box when there are filetransfers active. Patch from Newtylicious, modified by me. Fixes #3087

Files:

• trunk/Adium.xcodeproj/project.pbxproj (modified) (11 diffs)
• trunk/Resources/FileTransferQuitConfirmation.nib (added)
• trunk/Resources/FileTransferQuitConfirmation.nib/classes.nib (added)
• trunk/Resources/FileTransferQuitConfirmation.nib/keyedobjects.nib (added)
• trunk/Source/AdiumFileTransferQuitConfirmation.h (added)
• trunk/Source/AdiumFileTransferQuitConfirmation.m (added)
• trunk/Source/AdiumUnreadMessagesQuitConfirmation.h (modified) (1 diff)
• trunk/Source/AdiumUnreadMessagesQuitConfirmation.m (modified) (2 diffs)
• trunk/Source/AIAdium.m (modified) (2 diffs)
• trunk/Source/ESFileTransferController.h (modified) (1 diff)
• trunk/Source/ESFileTransferController.m (modified) (1 diff)

trunk/Adium.xcodeproj/project.pbxproj

@@ -1352 +1352 @@
-                9EA125E9055B630900ECF349 /* CBGaimOscarAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 9EA125E8055B630900ECF349 /* CBGaimOscarAccount.m */; };
-                9EA125EF055B633000ECF349 /* CBGaimOscarAccount.h in Headers */ = {isa = PBXBuildFile; fileRef = 9EA125EE055B633000ECF349 /* CBGaimOscarAccount.h */; };
-block.png in Resources */ = {isa = PBXBuildFile; fileRef = 9EF0DBF309D944A300FBCC1E /* 
-unblock.png in Resources */ = {isa = PBXBuildFile; fileRef = 9EF0DBF409D944A300FBCC1E /* 
+Resources/block.png in Resources */ = {isa = PBXBuildFile; fileRef = 9EF0DBF309D944A300FBCC1E /* Resources/
+Resources/unblock.png in Resources */ = {isa = PBXBuildFile; fileRef = 9EF0DBF409D944A300FBCC1E /* Resources/
-                A3C042D208D7483100B48CE1 /* GaimDefaultsGTalk.plist in Resources */ = {isa = PBXBuildFile; fileRef = A3C042D108D7483100B48CE1 /* GaimDefaultsGTalk.plist */; };
-                A3C0432108D74D3100B48CE1 /* AIGaimGTalkAccount.h in Headers */ = {isa = PBXBuildFile; fileRef = A3C0431B08D74D3100B48CE1 /* AIGaimGTalkAccount.h */; };
@@ -1369 +1369 @@
-                C45F7F6606C75E210056B1F2 /* BGContactsTable.m in Sources */ = {isa = PBXBuildFile; fileRef = C45F7F6306C75E210056B1F2 /* BGContactsTable.m */; };
-                C45F7F6706C75E210056B1F2 /* showdrawer.tiff in Resources */ = {isa = PBXBuildFile; fileRef = C45F7F6406C75E210056B1F2 /* showdrawer.tiff */; };
+                C962831709DEE5B4004235A9 /* AdiumFileTransferQuitConfirmation.m in Sources */ = {isa = PBXBuildFile; fileRef = C96282E609DE2FAA004235A9 /* AdiumFileTransferQuitConfirmation.m */; };
+                C962831809DEE5BD004235A9 /* AdiumFileTransferQuitConfirmation.h in Headers */ = {isa = PBXBuildFile; fileRef = C96282E709DE2FAA004235A9 /* AdiumFileTransferQuitConfirmation.h */; };
+                C962831909DEE5C3004235A9 /* FileTransferQuitConfirmation.nib in Resources */ = {isa = PBXBuildFile; fileRef = C96282E809DE2FAA004235A9 /* FileTransferQuitConfirmation.nib */; };
-                CA25AAA907B428C800DDBD7E /* BDFireImporter.h in Headers */ = {isa = PBXBuildFile; fileRef = CA25AA9F07B428C600DDBD7E /* BDFireImporter.h */; };
-                CA25AAAA07B428C800DDBD7E /* BDFireImporter.m in Sources */ = {isa = PBXBuildFile; fileRef = CA25AAA007B428C700DDBD7E /* BDFireImporter.m */; };
@@ -3485 +3488 @@
-                9EB3C53304F94FAE001D1F74 /* CBOldPrefsImporterAppController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CBOldPrefsImporterAppController.h; sourceTree = "<group>"; };
-                9EB3C53404F94FAE001D1F74 /* CBOldPrefsImporterAppController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CBOldPrefsImporterAppController.m; sourceTree = "<group>"; };
-
-
+Resources/
+Resources/
-                A3C042D108D7483100B48CE1 /* GaimDefaultsGTalk.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; name = GaimDefaultsGTalk.plist; path = "Plugins/Gaim Service/GaimDefaultsGTalk.plist"; sourceTree = "<group>"; };
-                A3C0431B08D74D3100B48CE1 /* AIGaimGTalkAccount.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AIGaimGTalkAccount.h; path = "Plugins/Gaim Service/AIGaimGTalkAccount.h"; sourceTree = "<group>"; };
@@ -3576 +3579 @@
-                C45F7F6306C75E210056B1F2 /* BGContactsTable.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = BGContactsTable.m; path = Plugins/Logger/BGContactsTable.m; sourceTree = "<group>"; };
-                C45F7F6406C75E210056B1F2 /* showdrawer.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = showdrawer.tiff; path = Plugins/Logger/showdrawer.tiff; sourceTree = "<group>"; };
+                C96282E609DE2FAA004235A9 /* AdiumFileTransferQuitConfirmation.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = AdiumFileTransferQuitConfirmation.m; path = Source/AdiumFileTransferQuitConfirmation.m; sourceTree = "<group>"; };
+                C96282E709DE2FAA004235A9 /* AdiumFileTransferQuitConfirmation.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AdiumFileTransferQuitConfirmation.h; path = Source/AdiumFileTransferQuitConfirmation.h; sourceTree = "<group>"; };
+                C96282E809DE2FAA004235A9 /* FileTransferQuitConfirmation.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = FileTransferQuitConfirmation.nib; path = Resources/FileTransferQuitConfirmation.nib; sourceTree = "<group>"; };
-                CA25AA9F07B428C600DDBD7E /* BDFireImporter.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = BDFireImporter.h; sourceTree = "<group>"; };
-                CA25AAA007B428C700DDBD7E /* BDFireImporter.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = BDFireImporter.m; sourceTree = "<group>"; };
@@ -3935 +3941 @@
-                                4BC291F9083D9EDC0075F57D /* Core (Private classes for the Public Interface) */,
-                                F53B9A1302CCEDCA01A8010A /* Adium.Framework */,
-                                4BC291FC083D9EDD0075F57D /* Components */,
-                                4BD6720906001B2C0049CAF7 /* Plugins (Built In) */,
-                                344C0D4306B6D5E300DA7200 /* Applescriptability */,
@@ -4511 +4516 @@
-                        isa = PBXGroup;
-                        children = (
+                                C96282E609DE2FAA004235A9 /* AdiumFileTransferQuitConfirmation.m */,
+                                C96282E709DE2FAA004235A9 /* AdiumFileTransferQuitConfirmation.h */,
+                                C96282E809DE2FAA004235A9 /* FileTransferQuitConfirmation.nib */,
-                                3452A9F607891C8A00C3C494 /* ESFileTransferRequestPromptController.h */,
-                                3452A9F707891C8A00C3C494 /* ESFileTransferRequestPromptController.m */,
@@ -4854 +4862 @@
-                        children = (
-                                110763F908676D04005987A5 /* BlockEditorWindow.nib */,
-
-
+Resources/
+Resources/
-                                110763F108676CC9005987A5 /* RAFBlockEditorPlugin.h */,
-                                110763F208676CC9005987A5 /* RAFBlockEditorPlugin.m */,
@@ -5034 +5042 @@
-                        isa = PBXGroup;
-                        children = (
+                                4BC291FC083D9EDD0075F57D /* Components */,
-                                34E104EA0951E0FE00EBE478 /* AdiumUnreadMessagesQuitConfirmation.h */,
-                                34E104EB0951E0FE00EBE478 /* AdiumUnreadMessagesQuitConfirmation.m */,
@@ -6895 +6904 @@
-                        files = (
-                                34BD9D11053146CC000AB133 /* AIPreferenceController.h in Headers */,
+                                C962831809DEE5BD004235A9 /* AdiumFileTransferQuitConfirmation.h in Headers */,
-                                34BD9D12053146CC000AB133 /* AIAccountController.h in Headers */,
-                                34BD9D13053146CC000AB133 /* AIPreferenceWindowController.h in Headers */,
@@ -8299 +8309 @@
-                        buildActionMask = 2147483647;
-                        files = (
-
-
+Resources/
+Resources/
-                                346F5CB408A418FB0055C610 /* iTunes.png in Resources */,
-                                346F5D3208A43E7B0055C610 /* CurrentTunes.scpt in Resources */,
+                                C962831909DEE5C3004235A9 /* FileTransferQuitConfirmation.nib in Resources */,
-                                349C30790867ADA3000BF883 /* AdiumApplescriptRunner in Resources */,
-                                DA4B5CDF080FCC080017BF17 /* CoreComponents.plist in Resources */,
@@ -9112 +9123 @@
-                                34AE249E09BCCFA900A35B51 /* AIWindowDraggingView.m in Sources */,
-                                342353D709D45726009FF634 /* AIAbstractLogViewerWindowController.m in Sources */,
+                                C962831709DEE5B4004235A9 /* AdiumFileTransferQuitConfirmation.m in Sources */,
-                        );
-                        runOnlyForDeploymentPostprocessing = 0;

trunk/Source/AdiumUnreadMessagesQuitConfirmation.h

@@ +1 @@
+
-//
-//  AdiumUnreadMessagesQuitConfirmation.h

trunk/Source/AdiumUnreadMessagesQuitConfirmation.m

@@ -73 +73 @@
-                if ([checkBox_dontAskAgain state] == NSOnState) {
-                        [[adium preferenceController] setPreference:[NSNumber numberWithBool:YES]
-
+ for Unread Messages
-                                                                                                  group:PREF_GROUP_CONFIRMATIONS];
-                }
@@ -84 +84 @@
-
-@end
+
+

trunk/Source/AIAdium.m

@@ -41 +41 @@
-#import "AdiumSetupWizard.h"
-#import "AdiumUnreadMessagesQuitConfirmation.h"
+#import "AdiumFileTransferQuitConfirmation.h"
-#import <AIUtilities/AIFileManagerAdditions.h>
-#import <AIUtilities/AIApplicationAdditions.h>
@@ -392 +393 @@
-{
-        if (([chatController unviewedContentCount] > 0) &&
-
+ for Unread Messages
-                                                                                        group:@"Confirmations"] boolValue])) {
-                        [AdiumUnreadMessagesQuitConfirmation showUnreadMessagesQuitConfirmation];
-
-
+
+
+
+
+
+
+
+
+
-                [NSApp terminate:nil];
-        }

trunk/Source/ESFileTransferController.h

@@ -76 +76 @@
-- (NSArray *)fileTransferArray;
-
+- (int)activeTransferCount;
+
-- (void)receiveRequestForFileTransfer:(ESFileTransfer *)fileTransfer;
-

trunk/Source/ESFileTransferController.m

@@ -158 +158 @@
-}
-
+- (int)activeTransferCount
+{
+        int count = 0;
+        ESFileTransfer *t;
+        NSEnumerator * fts = [fileTransferArray objectEnumerator];
+        while((t = [fts nextObject])) 
+        {
+                FileTransferStatus status = [t status];
+
+                if(status == Unknown_Status_FileTransfer || status == Not_Started_FileTransfer || status == Checksumming_Filetransfer || status == Accepted_FileTransfer || status == In_Progress_FileTransfer)
+                        count++;
+        }
+        return count;
+}
+
+
-- (NSArray *)fileTransferArray
-{