adium 3195:9e4ce47edf96: Applying 1.4 changes to 1.5
commits at adium.im
commits at adium.im
Thu May 13 15:05:51 UTC 2010
details: http://hg.adium.im/adium/rev/9e4ce47edf96
revision: 3195:9e4ce47edf96
author: Alan Humpherys
date: Thu May 13 09:05:46 2010 -0600
Applying 1.4 changes to 1.5
Removed PicIM image uploading service (part of the demise of tr.im)
Updated Credits to show active devs
diffs (254 lines):
diff -r 30f4c543f887 -r 9e4ce47edf96 Adium.xcodeproj/project.pbxproj
--- a/Adium.xcodeproj/project.pbxproj Thu May 13 06:11:46 2010 -0500
+++ b/Adium.xcodeproj/project.pbxproj Thu May 13 09:05:46 2010 -0600
@@ -181,7 +181,6 @@
11BD73AE0F5A53EA007D438A /* facebook.png in Resources */ = {isa = PBXBuildFile; fileRef = 345D68950F1FD563002F2D01 /* facebook.png */; };
11BD73D30F5A54BB007D438A /* twitter-small.png in Resources */ = {isa = PBXBuildFile; fileRef = 11BD73D10F5A54BB007D438A /* twitter-small.png */; };
11BD73D40F5A54BB007D438A /* twitter.png in Resources */ = {isa = PBXBuildFile; fileRef = 11BD73D20F5A54BB007D438A /* twitter.png */; };
- 11BE289A0FCC7C13000E6A10 /* AIPicImImageUploader.m in Sources */ = {isa = PBXBuildFile; fileRef = 11BE28990FCC7C13000E6A10 /* AIPicImImageUploader.m */; };
11BE28DF0FCC7D2B000E6A10 /* AIImageUploaderPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 11BE28DE0FCC7D2B000E6A10 /* AIImageUploaderPlugin.m */; };
11BE29640FCCA8DA000E6A10 /* ImageUploaderProgress.nib in Resources */ = {isa = PBXBuildFile; fileRef = 11BE29630FCCA8DA000E6A10 /* ImageUploaderProgress.nib */; };
11BE29680FCCA9E3000E6A10 /* AIImageUploaderWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 11BE29670FCCA9E3000E6A10 /* AIImageUploaderWindowController.m */; };
@@ -2033,8 +2032,6 @@
11AE5575109CCC950074BDC2 /* irc-small.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "irc-small.png"; path = "Plugins/Purple Service/irc-small.png"; sourceTree = "<group>"; };
11BD73D10F5A54BB007D438A /* twitter-small.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "twitter-small.png"; path = "Plugins/Twitter Plugin/twitter-small.png"; sourceTree = "<group>"; };
11BD73D20F5A54BB007D438A /* twitter.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = twitter.png; path = "Plugins/Twitter Plugin/twitter.png"; sourceTree = "<group>"; };
- 11BE28980FCC7C13000E6A10 /* AIPicImImageUploader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIPicImImageUploader.h; path = "Plugins/Image Uploading Plugin/AIPicImImageUploader.h"; sourceTree = "<group>"; };
- 11BE28990FCC7C13000E6A10 /* AIPicImImageUploader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIPicImImageUploader.m; path = "Plugins/Image Uploading Plugin/AIPicImImageUploader.m"; sourceTree = "<group>"; };
11BE28DD0FCC7D2B000E6A10 /* AIImageUploaderPlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIImageUploaderPlugin.h; path = "Plugins/Image Uploading Plugin/AIImageUploaderPlugin.h"; sourceTree = "<group>"; };
11BE28DE0FCC7D2B000E6A10 /* AIImageUploaderPlugin.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIImageUploaderPlugin.m; path = "Plugins/Image Uploading Plugin/AIImageUploaderPlugin.m"; sourceTree = "<group>"; };
11BE29630FCCA8DA000E6A10 /* ImageUploaderProgress.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = ImageUploaderProgress.nib; path = "Plugins/Image Uploading Plugin/ImageUploaderProgress.nib"; sourceTree = "<group>"; };
@@ -5090,8 +5087,6 @@
11BE29670FCCA9E3000E6A10 /* AIImageUploaderWindowController.m */,
11BE28DD0FCC7D2B000E6A10 /* AIImageUploaderPlugin.h */,
11BE28DE0FCC7D2B000E6A10 /* AIImageUploaderPlugin.m */,
- 11BE28980FCC7C13000E6A10 /* AIPicImImageUploader.h */,
- 11BE28990FCC7C13000E6A10 /* AIPicImImageUploader.m */,
11D915570FFC0E9C00B39713 /* AIImageShackImageUploader.h */,
11D915580FFC0E9C00B39713 /* AIImageShackImageUploader.m */,
11D915700FFC100700B39713 /* AIGenericMultipartImageUploader.h */,
@@ -9573,7 +9568,7 @@
attributes = {
BuildIndependentTargetsInParallel = NO;
};
- buildConfigurationList = DADE8E3A085507450062B664 /* Build configuration list for PBXProject "Adium" */;
+ buildConfigurationList = DADE8E3A085507450062B664 /* Build configuration list for PBXProject "adium" */;
compatibilityVersion = "Xcode 3.1";
hasScannedForEncodings = 1;
knownRegions = (
@@ -10709,7 +10704,6 @@
112E7FA60FC86BB400657119 /* AITwitterActionsHTMLFilter.m in Sources */,
11A2F1220FC8FC9D00C3F05C /* AIMessageAlertsAdvancedPreferences.m in Sources */,
638BC1FC0FC932E000CE7600 /* AIObjectDebug.m in Sources */,
- 11BE289A0FCC7C13000E6A10 /* AIPicImImageUploader.m in Sources */,
11BE28DF0FCC7D2B000E6A10 /* AIImageUploaderPlugin.m in Sources */,
11BE29680FCCA9E3000E6A10 /* AIImageUploaderWindowController.m in Sources */,
1197F6710FCF8D180032F19B /* AITwitterStatusFollowup.m in Sources */,
@@ -12881,7 +12875,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Debug;
};
- DADE8E3A085507450062B664 /* Build configuration list for PBXProject "Adium" */ = {
+ DADE8E3A085507450062B664 /* Build configuration list for PBXProject "adium" */ = {
isa = XCConfigurationList;
buildConfigurations = (
DADE8E3B085507450062B664 /* Debug */,
diff -r 30f4c543f887 -r 9e4ce47edf96 Plugins/Image Uploading Plugin/AIImageUploaderPlugin.m
--- a/Plugins/Image Uploading Plugin/AIImageUploaderPlugin.m Thu May 13 06:11:46 2010 -0500
+++ b/Plugins/Image Uploading Plugin/AIImageUploaderPlugin.m Thu May 13 09:05:46 2010 -0600
@@ -7,7 +7,6 @@
//
#import "AIImageUploaderPlugin.h"
-#import "AIPicImImageUploader.h"
#import "AIImageShackImageUploader.h"
#import "AIImageUploaderWindowController.h"
@@ -36,7 +35,6 @@
windowControllers = [[NSMutableDictionary alloc] init];
uploadInstances = [[NSMutableDictionary alloc] init];
- [uploaders addObject:[AIPicImImageUploader class]];
[uploaders addObject:[AIImageShackImageUploader class]];
NSMenuItem *menuItem;
diff -r 30f4c543f887 -r 9e4ce47edf96 Plugins/Image Uploading Plugin/AIPicImImageUploader.h
--- a/Plugins/Image Uploading Plugin/AIPicImImageUploader.h Thu May 13 06:11:46 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-//
-// AIPicImImageUploader.h
-// Adium
-//
-// Created by Zachary West on 2009-05-26.
-// Copyright 2009 Adium. All rights reserved.
-//
-
-#import "AIGenericMultipartImageUploader.h"
-
- at interface AIPicImImageUploader : AIGenericMultipartImageUploader {
- NSData *resultData;
- NSXMLParser *responseParser;
-
- // Parsing
- NSMutableDictionary *lastElement;
- NSString *currentElementName;
- NSMutableDictionary *currentElement;
- NSMutableDictionary *response;
-}
-
- at end
diff -r 30f4c543f887 -r 9e4ce47edf96 Plugins/Image Uploading Plugin/AIPicImImageUploader.m
--- a/Plugins/Image Uploading Plugin/AIPicImImageUploader.m Thu May 13 06:11:46 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,118 +0,0 @@
-//
-// AIPicImImageUploader.m
-// Adium
-//
-// Created by Zachary West on 2009-05-26.
-// Copyright 2009 Adium. All rights reserved.
-//
-
-#import "AIPicImImageUploader.h"
-#import <AIUtilities/AIStringAdditions.h>
-
- at implementation AIPicImImageUploader
-+ (NSString *)serviceName
-{
- return @"pic.im";
-}
-
-- (NSString *)uploadURL
-{
- return @"http://api.tr.im/api/picim_url.xml?api_key=zghQN6sv5y0FkLPNlQAopm7qDQz6ItO33ENU21OBsy3dL1Kl";
-}
-
-- (NSString *)fieldName
-{
- return @"media";
-}
-
-- (NSUInteger)maximumSize
-{
- return 2500000;
-}
-
-- (void)dealloc
-{
- [resultData release]; resultData = nil;
- [response release]; response = nil;
- [responseParser release]; responseParser = nil;
-
- [super dealloc];
-}
-
-#pragma mark Response parsing
-- (void)parseResponse:(NSData *)data
-{
- response = [[NSMutableDictionary alloc] init];
- resultData = [data copy];
-
- AILogWithSignature(@"%@", [NSString stringWithData:data encoding:NSUTF8StringEncoding]);
-
- responseParser = [[NSXMLParser alloc] initWithData:resultData];
- [responseParser setDelegate:self];
- [responseParser parse];
-}
-
-- (void)parserDidStartDocument:(NSXMLParser *)parser
-{
- currentElement = response;
-}
-
-- (void)parser:(NSXMLParser *)parser
-parseErrorOccurred:(NSError *)error
-{
- AILogWithSignature(@"%@", [error localizedDescription]);
-
- [uploader errorWithMessage:[error localizedDescription] forChat:chat];
-}
-
-- (void)parser:(NSXMLParser *)parser
-didStartElement:(NSString *)elementName
- namespaceURI:(NSString *)namespaceURI
- qualifiedName:(NSString *)qualifiedName
- attributes:(NSDictionary *)attributes
-{
- if (elementName) {
- NSMutableDictionary *dict = [NSMutableDictionary dictionary];
-
- [currentElement setValue:dict forKey:elementName];
-
- lastElement = currentElement;
- currentElement = dict;
- }
-
- [currentElement addEntriesFromDictionary:attributes];
-}
-
-- (void)parser:(NSXMLParser *)parser didEndElement:(NSString *)elementName namespaceURI:(NSString *)namespaceURI qualifiedName:(NSString *)qName
-{
- // We don't see anything more than 2-deep. We don't need to check more.
- currentElement = lastElement;
-}
-
-- (void)parser:(NSXMLParser *)parser foundCharacters:(NSString *)string
-{
- if (![currentElement objectForKey:@"value"]) {
- [currentElement setValue:[NSMutableString string] forKey:@"value"];
- }
-
- [[currentElement objectForKey:@"value"] appendString:string];
-}
-
-- (void)parserDidEndDocument:(NSXMLParser *)parser
-{
- NSDictionary *trim = [response objectForKey:@"trim"];
- NSDictionary *status = [trim objectForKey:@"status"];
-
- if ([[status objectForKey:@"result"] isCaseInsensitivelyEqualToString:@"error"]) {
- [uploader errorWithMessage:[status objectForKey:@"message"] forChat:chat];
- } else if ([[status objectForKey:@"result"] isCaseInsensitivelyEqualToString:@"ok"]) {
- [uploader uploadedURL:[[trim objectForKey:@"url"] objectForKey:@"value"] forChat:chat];
-
- [[NSNotificationCenter defaultCenter] postNotificationName:@"AIPicImImageAdded"
- object:trim];
- } else {
- [uploader errorWithMessage:AILocalizedString(@"Unable to upload", nil) forChat:chat];
- }
-}
-
- at end
diff -r 30f4c543f887 -r 9e4ce47edf96 Resources/Credits.rtf
--- a/Resources/Credits.rtf Thu May 13 06:11:46 2010 -0500
+++ b/Resources/Credits.rtf Thu May 13 09:05:46 2010 -0600
@@ -1,7 +1,6 @@
-{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290
{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fnil\fcharset0 Verdana;}
{\colortbl;\red255\green255\blue255;\red127\green127\blue127;}
-\vieww9680\viewh15000\viewkind0
\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40\ql\qnatural
\f0\fs20 \cf0 \
@@ -55,6 +54,7 @@
Ryan Govostes\
Stephen Holt\
Peter Hosey\
+ Alan Humpherys\
Andreas Monitzer\
David Smith\
\
@@ -220,10 +220,7 @@
\cf0 Elliott Harris\
\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardeftab720\li100\slleading40\sb40\ql\qnatural
\cf0 Arno Hautala\
-\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li100\slleading40\sb40\ql\qnatural
-\cf0 Alan Humpherys\
-\pard\tx440\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardeftab720\li100\slleading40\sb40\ql\qnatural
-\cf0 Ian Krieg\
+ Ian Krieg\
Scott Lamb\
Keith Lea\
Sam McCandlish\
More information about the commits
mailing list