Properly take care of ampersands

Ronny Scholz patch. Thanks ;)

3 files changed, 14 insertions, 11 deletions

diff --git a/src/bookmarks/bookmarkcontextmenu.cpp b/src/bookmarks/bookmarkcontextmenu.cpp
index 47608710..c96fa7bf 100644
--- a/src/bookmarks/bookmarkcontextmenu.cpp
+++ b/src/bookmarks/bookmarkcontextmenu.cpp
@@ -213,11 +213,12 @@ void BookmarkContextMenu::deleteBookmark()
 {
     KBookmark bm = bookmark();
     bool folder = bm.isGroup();
+    QString name = QString(bm.text()).replace("&&", "&");
 
     if (KMessageBox::warningContinueCancel(
                 QApplication::activeWindow(),
-                folder ? i18n("Are you sure you wish to remove the bookmark folder\n\"%1\"?", bm.text())
-                : i18n("Are you sure you wish to remove the bookmark\n\"%1\"?", bm.text()),
+                folder ? i18n("Are you sure you wish to remove the bookmark folder\n\"%1\"?", name)
+                : i18n("Are you sure you wish to remove the bookmark\n\"%1\"?", name),
                 folder ? i18n("Bookmark Folder Deletion")
                 : i18n("Bookmark Deletion"),
                 KStandardGuiItem::del())
@@ -233,9 +234,10 @@ void BookmarkContextMenu::deleteBookmark()
 void BookmarkContextMenu::editBookmark()
 {
     KBookmark selected = bookmark();
-
+    selected.setFullText(selected.text().replace("&&", "&"));
     KBookmarkDialog *dialog = owner()->bookmarkDialog(manager(), QApplication::activeWindow());
     dialog->editBookmark(selected);
+    selected.setFullText(selected.text().replace("&", "&&"));
     delete dialog;
 }
 
@@ -317,7 +319,7 @@ void BookmarkContextMenu::bookmarkCurrentPage()
         if (selected.isGroup())
             parent = selected.toGroup();
 
-        KBookmark newBk = parent.addBookmark(owner()->currentTitle(), KUrl(owner()->currentUrl()), "text-html");
+        KBookmark newBk = parent.addBookmark(owner()->currentTitle().replace("&", "&&"), KUrl(owner()->currentUrl()), "text-html");
         parent.moveBookmark(newBk, selected.parentGroup().previous(selected));
     }
 
diff --git a/src/bookmarks/bookmarksmanager.cpp b/src/bookmarks/bookmarksmanager.cpp
index 03146ea2..605b9630 100644
--- a/src/bookmarks/bookmarksmanager.cpp
+++ b/src/bookmarks/bookmarksmanager.cpp
@@ -409,7 +409,9 @@ void BookmarkProvider::fillBookmarkBar(KToolBar *toolBar)
 
         else
         {
-            toolBar->addAction(new KBookmarkAction(bookmark, m_owner, this));
+            KBookmarkAction* a = new KBookmarkAction(bookmark, m_owner, this);
+            a->setIconText(a->iconText().replace("&", "&&"));
+            toolBar->addAction(a);
         }
     }
 }
diff --git a/src/mainview.cpp b/src/mainview.cpp
index b7ad7543..0bc6fbde 100644
--- a/src/mainview.cpp
+++ b/src/mainview.cpp
@@ -594,11 +594,10 @@ void MainView::webViewIconChanged()
 
 void MainView::webViewTitleChanged(const QString &title)
 {
-    QString tabTitle = title;
-    if (title.isEmpty())
-    {
-        tabTitle = i18n("(Untitled)");
-    }
+    QString viewTitle = title.isEmpty()? i18n("(Untitled)") : title;
+    QString tabTitle = viewTitle;
+    tabTitle.replace("&", "&&");
+    
     WebView *view = qobject_cast<WebView *>(sender());
     int index = indexOf(view->parentWidget());
     if (-1 != index)
@@ -607,7 +606,7 @@ void MainView::webViewTitleChanged(const QString &title)
     }
     if (currentIndex() == index)
     {
-        emit currentTitle(tabTitle);
+        emit currentTitle(viewTitle);
     }
     Application::historyManager()->updateHistoryEntry(view->url(), tabTitle);
 }