adium/adium

Both the icon in the "Get Info" window and and the "Contact icon" in the chat window's toolbar are placeholders for a contact icon so give them the same icon.

2012-02-26, Robert Vehse
ca4139b19fe7
Parents a96c03750e6f
Children b747c90eaa47
Both the icon in the "Get Info" window and and the "Contact icon" in the chat window's toolbar are placeholders for a contact icon so give them the same icon.

The icon associated with contact-related events in the "Events" pane should mean "contact", not "contact icon".
6 files changed, 6 insertions(+), 6 deletions(-)
  • +4 -4
    Adium.xcodeproj/project.pbxproj
  • +0 -0
    Resources/default-icon.png
  • +0 -0
    Resources/events-contact.png
  • +0 -0
    Resources/msg-user-icon.png
  • +1 -1
    Source/AIContactStatusEventsPlugin.m
  • +1 -1
    Source/ESUserIconHandlingPlugin.m
    • --- a/Adium.xcodeproj/project.pbxproj Sun Feb 26 11:10:07 2012 +0100
    +++ b/Adium.xcodeproj/project.pbxproj Sun Feb 26 18:00:08 2012 +0100
    @@ -392,7 +392,7 @@
    347E39DC0A98AA4A00961B0E /* missing_image.png in Resources */ = {isa = PBXBuildFile; fileRef = 347E39DB0A98AA4A00961B0E /* missing_image.png */; };
    347E77F407CA94FF00350507 /* ESAccountEvents.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E77F207CA94FE00350507 /* ESAccountEvents.m */; };
    347E781407CA961300350507 /* ESUserIconHandlingPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E781207CA961300350507 /* ESUserIconHandlingPlugin.m */; };
    - 347E781A07CA962100350507 /* msg-user-icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 347E781907CA962100350507 /* msg-user-icon.png */; };
    + 347E781A07CA962100350507 /* events-contact.png in Resources */ = {isa = PBXBuildFile; fileRef = 347E781907CA962100350507 /* events-contact.png */; };
    347E782907CA964600350507 /* AIContactSortSelectionPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E782507CA964600350507 /* AIContactSortSelectionPlugin.m */; };
    347E782A07CA964700350507 /* ESContactSortConfigurationWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 347E782607CA964600350507 /* ESContactSortConfigurationWindowController.m */; };
    347E783407CA967100350507 /* SortingDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 347E783307CA967100350507 /* SortingDefaults.plist */; };
    @@ -3029,7 +3029,7 @@
    347E77F207CA94FE00350507 /* ESAccountEvents.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = ESAccountEvents.m; path = Source/ESAccountEvents.m; sourceTree = "<group>"; };
    347E781107CA961300350507 /* ESUserIconHandlingPlugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ESUserIconHandlingPlugin.h; path = Source/ESUserIconHandlingPlugin.h; sourceTree = "<group>"; };
    347E781207CA961300350507 /* ESUserIconHandlingPlugin.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = ESUserIconHandlingPlugin.m; path = Source/ESUserIconHandlingPlugin.m; sourceTree = "<group>"; };
    - 347E781907CA962100350507 /* msg-user-icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "msg-user-icon.png"; path = "Resources/msg-user-icon.png"; sourceTree = "<group>"; };
    + 347E781907CA962100350507 /* events-contact.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "events-contact.png"; path = "Resources/events-contact.png"; sourceTree = "<group>"; };
    347E782407CA964600350507 /* ESContactSortConfigurationWindowController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ESContactSortConfigurationWindowController.h; path = Source/ESContactSortConfigurationWindowController.h; sourceTree = "<group>"; };
    347E782507CA964600350507 /* AIContactSortSelectionPlugin.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = AIContactSortSelectionPlugin.m; path = Source/AIContactSortSelectionPlugin.m; sourceTree = "<group>"; };
    347E782607CA964600350507 /* ESContactSortConfigurationWindowController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = ESContactSortConfigurationWindowController.m; path = Source/ESContactSortConfigurationWindowController.m; sourceTree = "<group>"; };
    @@ -5267,7 +5267,7 @@
    children = (
    347E781107CA961300350507 /* ESUserIconHandlingPlugin.h */,
    347E781207CA961300350507 /* ESUserIconHandlingPlugin.m */,
    - 347E781907CA962100350507 /* msg-user-icon.png */,
    + 347E781907CA962100350507 /* events-contact.png */,
    );
    name = "User Icon Handling";
    sourceTree = "<group>";
    @@ -9689,7 +9689,7 @@
    349C30790867ADA3000BF883 /* AdiumApplescriptRunner in Resources */,
    349C7C7A07C9AE1B005EB896 /* ContactListAdvancedPrefs.nib in Resources */,
    34E0EA0807CC53ED00A82198 /* NewMessagePrompt.nib in Resources */,
    - 347E781A07CA962100350507 /* msg-user-icon.png in Resources */,
    + 347E781A07CA962100350507 /* events-contact.png in Resources */,
    347E783407CA967100350507 /* SortingDefaults.plist in Resources */,
    347E786C07CA972100350507 /* AddGroup.nib in Resources */,
    347E787807CA975900350507 /* msg-add-contact.png in Resources */,
    Binary file Resources/default-icon.png has changed
    Binary file Resources/events-contact.png has changed
    Binary file Resources/msg-user-icon.png has changed
    --- a/Source/AIContactStatusEventsPlugin.m Sun Feb 26 11:10:07 2012 +0100
    +++ b/Source/AIContactStatusEventsPlugin.m Sun Feb 26 18:00:08 2012 +0100
    @@ -305,7 +305,7 @@
    - (NSImage *)imageForEventID:(NSString *)eventID
    {
    static NSImage *eventImage = nil;
    - if (!eventImage) eventImage = [[NSImage imageNamed:@"default-icon" forClass:[self class]] retain];
    + if (!eventImage) eventImage = [[NSImage imageNamed:@"events-contact" forClass:[self class]] retain];
    return eventImage;
    }
    --- a/Source/ESUserIconHandlingPlugin.m Sun Feb 26 11:10:07 2012 +0100
    +++ b/Source/ESUserIconHandlingPlugin.m Sun Feb 26 18:00:08 2012 +0100
    @@ -148,7 +148,7 @@
    [button setCornerRadius:3.0f];
    [button setToolbarItem:toolbarItem];
    - [button setImage:[NSImage imageNamed:@"msg-user-icon" forClass:[self class] loadLazily:YES]];
    + [button setImage:[NSImage imageNamed:@"default-icon" forClass:[self class] loadLazily:YES]];
    [button release];
    //Register our toolbar item