adium/adium

merge adium-1.6 into default

2013-06-02, Frank Dowsett
c3018a7b41de
Parents 8a3574f29967868232f2e8ef
Children 90c61369e36d
merge adium-1.6 into default
4 files changed, 8 insertions(+), 10 deletions(-)
  • +2 -2
    Frameworks/AIUtilities Framework/Source/AIStringAdditions.m
  • +4 -7
    Frameworks/Adium Framework/Source/AIContactObserverManager.m
  • +1 -1
    Source/AIListLayoutWindowController.m
  • +1 -0
    Source/AIMessageViewEmoticonsController.m
    • --- a/Frameworks/AIUtilities Framework/Source/AIStringAdditions.m Sun Jun 02 11:57:24 2013 -0400
    +++ b/Frameworks/AIUtilities Framework/Source/AIStringAdditions.m Sun Jun 02 12:25:19 2013 -0400
    @@ -500,7 +500,7 @@
    #define SBEFS_BOUNDARY_GUARD \
    do { \
    if (i == buflen) { \
    - buf = realloc(buf, sizeof(unichar) * (buflen += buflenIncrement)); \
    + buf = reallocf(buf, sizeof(unichar) * (buflen += buflenIncrement)); \
    if (buf == NULL) { \
    NSLog(@"in stringByEscapingForShell: could not allocate %lu bytes", (unsigned long)(sizeof(unichar) * buflen)); \
    free(myBuf); \
    @@ -583,7 +583,7 @@
    #define SBEFR_BOUNDARY_GUARD \
    do { \
    if (i == buflen) { \
    -buf = realloc(buf, sizeof(unichar) * (buflen += buflenIncrement)); \
    +buf = reallocf(buf, sizeof(unichar) * (buflen += buflenIncrement)); \
    if (!buf) { \
    NSLog(@"in stringByEscapingForRegexp: could not allocate %lu bytes", (unsigned long)(sizeof(unichar) * buflen)); \
    free(myBuf); \
    --- a/Frameworks/Adium Framework/Source/AIContactObserverManager.m Sun Jun 02 11:57:24 2013 -0400
    +++ b/Frameworks/Adium Framework/Source/AIContactObserverManager.m Sun Jun 02 12:25:19 2013 -0400
    @@ -237,20 +237,17 @@
    }
    }
    + NSDictionary *keys = (inModifiedKeys ? [NSDictionary dictionaryWithObject:inModifiedKeys forKey:@"Keys"] : nil);
    //Post an attributes changed message
    [[NSNotificationCenter defaultCenter] postNotificationName:ListObject_AttributesChanged
    object:inObject
    - userInfo:(inModifiedKeys ?
    - [NSDictionary dictionaryWithObject:inModifiedKeys
    - forKey:@"Keys"] :
    - nil)];
    -
    + userInfo:keys];
    +
    if (!shouldDelay) {
    /* Note that we completed 1 or more delayed attribute changes */
    [[NSNotificationCenter defaultCenter] postNotificationName:ListObject_AttributeChangesComplete
    object:inObject
    - userInfo:[NSDictionary dictionaryWithObject:inModifiedKeys
    - forKey:@"Keys"]];
    + userInfo:keys];
    }
    }
    --- a/Source/AIListLayoutWindowController.m Sun Jun 02 11:57:24 2013 -0400
    +++ b/Source/AIListLayoutWindowController.m Sun Jun 02 12:25:19 2013 -0400
    @@ -457,7 +457,7 @@
    - (void)updateUserIconMenuFromPrefDict:(NSDictionary *)prefDict
    {
    - NSInteger userIconPositionChoices[3];
    + NSInteger userIconPositionChoices[3] = {-1};
    if ([[adium.preferenceController preferenceForKey:KEY_LIST_LAYOUT_WINDOW_STYLE group:PREF_GROUP_APPEARANCE] integerValue] != AIContactListWindowStyleContactBubbles_Fitted) {
    userIconPositionChoices[0] = LIST_POSITION_LEFT;
    --- a/Source/AIMessageViewEmoticonsController.m Sun Jun 02 11:57:24 2013 -0400
    +++ b/Source/AIMessageViewEmoticonsController.m Sun Jun 02 12:25:19 2013 -0400
    @@ -56,6 +56,7 @@
    */
    - (id)initWithNibName:(NSString *)nibName textView:(AIMessageEntryTextView *)aView atPoint:(NSPoint)aPoint
    {
    + self = [super init];
    if ([[NSBundle mainBundle] loadNibNamed:nibName owner:self topLevelObjects:nil]) {
    // Set the text view