Ticket #344: KGContactBlockedPlugin.diff

Adium.xcodeproj/project.pbxproj

@@ -1139 +1139 @@
-                9E28FDE806ADB30D0041553E /* adiumRedHighlight.png in Resources */ = {isa = PBXBuildFile; fileRef = 9E28FDE606ADB30D0041553E /* adiumRedHighlight.png */; };
-                9E6417070613C55D006AF387 /* CBURLHandlingPlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = 9E6417050613C55C006AF387 /* CBURLHandlingPlugin.h */; };
-                9E6417080613C55D006AF387 /* CBURLHandlingPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 9E6417060613C55C006AF387 /* CBURLHandlingPlugin.m */; };
+                9E6586AD08CD633A00FD51A9 /* KGContactBlockedPlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = 9E6586AB08CD633A00FD51A9 /* KGContactBlockedPlugin.h */; };
+                9E6586AE08CD633A00FD51A9 /* KGContactBlockedPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 9E6586AC08CD633A00FD51A9 /* KGContactBlockedPlugin.m */; };
-                9E6A9BF70732CB500032C9F6 /* adiumOfflineHighlight.png in Resources */ = {isa = PBXBuildFile; fileRef = 9E6A9BF50732CB500032C9F6 /* adiumOfflineHighlight.png */; };
-                9E6A9BF80732CB500032C9F6 /* adiumOffline.png in Resources */ = {isa = PBXBuildFile; fileRef = 9E6A9BF60732CB500032C9F6 /* adiumOffline.png */; };
-                9EA125E9055B630900ECF349 /* CBGaimOscarAccount.m in Sources */ = {isa = PBXBuildFile; fileRef = 9EA125E8055B630900ECF349 /* CBGaimOscarAccount.m */; };
@@ -3009 +3011 @@
-                9E28FDE606ADB30D0041553E /* adiumRedHighlight.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = adiumRedHighlight.png; path = "Plugins/Status Menu Item/adiumRedHighlight.png"; sourceTree = "<group>"; };
-                9E6417050613C55C006AF387 /* CBURLHandlingPlugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CBURLHandlingPlugin.h; path = "Plugins/URL Handling/CBURLHandlingPlugin.h"; sourceTree = "<group>"; };
-                9E6417060613C55C006AF387 /* CBURLHandlingPlugin.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = CBURLHandlingPlugin.m; path = "Plugins/URL Handling/CBURLHandlingPlugin.m"; sourceTree = "<group>"; };
+                9E6586AB08CD633A00FD51A9 /* KGContactBlockedPlugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = KGContactBlockedPlugin.h; path = Source/KGContactBlockedPlugin.h; sourceTree = "<group>"; };
+                9E6586AC08CD633A00FD51A9 /* KGContactBlockedPlugin.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = KGContactBlockedPlugin.m; path = Source/KGContactBlockedPlugin.m; sourceTree = "<group>"; };
-                9E6A9BF50732CB500032C9F6 /* adiumOfflineHighlight.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = adiumOfflineHighlight.png; path = "Plugins/Status Menu Item/adiumOfflineHighlight.png"; sourceTree = "<group>"; };
-                9E6A9BF60732CB500032C9F6 /* adiumOffline.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = adiumOffline.png; path = "Plugins/Status Menu Item/adiumOffline.png"; sourceTree = "<group>"; };
-                9E791D9405768B7A00547562 /* CBStatusMenuItemPlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CBStatusMenuItemPlugin.h; path = "Plugins/Status Menu Item/CBStatusMenuItemPlugin.h"; sourceTree = "<group>"; };
@@ -3837 +3841 @@
-                                347E7ACD07CAF98400350507 /* ESMetaContactContentsPlugin.m */,
-                                347E7AA907CAF8EE00350507 /* SAContactOnlineForPlugin.h */,
-                                347E7AA807CAF8EE00350507 /* SAContactOnlineForPlugin.m */,
+                                9E6586AB08CD633A00FD51A9 /* KGContactBlockedPlugin.h */,
+                                9E6586AC08CD633A00FD51A9 /* KGContactBlockedPlugin.m */,
-                        );
-                        name = Tooltips;
-                        sourceTree = "<group>";
@@ -6428 +6434 @@
-                                B02355A508CBE854008CDDDA /* sqliteInt.h in Headers */,
-                                B02355AF08CBE854008CDDDA /* vdbe.h in Headers */,
-                                B02355B308CBE854008CDDDA /* vdbeInt.h in Headers */,
+                                9E6586AD08CD633A00FD51A9 /* KGContactBlockedPlugin.h in Headers */,
-                        );
-                        runOnlyForDeploymentPostprocessing = 0;
-                };
@@ -8078 +8085 @@
-                                B02355B208CBE854008CDDDA /* vdbefifo.c in Sources */,
-                                B02355B408CBE854008CDDDA /* vdbemem.c in Sources */,
-                                B02355B508CBE854008CDDDA /* where.c in Sources */,
+                                9E6586AE08CD633A00FD51A9 /* KGContactBlockedPlugin.m in Sources */,
-                        );
-                        runOnlyForDeploymentPostprocessing = 0;
-                };

Source/KGContactBlockedPlugin.h

@@ +1 @@
+/* 
+ * Adium is the legal property of its developers, whose names are listed in the copyright file included
+ * with this source distribution.
+ * 
+ * This program is free software; you can redistribute it and/or modify it under the terms of the GNU
+ * General Public License as published by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+ * Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License along with this program; if not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+//
+//  KGContactBlockedPlugin.h
+//  Adium
+//
+//  Created by Kiel Gillard on 6/09/05.
+//
+
+#import <Adium/AIPlugin.h>
+#import "AIListObject.h"
+
+@protocol AIContactListTooltipEntry;
+
+@interface KGContactBlockedPlugin : AIPlugin <AIContactListTooltipEntry> {
+}
+
+@end

Source/KGContactBlockedPlugin.m

@@ +1 @@
+//
+//  KGContactBlockedPlugin.m
+//  Adium
+//
+//  Created by Kiel Gillard on 6/09/05.
+//
+
+#import "KGContactBlockedPlugin.h"
+#import "AIAccountController.h"
+#import "AIInterfaceController.h"
+#import <Adium/AIAccount.h>
+#import <AIUtilities/AIAttributedStringAdditions.h>
+
+@protocol AIContactListTooltipEntry;
+
+@implementation KGContactBlockedPlugin
+/*!
+ * @class KGContactBlockedPlugin
+ * @brief Adds a "Blocked: Yes" to the tooltip bodies of blocked contacts.
+ */
+- (void)installPlugin
+{
+    //Install our tooltip entry
+    [[adium interfaceController] registerContactListTooltipEntry:self secondaryEntry:YES];
+}
+
+/*!
+ * @brief Tooltip entry
+ *
+ * @result An entry for the blocked label, or nil if no tooltip label and entry should be shown
+ */
+- (NSAttributedString *)entryForObject:(AIListObject *)inObject
+{
+        /*
+         * 1. Determine if contact is on privacy list
+         * 2. If it is, create a blocked tooltip entry (that is, return localised @"Yes")
+         * 3. If not, return nil
+         */
+        
+    NSAttributedString                          *entry = nil;
+        BOOL                                                    blocked = NO;
+        NSArray                                                 *privacyList = nil;
+        AIAccount <AIAccount_Privacy>   *account;
+        NSEnumerator                                    *enumerator = [[[adium accountController] accounts] objectEnumerator];
+        
+        //loop thru all the accounts
+        while ((account = [enumerator nextObject])) {
+
+                //if the current account is online and responds to the privacy protocol
+                if ([[account statusObjectForKey:@"Online"] boolValue] && 
+                   [account conformsToProtocol:@protocol(AIAccount_Privacy)]) {
+                        //get the list
+                        privacyList = [account listObjectsOnPrivacyList:PRIVACY_DENY];
+                        //check for the buddy on the privacy list
+                        blocked = [privacyList containsObject:inObject];
+                        //no point looping on
+                        if (blocked) break;
+                }
+        }
+        
+        if (blocked) {
+                entry = [NSAttributedString stringWithString:AILocalizedString(@"Yes", nil)];
+        }
+        
+        return entry;
+}
+
+/*!
+ * @brief Tooltip entry
+ *
+ * @result The tooltip "Blocked" label
+ */
+- (NSString *)labelForObject:(AIListObject *)inObject
+{
+        return AILocalizedString(@"Blocked", @"Tooltip entry label to show a contact as blocked");
+}
+
+@end

Resources/CoreComponents.plist

@@ -79 +79 @@
-        <string>SMContactListShowBehaviorPlugin</string>
-        <string>ESiTunesPlugin</string>
-        <string>AIDockBadger</string>
+        <string>KGContactBlockedPlugin</string>
-        <string>SMSQLiteLoggerPlugin</string>
-</array>
-</plist>