From 91b335b9bba1df608b2a0ff0c00d2e85fc2c2a00 Mon Sep 17 00:00:00 2001
From: "smfr%smfr.org" <smfr%smfr.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 20 Oct 2005 02:03:20 +0000
Subject: [PATCH] Fix bug 312959: avoid hang showing tooltip on a newly added
 bookmark toolbar item by ensuring that the bookmark has its title and url
 before notifications are fired for it, and avoiding "\n\n" tooltip strings.
 r=mento.

git-svn-id: svn://10.0.0.236/trunk@182567 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/camino/src/bookmarks/BookmarkButton.mm | 9 +++++++--
 mozilla/camino/src/bookmarks/BookmarkFolder.mm | 4 ++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/mozilla/camino/src/bookmarks/BookmarkButton.mm b/mozilla/camino/src/bookmarks/BookmarkButton.mm
index aaa10b0c6a3..84374e42af2 100644
--- a/mozilla/camino/src/bookmarks/BookmarkButton.mm
+++ b/mozilla/camino/src/bookmarks/BookmarkButton.mm
@@ -109,9 +109,14 @@
       return;
     }
     [self setAction:@selector(openBookmark:)];
-    [self setToolTip:[NSString stringWithFormat:NSLocalizedString(@"BookmarkButtonTooltipFormat", @""),
+    
+    NSString* tooltipString = [NSString stringWithFormat:NSLocalizedString(@"BookmarkButtonTooltipFormat", @""),
                                                 [bookmarkItem title],
-                                                [bookmarkItem url]]];
+                                                [bookmarkItem url]];
+    // using "\n\n" as a tooltip string causes Cocoa to hang when displaying the tooltip,
+    // so be paranoid about not doing that
+    if (![tooltipString isEqualToString:@"\n\n"])
+      [self setToolTip:tooltipString];
   }
   else {
     [[self cell] setClickHoldTimeout:0.5];
diff --git a/mozilla/camino/src/bookmarks/BookmarkFolder.mm b/mozilla/camino/src/bookmarks/BookmarkFolder.mm
index 0612db3c98f..7db1ff19f19 100644
--- a/mozilla/camino/src/bookmarks/BookmarkFolder.mm
+++ b/mozilla/camino/src/bookmarks/BookmarkFolder.mm
@@ -548,8 +548,6 @@ NSString* const BookmarkFolderDockMenuChangeNotificaton = @"bf_dmc";
 {
   if (![self isRoot]) {
     Bookmark *theBookmark = [[Bookmark alloc] init];
-    [self insertChild:theBookmark atIndex:aPosition isMove:NO];
-    [theBookmark release];
     [theBookmark setTitle:aTitle];
     [theBookmark setKeyword:aKeyword];
     [theBookmark setUrl:aURL];
@@ -557,6 +555,8 @@ NSString* const BookmarkFolderDockMenuChangeNotificaton = @"bf_dmc";
     [theBookmark setLastVisit:aDate];
     [theBookmark setStatus:aStatus];
     [theBookmark setIsSeparator:aSeparator];
+    [self insertChild:theBookmark atIndex:aPosition isMove:NO];
+    [theBookmark release];
     return theBookmark;
   }
   return nil;