adium 2922:841d7fc22454: Resolve some warnings related to 64-bit...
commits at adium.im
commits at adium.im
Sun Nov 22 00:57:03 UTC 2009
details: http://hg.adium.im/adium/rev/841d7fc22454
revision: 2922:841d7fc22454
author: Evan Schoenberg
date: Sat Nov 21 18:23:14 2009 -0600
Resolve some warnings related to 64-bit compilation
Subject: adium 2923:e3119900476d: Backed out changeset 68d1a7f1f4e4: This messed up highlighting weirdly. Will return to it later.
details: http://hg.adium.im/adium/rev/e3119900476d
revision: 2923:e3119900476d
author: Evan Schoenberg
date: Sat Nov 21 18:23:33 2009 -0600
Backed out changeset 68d1a7f1f4e4: This messed up highlighting weirdly. Will return to it later.
Subject: adium 2924:629e1040f326: Backed out changeset b86536983564: As with previous reversion, back out change which removed an override of a private method I didn't think we need but which appears to have created odd behavior... despite not seemingly being called. Hm.
details: http://hg.adium.im/adium/rev/629e1040f326
revision: 2924:629e1040f326
author: Evan Schoenberg
date: Sat Nov 21 18:24:21 2009 -0600
Backed out changeset b86536983564: As with previous reversion, back out change which removed an override of a private method I didn't think we need but which appears to have created odd behavior... despite not seemingly being called. Hm.
Subject: adium 2925:c7768d19a729: Trying to merge back into a single head.
details: http://hg.adium.im/adium/rev/c7768d19a729
revision: 2925:c7768d19a729
author: Evan Schoenberg
date: Sat Nov 21 18:59:22 2009 -0600
Trying to merge back into a single head.
Subject: adium 2926:5fc6fee2f659: Debug logging for moving objects around. Refs #12096
details: http://hg.adium.im/adium/rev/5fc6fee2f659
revision: 2926:5fc6fee2f659
author: Evan Schoenberg
date: Sat Nov 21 19:00:15 2009 -0600
Debug logging for moving objects around. Refs #12096
Subject: adium 2927:a69b09404fae: Merge
details: http://hg.adium.im/adium/rev/a69b09404fae
revision: 2927:a69b09404fae
author: Evan Schoenberg
date: Sat Nov 21 19:00:31 2009 -0600
Merge
diffs (122 lines):
diff -r aa0447480f67 -r a69b09404fae Frameworks/Adium Framework/Source/AIListCell.h
--- a/Frameworks/Adium Framework/Source/AIListCell.h Sat Nov 21 18:15:12 2009 -0600
+++ b/Frameworks/Adium Framework/Source/AIListCell.h Sat Nov 21 19:00:31 2009 -0600
@@ -77,6 +77,7 @@
//Drawing
- (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)controlView;
- (void)drawInteriorWithFrame:(NSRect)cellFrame inView:(NSView *)controlView;
+- (void)_drawHighlightWithFrame:(NSRect)cellFrame inView:(NSView *)controlView;
- (void)drawSelectionWithFrame:(NSRect)rect;
- (void)drawBackgroundWithFrame:(NSRect)rect;
- (void)drawContentWithFrame:(NSRect)rect;
diff -r aa0447480f67 -r a69b09404fae Frameworks/Adium Framework/Source/AIListCell.m
--- a/Frameworks/Adium Framework/Source/AIListCell.m Sat Nov 21 18:15:12 2009 -0600
+++ b/Frameworks/Adium Framework/Source/AIListCell.m Sat Nov 21 19:00:31 2009 -0600
@@ -204,6 +204,19 @@
}
}
+#warning It's quite possible that we don't need to use this private method.
+//Custom highlighting (This is a private cell method we're overriding that handles selection drawing)
+- (void)_drawHighlightWithFrame:(NSRect)cellFrame inView:(NSView *)inControlView
+{
+ //Cell spacing
+ cellFrame.origin.y += [self topSpacing];
+ cellFrame.size.height -= [self bottomSpacing] + [self topSpacing];
+ cellFrame.origin.x += [self leftSpacing];
+ cellFrame.size.width -= [self rightSpacing] + [self leftSpacing];
+
+ [self drawSelectionWithFrame:cellFrame];
+}
+
//Draw Selection
- (void)drawSelectionWithFrame:(NSRect)rect {}
diff -r aa0447480f67 -r a69b09404fae Frameworks/Adium Framework/Source/AIListObject.m
--- a/Frameworks/Adium Framework/Source/AIListObject.m Sat Nov 21 18:15:12 2009 -0600
+++ b/Frameworks/Adium Framework/Source/AIListObject.m Sat Nov 21 19:00:31 2009 -0600
@@ -238,7 +238,9 @@
* Dropping between Away Contact and Offline Contact should make an Away Contact be > 120 but an Offline Contact be < 110.
* Only the sort controller knows the answer as to where this contact should be positioned in the end.
*/
-
+ AILogWithSignature(@"%@: Moving %@ into %@'s index %i using order index %f (between %@ and %@)",
+ container, listObject, container.containedObjects, index,
+ (nextHighest + nextLowest) / 2.0, nextObject, previousObject);
[container listObject: listObject didSetOrderIndex: (nextHighest + nextLowest) / 2.0];
}
}
diff -r aa0447480f67 -r a69b09404fae Plugins/Purple Service/adiumPurpleEventloop.m
--- a/Plugins/Purple Service/adiumPurpleEventloop.m Sat Nov 21 18:15:12 2009 -0600
+++ b/Plugins/Purple Service/adiumPurpleEventloop.m Sat Nov 21 19:00:31 2009 -0600
@@ -383,9 +383,9 @@
}
}
-gint adium_input_get_error(gint fd, NSInteger *error)
+int adium_input_get_error(int fd, int *error)
{
- gint ret;
+ int ret;
socklen_t len;
len = sizeof(*error);
@@ -436,7 +436,10 @@
adium_input_add,
adium_source_remove,
adium_input_get_error,
- /* timeout_add_seconds */ NULL
+ /* timeout_add_seconds */ NULL,
+ /* _purple_reserved2 */ NULL,
+ /* _purple_reserved3 */ NULL,
+ /* _purple_reserved4 */ NULL
};
PurpleEventLoopUiOps *adium_purple_eventloop_get_ui_ops(void)
diff -r aa0447480f67 -r a69b09404fae Plugins/Purple Service/libpurple_extensions/ssl-cdsa.c
--- a/Plugins/Purple Service/libpurple_extensions/ssl-cdsa.c Sat Nov 21 18:15:12 2009 -0600
+++ b/Plugins/Purple Service/libpurple_extensions/ssl-cdsa.c Sat Nov 21 19:00:31 2009 -0600
@@ -27,6 +27,14 @@
#ifdef HAVE_CDSA
+#if __LP64__ || NS_BUILD_32_LIKE_64
+typedef long NSInteger;
+typedef unsigned long NSUInteger;
+#else
+typedef int NSInteger;
+typedef unsigned int NSUInteger;
+#endif
+
//#define CDSA_DEBUG
#import <Security/Security.h>
@@ -183,7 +191,7 @@
UInt32 bytesToGo = *dataLength;
UInt32 initLen = bytesToGo;
UInt8 *currData = (UInt8 *)data;
- int sock = (int)connection;
+ NSInteger sock = (NSInteger)connection;
OSStatus rtn = noErr;
UInt32 bytesRead;
int rrtn;
@@ -239,8 +247,8 @@
size_t *dataLength) /* IN/OUT */
{
UInt32 bytesSent = 0;
- int sock = (int)connection;
- UInt32 length;
+ NSInteger sock = (NSInteger)connection;
+ UInt32 length;
UInt32 dataLen = *dataLength;
const UInt8 *dataPtr = (UInt8 *)data;
OSStatus ortn;
@@ -319,7 +327,7 @@
/*
* Pass the connection information to the connection to be used by our callbacks
*/
- err = (OSStatus)SSLSetConnection(cdsa_data->ssl_ctx,(SSLConnectionRef)gsc->fd);
+ err = (OSStatus)SSLSetConnection(cdsa_data->ssl_ctx, (SSLConnectionRef)gsc->fd);
if (err != noErr) {
purple_debug_error("cdsa", "SSLSetConnection failed\n");
if (gsc->error_cb != NULL)
More information about the commits
mailing list