[webkit-changes] cvs commit: WebKit/Misc.subproj WebIconDatabase.m

[Adele]

adele       05/08/24 11:00:22

  Modified:    .        Tag: Safari-2-0-branch ChangeLog
               Misc.subproj Tag: Safari-2-0-branch WebIconDatabase.m
  Log:
          Fixed merge error.  Use URLToIconURL on the branch instead of pageURLToIconURL
  
          * Misc.subproj/WebIconDatabase.m:
          (-[WebIconDatabase _setIconURL:forURL:]):
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.3118.4.52 +7 -0      WebKit/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebKit/ChangeLog,v
  retrieving revision 1.3118.4.51
  retrieving revision 1.3118.4.52
  diff -u -r1.3118.4.51 -r1.3118.4.52
  --- ChangeLog	24 Aug 2005 00:45:03 -0000	1.3118.4.51
  +++ ChangeLog	24 Aug 2005 18:00:14 -0000	1.3118.4.52
  @@ -1,3 +1,10 @@
  +2005-08-24  Adele Peterson  <adele at apple.com>
  +
  +        Fixed merge error.  Use URLToIconURL on the branch instead of pageURLToIconURL
  +
  +        * Misc.subproj/WebIconDatabase.m:
  +        (-[WebIconDatabase _setIconURL:forURL:]):
  +
   2005-08-23  Adele Peterson  <adele at apple.com>
   
           Merged fix from TOT to Safari-2-0-branch
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.53.10.2 +1 -1      WebKit/Misc.subproj/WebIconDatabase.m
  
  Index: WebIconDatabase.m
  ===================================================================
  RCS file: /cvs/root/WebKit/Misc.subproj/WebIconDatabase.m,v
  retrieving revision 1.53.10.1
  retrieving revision 1.53.10.2
  diff -u -r1.53.10.1 -r1.53.10.2
  --- WebIconDatabase.m	24 Aug 2005 00:24:36 -0000	1.53.10.1
  +++ WebIconDatabase.m	24 Aug 2005 18:00:21 -0000	1.53.10.2
  @@ -295,7 +295,7 @@
       ASSERT([self _isEnabled]);
       ASSERT([self _hasIconForIconURL:iconURL]);    
       
  -    if ([[_private->pageURLToIconURL objectForKey:URL] isEqualToString:iconURL]) {
  +    if ([[_private->URLToIconURL objectForKey:URL] isEqualToString:iconURL]) {
           // Don't do any work if the icon URL is already bound to the site URL
           return;
       }