diff options
Diffstat (limited to 'tdeio/bookmarks')
| -rw-r--r-- | tdeio/bookmarks/kbookmark.cc | 15 | ||||
| -rw-r--r-- | tdeio/bookmarks/kbookmarkmanager.cc | 6 |
2 files changed, 16 insertions, 5 deletions
diff --git a/tdeio/bookmarks/kbookmark.cc b/tdeio/bookmarks/kbookmark.cc index 8bbaa5e43..0da05be4f 100644 --- a/tdeio/bookmarks/kbookmark.cc +++ b/tdeio/bookmarks/kbookmark.cc @@ -296,16 +296,21 @@ KURL KBookmark::url() const TQString KBookmark::icon() const { TQString icon = element.attribute("icon"); - if ( icon.isEmpty() ) + if ( icon.isEmpty() ) { // Default icon depends on URL for bookmarks, and is default directory // icon for groups. - if ( isGroup() ) + if ( isGroup() ) { icon = "bookmark_folder"; - else - if ( isSeparator() ) + } + else { + if ( isSeparator() ) { icon = "eraser"; // whatever - else + } + else { icon = KMimeType::iconForURL( url() ); + } + } + } return icon; } diff --git a/tdeio/bookmarks/kbookmarkmanager.cc b/tdeio/bookmarks/kbookmarkmanager.cc index 60d4f2932..47f8c152a 100644 --- a/tdeio/bookmarks/kbookmarkmanager.cc +++ b/tdeio/bookmarks/kbookmarkmanager.cc @@ -255,6 +255,7 @@ void KBookmarkManager::convertToXBEL( TQDomElement & group ) { TQDomElement e = n.toElement(); if ( !e.isNull() ) + { if ( e.tagName() == "TEXT" ) { e.setTagName("title"); @@ -280,6 +281,7 @@ void KBookmarkManager::convertToXBEL( TQDomElement & group ) convertToXBEL( e ); } else + { if ( e.tagName() == "BOOKMARK" ) { e.setTagName("bookmark"); // so much difference :-) @@ -294,7 +296,11 @@ void KBookmarkManager::convertToXBEL( TQDomElement & group ) titleElem.appendChild( e.ownerDocument().createTextNode( text ) ); } else + { kdWarning(7043) << "Unknown tag " << e.tagName() << endl; + } + } + } n = n.nextSibling(); } } |