adium/adium

Merged with robotive's changes.

2013-02-22, Thijs Alkemade
02f7c8405b92
Parents f3e35b66f506a4f689d8f3a4
Children 039bdad0308c
Merged with robotive's changes.
2 files changed, 8 insertions(+), 2 deletions(-)
  • +6 -0
    Adium.xcodeproj/project.pbxproj
  • +2 -2
    Plugins/Purple Service/adiumPurpleEventloop.m
    • --- a/Adium.xcodeproj/project.pbxproj Fri Feb 22 01:25:39 2013 +0100
    +++ b/Adium.xcodeproj/project.pbxproj Fri Feb 22 01:26:20 2013 +0100
    @@ -12550,6 +12550,8 @@
    isa = XCBuildConfiguration;
    baseConfigurationReference = 63C7E02A0FAF9BA800B310AC /* Debug.xcconfig */;
    buildSettings = {
    + CLANG_WARN_ENUM_CONVERSION = YES;
    + MACOSX_DEPLOYMENT_TARGET = 10.7.5;
    };
    name = Debug;
    };
    @@ -12557,6 +12559,8 @@
    isa = XCBuildConfiguration;
    baseConfigurationReference = 63C7E02B0FAF9BA800B310AC /* Release.xcconfig */;
    buildSettings = {
    + CLANG_WARN_ENUM_CONVERSION = YES;
    + MACOSX_DEPLOYMENT_TARGET = 10.7.5;
    };
    name = Release;
    };
    @@ -12564,6 +12568,8 @@
    isa = XCBuildConfiguration;
    baseConfigurationReference = 63C7E02C0FAF9BA800B310AC /* Release-Debug.xcconfig */;
    buildSettings = {
    + CLANG_WARN_ENUM_CONVERSION = YES;
    + MACOSX_DEPLOYMENT_TARGET = 10.7.5;
    };
    name = "Release-Debug";
    };
    --- a/Plugins/Purple Service/adiumPurpleEventloop.m Fri Feb 22 01:25:39 2013 +0100
    +++ b/Plugins/Purple Service/adiumPurpleEventloop.m Fri Feb 22 01:26:20 2013 +0100
    @@ -69,10 +69,10 @@
    }
    static inline dispatch_source_t sourceForTag(guint tag) {
    - return [sourceInfoDict() objectForKey:@(tag)];
    + return (__bridge dispatch_source_t)([sourceInfoDict() objectForKey:@(tag)]);
    }
    static inline void setSourceForTag(dispatch_source_t source, guint tag) {
    - [sourceInfoDict() setObject:source forKey:@(tag)];
    + [sourceInfoDict() setObject:(__bridge id)(source) forKey:@(tag)];
    }
    static inline void removeSourceForTag(guint tag) {
    [sourceInfoDict() removeObjectForKey:@(tag)];