adium-1.4 3058:c1671ceace58: Backed out changeset 19722a7790df (...
commits at adium.im
commits at adium.im
Fri Sep 24 01:02:45 UTC 2010
details: http://hg.adium.im/adium-1.4/rev/c1671ceace58
revision: 3058:c1671ceace58
author: Evan Schoenberg
date: Thu Sep 23 20:02:21 2010 -0500
Backed out changeset 19722a7790df (it was pointed out that the header file already performs this check).
Subject: adium-1.4 3059:2e7c96a59ede: It was pointed out that the header file already performs this check.
details: http://hg.adium.im/adium-1.4/rev/2e7c96a59ede
revision: 3059:2e7c96a59ede
author: Evan Schoenberg
date: Thu Sep 23 20:02:30 2010 -0500
It was pointed out that the header file already performs this check.
diffs (947 lines):
diff -r 19722a7790df -r 2e7c96a59ede Adium.xcodeproj/project.pbxproj
--- a/Adium.xcodeproj/project.pbxproj Sun Sep 19 16:01:38 2010 -0500
+++ b/Adium.xcodeproj/project.pbxproj Thu Sep 23 20:02:30 2010 -0500
@@ -9514,6 +9514,7 @@
};
buildConfigurationList = DADE8E3A085507450062B664 /* Build configuration list for PBXProject "Adium" */;
compatibilityVersion = "Xcode 3.1";
+ developmentRegion = English;
hasScannedForEncodings = 1;
knownRegions = (
en,
@@ -12772,6 +12773,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E02A0FAF9BA800B310AC /* Debug.xcconfig */;
buildSettings = {
+ GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
};
name = Debug;
};
@@ -12779,6 +12781,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E02B0FAF9BA800B310AC /* Release.xcconfig */;
buildSettings = {
+ GCC_WARN_UNINITIALIZED_AUTOS = YES;
MACOSX_DEPLOYMENT_TARGET = 10.5;
};
name = Release;
@@ -12787,6 +12790,8 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 63C7E02C0FAF9BA800B310AC /* Release-Debug.xcconfig */;
buildSettings = {
+ GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
+ IBC_STRIP_NIBS = NO;
};
name = "Release-Debug";
};
diff -r 19722a7790df -r 2e7c96a59ede Frameworks/Adium Framework/Source/AIAddressBookController.m
--- a/Frameworks/Adium Framework/Source/AIAddressBookController.m Sun Sep 19 16:01:38 2010 -0500
+++ b/Frameworks/Adium Framework/Source/AIAddressBookController.m Thu Sep 23 20:02:30 2010 -0500
@@ -274,54 +274,32 @@
if (inModifiedKeys == nil) { //Only perform this when updating for all list objects or when a contact is created
ABPerson *person = [listContact addressBookPerson];
- if (person) {
- if (enableImport) {
- //Load the name if appropriate
- AIMutableOwnerArray *displayNameArray, *phoneticNameArray;
- NSString *displayName, *phoneticName = nil;
-
- displayNameArray = [listContact displayArrayForKey:@"Display Name"];
-
- displayName = [self nameForPerson:person phonetic:&phoneticName];
+ if (person && enableImport) {
+ //Load the name if appropriate
+ AIMutableOwnerArray *displayNameArray, *phoneticNameArray;
+ NSString *displayName, *phoneticName = nil;
+
+ displayNameArray = [listContact displayArrayForKey:@"Display Name"];
+
+ displayName = [self nameForPerson:person phonetic:&phoneticName];
+
+ //Apply the values
+ NSString *oldValue = [displayNameArray objectWithOwner:self];
+ if (!oldValue || ![oldValue isEqualToString:displayName]) {
+ [displayNameArray setObject:displayName withOwner:self];
+ modifiedAttributes = [NSSet setWithObject:@"Display Name"];
+ }
+
+ if (phoneticName) {
+ phoneticNameArray = [listContact displayArrayForKey:@"Phonetic Name"];
//Apply the values
- NSString *oldValue = [displayNameArray objectWithOwner:self];
- if (!oldValue || ![oldValue isEqualToString:displayName]) {
- [displayNameArray setObject:displayName withOwner:self];
- modifiedAttributes = [NSSet setWithObject:@"Display Name"];
+ oldValue = [phoneticNameArray objectWithOwner:self];
+ if (!oldValue || ![oldValue isEqualToString:phoneticName]) {
+ [phoneticNameArray setObject:phoneticName withOwner:self];
+ modifiedAttributes = [NSSet setWithObjects:@"Display Name", @"Phonetic Name", nil];
}
-
- if (phoneticName) {
- phoneticNameArray = [listContact displayArrayForKey:@"Phonetic Name"];
-
- //Apply the values
- oldValue = [phoneticNameArray objectWithOwner:self];
- if (!oldValue || ![oldValue isEqualToString:phoneticName]) {
- [phoneticNameArray setObject:phoneticName withOwner:self];
- modifiedAttributes = [NSSet setWithObjects:@"Display Name", @"Phonetic Name", nil];
- }
- } else {
- phoneticNameArray = [listContact displayArrayForKey:@"Phonetic Name"
- create:NO];
- //Clear any stored value
- if ([phoneticNameArray objectWithOwner:self]) {
- [displayNameArray setObject:nil withOwner:self];
- modifiedAttributes = [NSSet setWithObjects:@"Display Name", @"Phonetic Name", nil];
- }
- }
-
} else {
- AIMutableOwnerArray *displayNameArray, *phoneticNameArray;
-
- displayNameArray = [listContact displayArrayForKey:@"Display Name"
- create:NO];
-
- //Clear any stored value
- if ([displayNameArray objectWithOwner:self]) {
- [displayNameArray setObject:nil withOwner:self];
- modifiedAttributes = [NSSet setWithObject:@"Display Name"];
- }
-
phoneticNameArray = [listContact displayArrayForKey:@"Phonetic Name"
create:NO];
//Clear any stored value
@@ -329,21 +307,46 @@
[displayNameArray setObject:nil withOwner:self];
modifiedAttributes = [NSSet setWithObjects:@"Display Name", @"Phonetic Name", nil];
}
-
}
-
- //If we changed anything, request an update of the alias / long display name
- if (modifiedAttributes) {
- [[NSNotificationCenter defaultCenter] postNotificationName:Contact_ApplyDisplayName
- object:listContact
- userInfo:[NSDictionary dictionaryWithObject:[NSNumber numberWithBool:silent]
- forKey:@"Notify"]];
+
+ } else {
+ AIMutableOwnerArray *displayNameArray, *phoneticNameArray;
+
+ displayNameArray = [listContact displayArrayForKey:@"Display Name"
+ create:NO];
+
+ //Clear any stored value
+ if ([displayNameArray objectWithOwner:self]) {
+ [displayNameArray setObject:nil withOwner:self];
+ modifiedAttributes = [NSSet setWithObject:@"Display Name"];
}
-
- //Add this contact to the ABPerson's metacontact if it's not already there.
+
+ phoneticNameArray = [listContact displayArrayForKey:@"Phonetic Name"
+ create:NO];
+ //Clear any stored value
+ if ([phoneticNameArray objectWithOwner:self]) {
+ [phoneticNameArray setObject:nil withOwner:self];
+ modifiedAttributes = [NSSet setWithObjects:@"Display Name", @"Phonetic Name", nil];
+ }
+
+ }
+
+ //If we changed anything, request an update of the alias / long display name
+ if (modifiedAttributes) {
+ [[NSNotificationCenter defaultCenter] postNotificationName:Contact_ApplyDisplayName
+ object:listContact
+ userInfo:[NSDictionary dictionaryWithObject:[NSNumber numberWithBool:silent]
+ forKey:@"Notify"]];
+ }
+
+ //Add this contact to the ABPerson's metacontact if it's not already there.
+ if (person) {
AIMetaContact *personMetaContact;
if ((personMetaContact = [personUniqueIdToMetaContactDict objectForKey:[person uniqueId]]) &&
+ (personMetaContact != listContact) &&
![personMetaContact containsObject:listContact]) {
+ AILog(@"AIAddressBookController: personMetaContact = %@; listContact = %@; performing metacontact grouping",
+ personMetaContact, listContact);
[adium.contactController groupContacts:[NSArray arrayWithObjects:personMetaContact, listContact, nil]];
}
}
diff -r 19722a7790df -r 2e7c96a59ede Frameworks/Adium Framework/Source/AIChat.m
--- a/Frameworks/Adium Framework/Source/AIChat.m Sun Sep 19 16:01:38 2010 -0500
+++ b/Frameworks/Adium Framework/Source/AIChat.m Thu Sep 23 20:02:30 2010 -0500
@@ -44,6 +44,8 @@
- (id)initForAccount:(AIAccount *)inAccount;
- (void)clearUniqueChatID;
- (void)clearListObjectStatuses;
+
+- (AIListContact *)visibleObjectAtIndex:(NSUInteger)index;
@end
@implementation AIChat
@@ -431,7 +433,7 @@
- (AIListContact *)listObject
{
if (self.countOfContainedObjects == 1 && !self.isGroupChat) {
- return [self.containedObjects objectAtIndex:0];
+ return [self visibleObjectAtIndex:0];
}
return nil;
@@ -624,7 +626,7 @@
return [participatingContacts containsObjectIdenticalTo:inObject];
}
-- (id)visibleObjectAtIndex:(NSUInteger)index
+- (AIListContact *)visibleObjectAtIndex:(NSUInteger)index
{
return [participatingContacts objectAtIndex:index];
}
diff -r 19722a7790df -r 2e7c96a59ede Frameworks/Adium Framework/Source/AIContactObserverManager.m
--- a/Frameworks/Adium Framework/Source/AIContactObserverManager.m Sun Sep 19 16:01:38 2010 -0500
+++ b/Frameworks/Adium Framework/Source/AIContactObserverManager.m Thu Sep 23 20:02:30 2010 -0500
@@ -24,11 +24,9 @@
#import <Adium/AIMetaContact.h>
#import <Adium/AISortController.h>
-/*
- #ifdef DEBUG_BUILD
+#ifdef DEBUG_BUILD
#define CONTACT_OBSERVER_MEMORY_MANAGEMENT_DEBUG TRUE
- #endif
- */
+#endif
#ifdef CONTACT_OBSERVER_MEMORY_MANAGEMENT_DEBUG
#import <Foundation/NSDebug.h>
diff -r 19722a7790df -r 2e7c96a59ede Frameworks/Adium Framework/Source/AIListObject.m
--- a/Frameworks/Adium Framework/Source/AIListObject.m Sun Sep 19 16:01:38 2010 -0500
+++ b/Frameworks/Adium Framework/Source/AIListObject.m Thu Sep 23 20:02:30 2010 -0500
@@ -161,6 +161,7 @@
- (NSSet *) groups
{
+#warning Very inefficient
return [[m_groups copy] autorelease];
}
diff -r 19722a7790df -r 2e7c96a59ede Frameworks/Adium Framework/Source/ESDebugAILog.m
--- a/Frameworks/Adium Framework/Source/ESDebugAILog.m Sun Sep 19 16:01:38 2010 -0500
+++ b/Frameworks/Adium Framework/Source/ESDebugAILog.m Thu Sep 23 20:02:30 2010 -0500
@@ -58,8 +58,6 @@
}
void AILog_impl (NSString *format, ...) {
- if (!AIDebugLoggingEnabled) return;
-
va_list ap; /* Points to each unamed argument in turn */
NSString *debugMessage;
@@ -74,8 +72,6 @@
}
void AILogWithPrefix_impl (const char *prefix, NSString *format, ...) {
- if (!AIDebugLoggingEnabled) return;
-
va_list ap; /* Points to each unamed argument in turn */
NSString *debugMessage, *actualMessage;
diff -r 19722a7790df -r 2e7c96a59ede Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/fr.lproj
--- a/Frameworks/Sparkle.framework/Versions/A/Resources/fr.lproj/fr.lproj Sun Sep 19 16:01:38 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-fr.lproj
\ No newline at end of file
diff -r 19722a7790df -r 2e7c96a59ede Frameworks/libglib.framework/Versions/2.0.0/Headers/gobject/gmarshal.h
--- a/Frameworks/libglib.framework/Versions/2.0.0/Headers/gobject/gmarshal.h Sun Sep 19 16:01:38 2010 -0500
+++ b/Frameworks/libglib.framework/Versions/2.0.0/Headers/gobject/gmarshal.h Thu Sep 23 20:02:30 2010 -0500
@@ -3,7 +3,7 @@
G_BEGIN_DECLS
-/* VOID:VOID (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:26) */
+/* VOID:VOID (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:26) */
extern void g_cclosure_marshal_VOID__VOID (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -11,7 +11,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:BOOLEAN (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:27) */
+/* VOID:BOOLEAN (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:27) */
extern void g_cclosure_marshal_VOID__BOOLEAN (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -19,7 +19,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:CHAR (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:28) */
+/* VOID:CHAR (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:28) */
extern void g_cclosure_marshal_VOID__CHAR (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -27,7 +27,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:UCHAR (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:29) */
+/* VOID:UCHAR (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:29) */
extern void g_cclosure_marshal_VOID__UCHAR (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -35,7 +35,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:INT (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:30) */
+/* VOID:INT (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:30) */
extern void g_cclosure_marshal_VOID__INT (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -43,7 +43,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:UINT (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:31) */
+/* VOID:UINT (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:31) */
extern void g_cclosure_marshal_VOID__UINT (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -51,7 +51,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:LONG (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:32) */
+/* VOID:LONG (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:32) */
extern void g_cclosure_marshal_VOID__LONG (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -59,7 +59,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:ULONG (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:33) */
+/* VOID:ULONG (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:33) */
extern void g_cclosure_marshal_VOID__ULONG (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -67,7 +67,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:ENUM (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:34) */
+/* VOID:ENUM (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:34) */
extern void g_cclosure_marshal_VOID__ENUM (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -75,7 +75,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:FLAGS (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:35) */
+/* VOID:FLAGS (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:35) */
extern void g_cclosure_marshal_VOID__FLAGS (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -83,7 +83,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:FLOAT (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:36) */
+/* VOID:FLOAT (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:36) */
extern void g_cclosure_marshal_VOID__FLOAT (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -91,7 +91,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:DOUBLE (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:37) */
+/* VOID:DOUBLE (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:37) */
extern void g_cclosure_marshal_VOID__DOUBLE (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -99,7 +99,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:STRING (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:38) */
+/* VOID:STRING (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:38) */
extern void g_cclosure_marshal_VOID__STRING (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -107,7 +107,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:PARAM (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:39) */
+/* VOID:PARAM (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:39) */
extern void g_cclosure_marshal_VOID__PARAM (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -115,7 +115,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:BOXED (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:40) */
+/* VOID:BOXED (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:40) */
extern void g_cclosure_marshal_VOID__BOXED (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -123,7 +123,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:POINTER (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:41) */
+/* VOID:POINTER (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:41) */
extern void g_cclosure_marshal_VOID__POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -131,7 +131,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:OBJECT (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:42) */
+/* VOID:OBJECT (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:42) */
extern void g_cclosure_marshal_VOID__OBJECT (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -139,7 +139,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:UINT,POINTER (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:45) */
+/* VOID:UINT,POINTER (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:45) */
extern void g_cclosure_marshal_VOID__UINT_POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -147,7 +147,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* BOOL:FLAGS (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:46) */
+/* BOOL:FLAGS (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:46) */
extern void g_cclosure_marshal_BOOLEAN__FLAGS (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -156,7 +156,7 @@
gpointer marshal_data);
#define g_cclosure_marshal_BOOL__FLAGS g_cclosure_marshal_BOOLEAN__FLAGS
-/* STRING:OBJECT,POINTER (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:47) */
+/* STRING:OBJECT,POINTER (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:47) */
extern void g_cclosure_marshal_STRING__OBJECT_POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
diff -r 19722a7790df -r 2e7c96a59ede Frameworks/libglib.framework/Versions/2.0.0/libglib
Binary file Frameworks/libglib.framework/Versions/2.0.0/libglib has changed
diff -r 19722a7790df -r 2e7c96a59ede Frameworks/libgmodule.framework/Versions/2.0.0/libgmodule
Binary file Frameworks/libgmodule.framework/Versions/2.0.0/libgmodule has changed
diff -r 19722a7790df -r 2e7c96a59ede Frameworks/libgobject.framework/Versions/2.0.0/Headers/gmarshal.h
--- a/Frameworks/libgobject.framework/Versions/2.0.0/Headers/gmarshal.h Sun Sep 19 16:01:38 2010 -0500
+++ b/Frameworks/libgobject.framework/Versions/2.0.0/Headers/gmarshal.h Thu Sep 23 20:02:30 2010 -0500
@@ -3,7 +3,7 @@
G_BEGIN_DECLS
-/* VOID:VOID (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:26) */
+/* VOID:VOID (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:26) */
extern void g_cclosure_marshal_VOID__VOID (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -11,7 +11,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:BOOLEAN (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:27) */
+/* VOID:BOOLEAN (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:27) */
extern void g_cclosure_marshal_VOID__BOOLEAN (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -19,7 +19,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:CHAR (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:28) */
+/* VOID:CHAR (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:28) */
extern void g_cclosure_marshal_VOID__CHAR (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -27,7 +27,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:UCHAR (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:29) */
+/* VOID:UCHAR (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:29) */
extern void g_cclosure_marshal_VOID__UCHAR (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -35,7 +35,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:INT (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:30) */
+/* VOID:INT (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:30) */
extern void g_cclosure_marshal_VOID__INT (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -43,7 +43,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:UINT (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:31) */
+/* VOID:UINT (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:31) */
extern void g_cclosure_marshal_VOID__UINT (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -51,7 +51,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:LONG (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:32) */
+/* VOID:LONG (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:32) */
extern void g_cclosure_marshal_VOID__LONG (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -59,7 +59,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:ULONG (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:33) */
+/* VOID:ULONG (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:33) */
extern void g_cclosure_marshal_VOID__ULONG (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -67,7 +67,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:ENUM (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:34) */
+/* VOID:ENUM (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:34) */
extern void g_cclosure_marshal_VOID__ENUM (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -75,7 +75,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:FLAGS (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:35) */
+/* VOID:FLAGS (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:35) */
extern void g_cclosure_marshal_VOID__FLAGS (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -83,7 +83,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:FLOAT (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:36) */
+/* VOID:FLOAT (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:36) */
extern void g_cclosure_marshal_VOID__FLOAT (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -91,7 +91,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:DOUBLE (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:37) */
+/* VOID:DOUBLE (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:37) */
extern void g_cclosure_marshal_VOID__DOUBLE (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -99,7 +99,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:STRING (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:38) */
+/* VOID:STRING (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:38) */
extern void g_cclosure_marshal_VOID__STRING (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -107,7 +107,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:PARAM (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:39) */
+/* VOID:PARAM (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:39) */
extern void g_cclosure_marshal_VOID__PARAM (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -115,7 +115,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:BOXED (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:40) */
+/* VOID:BOXED (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:40) */
extern void g_cclosure_marshal_VOID__BOXED (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -123,7 +123,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:POINTER (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:41) */
+/* VOID:POINTER (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:41) */
extern void g_cclosure_marshal_VOID__POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -131,7 +131,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:OBJECT (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:42) */
+/* VOID:OBJECT (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:42) */
extern void g_cclosure_marshal_VOID__OBJECT (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -139,7 +139,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:UINT,POINTER (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:45) */
+/* VOID:UINT,POINTER (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:45) */
extern void g_cclosure_marshal_VOID__UINT_POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -147,7 +147,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* BOOL:FLAGS (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:46) */
+/* BOOL:FLAGS (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:46) */
extern void g_cclosure_marshal_BOOLEAN__FLAGS (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -156,7 +156,7 @@
gpointer marshal_data);
#define g_cclosure_marshal_BOOL__FLAGS g_cclosure_marshal_BOOLEAN__FLAGS
-/* STRING:OBJECT,POINTER (/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:47) */
+/* STRING:OBJECT,POINTER (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/glib-2.16.6/gobject/gmarshal.list:47) */
extern void g_cclosure_marshal_STRING__OBJECT_POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
diff -r 19722a7790df -r 2e7c96a59ede Frameworks/libgobject.framework/Versions/2.0.0/libgobject
Binary file Frameworks/libgobject.framework/Versions/2.0.0/libgobject has changed
diff -r 19722a7790df -r 2e7c96a59ede Frameworks/libgthread.framework/Versions/2.0.0/libgthread
Binary file Frameworks/libgthread.framework/Versions/2.0.0/libgthread has changed
diff -r 19722a7790df -r 2e7c96a59ede Frameworks/libintl.framework/Versions/8/libintl
Binary file Frameworks/libintl.framework/Versions/8/libintl has changed
diff -r 19722a7790df -r 2e7c96a59ede Frameworks/libjson-glib.framework/Versions/1.0.0/Headers/json-enum-types.h
--- a/Frameworks/libjson-glib.framework/Versions/1.0.0/Headers/json-enum-types.h Sun Sep 19 16:01:38 2010 -0500
+++ b/Frameworks/libjson-glib.framework/Versions/1.0.0/Headers/json-enum-types.h Thu Sep 23 20:02:30 2010 -0500
@@ -12,11 +12,11 @@
G_BEGIN_DECLS
-/* enumerations from "/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/json-glib-0.9.2/json-glib/json-parser.h" */
+/* enumerations from "/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/json-glib-0.9.2/json-glib/json-parser.h" */
GType json_parser_error_get_type (void) G_GNUC_CONST;
#define JSON_TYPE_PARSER_ERROR (json_parser_error_get_type())
-/* enumerations from "/Users/wixardy/dev/adium/adium-1.4/Utilities/dep-build-scripts/source/json-glib-0.9.2/json-glib/json-types.h" */
+/* enumerations from "/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/json-glib-0.9.2/json-glib/json-types.h" */
GType json_node_type_get_type (void) G_GNUC_CONST;
#define JSON_TYPE_NODE_TYPE (json_node_type_get_type())
diff -r 19722a7790df -r 2e7c96a59ede Frameworks/libjson-glib.framework/Versions/1.0.0/libjson-glib
Binary file Frameworks/libjson-glib.framework/Versions/1.0.0/libjson-glib has changed
diff -r 19722a7790df -r 2e7c96a59ede Frameworks/libmeanwhile.framework/Versions/1/libmeanwhile
Binary file Frameworks/libmeanwhile.framework/Versions/1/libmeanwhile has changed
diff -r 19722a7790df -r 2e7c96a59ede Frameworks/libpurple.framework/Versions/0/Headers/marshallers.h
--- a/Frameworks/libpurple.framework/Versions/0/Headers/marshallers.h Sun Sep 19 16:01:38 2010 -0500
+++ b/Frameworks/libpurple.framework/Versions/0/Headers/marshallers.h Thu Sep 23 20:02:30 2010 -0500
@@ -6,7 +6,7 @@
G_BEGIN_DECLS
-/* VOID:POINTER,POINTER,OBJECT (/Users/wixardy/dev/pidgin/1.4/libpurple/marshallers.list:1) */
+/* VOID:POINTER,POINTER,OBJECT (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/im.pidgin.adium.1-4/libpurple/marshallers.list:1) */
extern void purple_smarshal_VOID__POINTER_POINTER_OBJECT (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -14,7 +14,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* BOOLEAN:OBJECT,POINTER,STRING (/Users/wixardy/dev/pidgin/1.4/libpurple/marshallers.list:2) */
+/* BOOLEAN:OBJECT,POINTER,STRING (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/im.pidgin.adium.1-4/libpurple/marshallers.list:2) */
extern void purple_smarshal_BOOLEAN__OBJECT_POINTER_STRING (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -22,7 +22,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:STRING,STRING (/Users/wixardy/dev/pidgin/1.4/libpurple/marshallers.list:3) */
+/* VOID:STRING,STRING (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/im.pidgin.adium.1-4/libpurple/marshallers.list:3) */
extern void purple_smarshal_VOID__STRING_STRING (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -30,7 +30,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:STRING,STRING,DOUBLE (/Users/wixardy/dev/pidgin/1.4/libpurple/marshallers.list:4) */
+/* VOID:STRING,STRING,DOUBLE (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/im.pidgin.adium.1-4/libpurple/marshallers.list:4) */
extern void purple_smarshal_VOID__STRING_STRING_DOUBLE (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -38,7 +38,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:ENUM,STRING,STRING (/Users/wixardy/dev/pidgin/1.4/libpurple/marshallers.list:5) */
+/* VOID:ENUM,STRING,STRING (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/im.pidgin.adium.1-4/libpurple/marshallers.list:5) */
extern void purple_smarshal_VOID__ENUM_STRING_STRING (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -46,7 +46,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:ENUM,STRING,STRING,BOOLEAN (/Users/wixardy/dev/pidgin/1.4/libpurple/marshallers.list:6) */
+/* VOID:ENUM,STRING,STRING,BOOLEAN (/Users/evands/adium-1.4/Utilities/dep-build-scripts/source/im.pidgin.adium.1-4/libpurple/marshallers.list:6) */
extern void purple_smarshal_VOID__ENUM_STRING_STRING_BOOLEAN (GClosure *closure,
GValue *return_value,
guint n_param_values,
diff -r 19722a7790df -r 2e7c96a59ede Frameworks/libpurple.framework/Versions/0/Headers/session.h
--- a/Frameworks/libpurple.framework/Versions/0/Headers/session.h Sun Sep 19 16:01:38 2010 -0500
+++ b/Frameworks/libpurple.framework/Versions/0/Headers/session.h Thu Sep 23 20:02:30 2010 -0500
@@ -59,6 +59,8 @@
#define MSN_LOGIN_STEPS MSN_LOGIN_STEP_END
+#define MSN_LOGIN_FQY_TIMEOUT 30
+
#include "group.h"
#include "httpconn.h"
#include "nexus.h"
@@ -83,6 +85,7 @@
gboolean connected;
gboolean logged_in; /**< A temporal flag to ignore local buddy list adds. */
int adl_fqy; /**< A count of ADL/FQY so status is only changed once. */
+ guint login_timeout; /**< Timeout to force status change if ADL/FQY fail. */
gboolean destroying; /**< A flag that states if the session is being destroyed. */
gboolean http_method;
@@ -213,7 +216,16 @@
const char *info);
/**
- * Sets the current step in the login proccess.
+ * Starts a timeout to initiate finishing login. Sometimes the server ignores
+ * our FQY requests, so this forces ourselves online eventually.
+ *
+ * @param session The MSN session.
+ */
+void
+msn_session_activate_login_timeout(MsnSession *session);
+
+/**
+ * Sets the current step in the login process.
*
* @param session The MSN session.
* @param step The current step.
diff -r 19722a7790df -r 2e7c96a59ede Frameworks/libpurple.framework/Versions/0/libpurple
Binary file Frameworks/libpurple.framework/Versions/0/libpurple has changed
diff -r 19722a7790df -r 2e7c96a59ede Plists/Info.plist
--- a/Plists/Info.plist Sun Sep 19 16:01:38 2010 -0500
+++ b/Plists/Info.plist Thu Sep 23 20:02:30 2010 -0500
@@ -354,7 +354,7 @@
<key>CFBundleExecutable</key>
<string>Adium</string>
<key>CFBundleGetInfoString</key>
- <string>1.4b18, Copyright 2001-2010 The Adium Team</string>
+ <string>1.4b19, Copyright 2001-2010 The Adium Team</string>
<key>CFBundleHelpBookFolder</key>
<string>AdiumHelp</string>
<key>CFBundleHelpBookName</key>
@@ -370,7 +370,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>1.4b18</string>
+ <string>1.4b19</string>
<key>CFBundleSignature</key>
<string>AdIM</string>
<key>CFBundleURLTypes</key>
@@ -469,7 +469,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
- <string>1.4b18</string>
+ <string>1.4b19</string>
<key>LSMinimumSystemVersion</key>
<string>10.5.8</string>
<key>LSRequiresNativeExecution</key>
diff -r 19722a7790df -r 2e7c96a59ede Plugins/Purple Service/CBPurpleAccount.m
--- a/Plugins/Purple Service/CBPurpleAccount.m Sun Sep 19 16:01:38 2010 -0500
+++ b/Plugins/Purple Service/CBPurpleAccount.m Thu Sep 23 20:02:30 2010 -0500
@@ -810,6 +810,8 @@
for (NSDictionary *user in users) {
AIListContact *contact = [self contactWithUID:[user objectForKey:@"UID"]];
+ AILogWithSignature(@"%@ join %@", chat, contact);
+
[contact setOnline:YES notify:NotifyNever silently:YES];
[newListObjects addObject:contact];
@@ -2775,12 +2777,17 @@
//Subclasses may override to provide a localized label and/or prevent a specified label from being shown
- (NSString *)titleForContactMenuLabel:(const char *)label forContact:(AIListContact *)inContact
{
- /* Remove the underscore 'hints' which libpurple includes for gtk usage */
- return [[NSString stringWithUTF8String:label] stringByReplacingOccurrencesOfString:@"_" withString:@""];
+ if ((strcmp(label, _("Initiate Chat")) == 0) || (strcmp(label, _("Initiate _Chat")) == 0)) {
+ return [NSString stringWithFormat:AILocalizedString(@"Initiate Multiuser Chat with %@",nil), inContact.formattedUID];
+
+ } else {
+ /* Remove the underscore 'hints' which libpurple includes for gtk usage */
+ return [[NSString stringWithUTF8String:label] stringByReplacingOccurrencesOfString:@"_" withString:@""];
+ }
}
/*!
-* @brief Menu items for the account's actions
+ * @brief Menu items for the account's actions
*
* Returns an array of menu items for account-specific actions. This is the best place to add protocol-specific
* actions that aren't otherwise supported by Adium. It will only be queried if the account is online.
diff -r 19722a7790df -r 2e7c96a59ede Plugins/Purple Service/ESPurpleJabberAccount.m
--- a/Plugins/Purple Service/ESPurpleJabberAccount.m Sun Sep 19 16:01:38 2010 -0500
+++ b/Plugins/Purple Service/ESPurpleJabberAccount.m Thu Sep 23 20:02:30 2010 -0500
@@ -48,6 +48,11 @@
@implementation ESPurpleJabberAccount
+- (void)initAccount
+{
+ [super initAccount];
+}
+
/*!
* @brief The UID will be changed. The account has a chance to perform modifications
*
@@ -97,6 +102,8 @@
{
[xmlConsoleController close];
[xmlConsoleController release];
+ [adhocServer release];
+ [gateways release];
[super dealloc];
}
@@ -172,6 +179,9 @@
* This preference and the changes for it are added via the "libpurple_jabber_avoid_sasl_option_hack.diff" patch we apply during the build process.
*/
purple_prefs_set_bool("/plugins/prpl/jabber/avoid_sasl_for_plain_auth", YES);
+
+ if (!adhocServer)
+ adhocServer = [[AMPurpleJabberAdHocServer alloc] initWithAccount:self];
}
- (NSString *)serverSuffix
@@ -502,19 +512,19 @@
#pragma mark Menu items
- (NSString *)titleForContactMenuLabel:(const char *)label forContact:(AIListContact *)inContact
{
- if (strcmp(label, "Un-hide From") == 0) {
+ if (strcmp(label, _("Un-hide From")) == 0) {
return [NSString stringWithFormat:AILocalizedString(@"Un-hide From %@",nil),inContact.formattedUID];
- } else if (strcmp(label, "Temporarily Hide From") == 0) {
+ } else if (strcmp(label, _("Temporarily Hide From")) == 0) {
return [NSString stringWithFormat:AILocalizedString(@"Temporarily Hide From %@",nil),inContact.formattedUID];
- } else if (strcmp(label, "Unsubscribe") == 0) {
+ } else if (strcmp(label, _("Unsubscribe")) == 0) {
return [NSString stringWithFormat:AILocalizedString(@"Unsubscribe %@",nil),inContact.formattedUID];
- } else if (strcmp(label, "(Re-)Request authorization") == 0) {
+ } else if (strcmp(label, _("(Re-)Request authorization")) == 0) {
return [NSString stringWithFormat:AILocalizedString(@"Re-request Authorization from %@",nil),inContact.formattedUID];
- } else if (strcmp(label, "Cancel Presence Notification") == 0) {
+ } else if (strcmp(label, _("Cancel Presence Notification")) == 0) {
return [NSString stringWithFormat:AILocalizedString(@"Cancel Presence Notification to %@",nil),inContact.formattedUID];
} else if (strcmp(label, _("Ping")) == 0) {
@@ -527,16 +537,16 @@
- (NSString *)titleForAccountActionMenuLabel:(const char *)label
{
- if (strcmp(label, "Set User Info...") == 0) {
+ if (strcmp(label, _("Set User Info...")) == 0) {
return [AILocalizedString(@"Set User Info", nil) stringByAppendingEllipsis];
- } else if (strcmp(label, "Search for Users...") == 0) {
+ } else if (strcmp(label, _("Search for Users...")) == 0) {
return [AILocalizedString(@"Search for Users", nil) stringByAppendingEllipsis];
- } else if (strcmp(label, "Set Mood...") == 0) {
+ } else if (strcmp(label, _("Set Mood...")) == 0) {
return [AILocalizedString(@"Set Mood", nil) stringByAppendingEllipsis];
- } else if (strcmp(label, "Set Nickname...") == 0) {
+ } else if (strcmp(label, _("Set Nickname...")) == 0) {
return [AILocalizedString(@"Set Nickname", nil) stringByAppendingEllipsis];
}
@@ -730,8 +740,6 @@
[gateways release];
gateways = [[NSMutableArray alloc] init];
- [adhocServer release];
- adhocServer = [[AMPurpleJabberAdHocServer alloc] initWithAccount:self];
[adhocServer addCommand:@"ping" delegate:(id<AMPurpleJabberAdHocServerDelegate>)[AMPurpleJabberAdHocPing class] name:@"Ping"];
[super didConnect];
diff -r 19722a7790df -r 2e7c96a59ede Plugins/Purple Service/ESPurpleMSNAccount.m
--- a/Plugins/Purple Service/ESPurpleMSNAccount.m Sun Sep 19 16:01:38 2010 -0500
+++ b/Plugins/Purple Service/ESPurpleMSNAccount.m Thu Sep 23 20:02:30 2010 -0500
@@ -531,10 +531,7 @@
#pragma mark Contact List Menu Items
- (NSString *)titleForContactMenuLabel:(const char *)label forContact:(AIListContact *)inContact
{
- if ((strcmp(label, _("Initiate Chat")) == 0) || (strcmp(label, _("Initiate _Chat")) == 0)) {
- return [NSString stringWithFormat:AILocalizedString(@"Initiate Multiuser Chat with %@",nil),inContact.formattedUID];
-
- } else if (strcmp(label, _("Send to Mobile")) == 0) {
+ if (strcmp(label, _("Send to Mobile")) == 0) {
return [NSString stringWithFormat:AILocalizedString(@"Send to %@'s Mobile",nil),inContact.formattedUID];
}
diff -r 19722a7790df -r 2e7c96a59ede Plugins/Purple Service/ESPurpleMeanwhileAccount.m
--- a/Plugins/Purple Service/ESPurpleMeanwhileAccount.m Sun Sep 19 16:01:38 2010 -0500
+++ b/Plugins/Purple Service/ESPurpleMeanwhileAccount.m Thu Sep 23 20:02:30 2010 -0500
@@ -183,10 +183,10 @@
#pragma mark Account Action Menu Items
- (NSString *)titleForAccountActionMenuLabel:(const char *)label
{
- if (strcmp(label, "Import Sametime List...") == 0) {
+ if (strcmp(label, _("Import Sametime List...")) == 0) {
return AILocalizedString(@"Import Sametime List...",nil);
- } else if (strcmp(label, "Export Sametime List...") == 0) {
+ } else if (strcmp(label, _("Export Sametime List...")) == 0) {
return AILocalizedString(@"Export Sametime List...",nil);
}
diff -r 19722a7790df -r 2e7c96a59ede Release/Makefile
--- a/Release/Makefile Sun Sep 19 16:01:38 2010 -0500
+++ b/Release/Makefile Thu Sep 23 20:02:30 2010 -0500
@@ -17,7 +17,7 @@
# - make all
###########
-VERSION=1.4b18
+VERSION=1.4b19
BUILD_IN_DEBUG_MODE?=TRUE
BETA?=TRUE
OFFICIAL_BUILD?=TRUE
More information about the commits
mailing list