Adium

Changeset 22284

Show
Ignore:
Timestamp:
01/12/2008 10:30:31 AM (10 months ago)
Author:
evands
Message:

Merged [22283]: Allow manual reordering when not showing contact list groups. Fixes #8884

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/adium-1.2/Source/AIListController.m

    r22070 r22284  
    502502                } else { 
    503503                        //We have one or more contacts. Don't allow them to drop on the contact list itself 
    504                         if (!item) { 
    505                                 /* The user is hovering on the contact list itself.  This actually means that, assuming we have any items in the list at all, she is hovering just below 
    506                                  * a group or an item in a group.  Let's do this right by shifting the drop to object above. 
     504                        if (!item && [[adium contactController] useContactListGroups]) { 
     505                                /* The user is hovering on the contact list itself. 
     506                                 * If groups are shown at all, assuming we have any items in the list at all, she is hovering just below 
     507                                 * a group or an item in a group. 
     508                                 * Do this right by shifting the drop to object above. 
    507509                                 */ 
    508510                                id itemAboveProposedIndex = [outlineView itemAtRow:(index - 1)];