Hello community, here is the log from the commit of package kdebase4 for openSUSE:Factory checked in at 2011-12-08 11:57:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdebase4 (Old) and /work/SRC/openSUSE:Factory/.kdebase4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdebase4", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/kdebase4/kdebase4.changes 2011-11-14 14:05:38.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdebase4.new/kdebase4.changes 2011-12-08 11:58:39.000000000 +0100 @@ -1,0 +2,11 @@ +Wed Dec 7 11:30:05 UTC 2011 - [email protected] + +- fix license to be in spdx.org format + +------------------------------------------------------------------- +Fri Dec 2 01:57:45 CET 2011 - [email protected] + +- update to 4.7.4 + * see http://kde.org/announcements/changelogs/changelog4_7_3to4_7_4.php for details + +------------------------------------------------------------------- Old: ---- kde-baseapps-4.7.3.tar.bz2 New: ---- kde-baseapps-4.7.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4.spec ++++++ --- /var/tmp/diff_new_pack.ldkj9J/_old 2011-12-08 11:58:41.000000000 +0100 +++ /var/tmp/diff_new_pack.ldkj9J/_new 2011-12-08 11:58:41.000000000 +0100 @@ -15,15 +15,13 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: kdebase4 -Version: 4.7.3 -Release: 1 -License: GPLv2+ +Version: 4.7.4 +Release: 0 Summary: The Base KDE Apps -Url: http://www.kde.org/ +License: GPL-2.0+ Group: System/GUI/KDE +Url: http://www.kde.org/ Source0: kde-baseapps-%{version}.tar.bz2 Source1: baselibs.conf Source2: rpmlintrc @@ -43,8 +41,8 @@ BuildRequires: libtidy-devel BuildRequires: libusb-devel BuildRequires: pciutils-devel -BuildRequires: xine-devel BuildRequires: pkgconfig(libxklavier) +BuildRequires: xine-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires @@ -93,7 +91,6 @@ rm -rf filelists %package -n dolphin -License: GPLv2+ Summary: KDE File Manager Group: Productivity/File utilities Requires: %{name}-libkonq = %{version} @@ -106,7 +103,6 @@ This package contains the default file manager of KDE 4. %package -n kdepasswd -License: GPLv2+ Summary: KDE Password Changer Group: System/GUI/KDE Provides: kde4-kdepasswd = 4.3.0 @@ -117,7 +113,6 @@ This application allows you to change your UNIX password. %package -n kdialog -License: GPLv2+ Summary: KDE version of xdialog Group: System/GUI/KDE Provides: kde4-kdialog = 4.3.0 @@ -128,7 +123,6 @@ KDialog can be used to show nice dialog boxes from shell scripts. %package -n keditbookmarks -License: GPLv2+ Summary: KDE Bookmark Editor Group: System/GUI/KDE Provides: kde4-keditbookmarks = 4.3.0 @@ -139,7 +133,6 @@ This is an editor to edit your KDE-wide bookmark set. %package -n kfind -License: GPLv2+ Summary: KDE Find File Utility Group: Productivity/File utilities Provides: kde4-kfind = 4.3.0 @@ -150,7 +143,6 @@ KFind allows you to search for directories and files. %package -n konqueror -License: GPLv2+ Summary: KDE File Manager and Browser Group: Productivity/Networking/Web/Browsers Requires: %{name}-libkonq = %{version} @@ -166,7 +158,6 @@ unified interface. %package -n konqueror-plugins -License: GPLv2+ Summary: KDE File Manager and Browser Group: Productivity/Networking/Web/Browsers Requires: %{name}-libkonq = %{version} @@ -178,7 +169,6 @@ These plugins extend the functionality of Konqueror. %package libkonq -License: GPLv2+ Summary: KDE Konqueror Libraries Group: System/GUI/KDE Requires: libkonq5 = %{version} @@ -188,7 +178,6 @@ This package contains the files used by file managers as Konqueror. %package -n libkonq-devel -License: GPLv2+ Summary: KDE Konqueror Libraries: Build Environment Group: Development/Libraries/KDE Requires: libkde4-devel @@ -199,7 +188,6 @@ to develop KDE file manager applications. %package -n libkonq5 -License: GPLv2+ Summary: KDE Konqueror Libraries Group: System/GUI/KDE # naming error, make seamless upgrade possible @@ -211,7 +199,6 @@ This package contains the libraries used by file managers as Konqueror. %package nsplugin -License: GPLv2+ Provides: %{name}-nsplugin64 = 4.0.72 Obsoletes: %{name}-nsplugin64 < 4.0.72 %ifarch x86_64 ppc64 s390x ia64 @@ -226,7 +213,6 @@ have to enable JavaScript for this. %package -n plasmoid-folderview -License: GPLv2+ Summary: Plasmoid to display a folder Group: System/GUI/KDE Provides: %{name} = %{version} ++++++ kde-baseapps-4.7.3.tar.bz2 -> kde-baseapps-4.7.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.7.3/CMakeLists.txt new/kde-baseapps-4.7.4/CMakeLists.txt --- old/kde-baseapps-4.7.3/CMakeLists.txt 2011-10-28 09:48:58.000000000 +0200 +++ new/kde-baseapps-4.7.4/CMakeLists.txt 2011-12-02 00:49:27.000000000 +0100 @@ -4,9 +4,9 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ) #search packages used by KDE -set(KDE_MIN_VERSION "4.7.3") +set(KDE_MIN_VERSION "4.7.4") set(SOPRANO_MIN_VERSION "2.5.63") -find_package(KDE4 4.7.3 REQUIRED) +find_package(KDE4 4.7.4 REQUIRED) find_package(Strigi REQUIRED) find_package(ZLIB REQUIRED) include (KDE4Defaults) Files old/kde-baseapps-4.7.3/doc/dolphin/index.cache.bz2 and new/kde-baseapps-4.7.4/doc/dolphin/index.cache.bz2 differ Files old/kde-baseapps-4.7.3/doc/kdepasswd/index.cache.bz2 and new/kde-baseapps-4.7.4/doc/kdepasswd/index.cache.bz2 differ Files old/kde-baseapps-4.7.3/doc/kfind/index.cache.bz2 and new/kde-baseapps-4.7.4/doc/kfind/index.cache.bz2 differ Files old/kde-baseapps-4.7.3/doc/konqueror/index.cache.bz2 and new/kde-baseapps-4.7.4/doc/konqueror/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.7.3/dolphin/src/dolphinmainwindow.cpp new/kde-baseapps-4.7.4/dolphin/src/dolphinmainwindow.cpp --- old/kde-baseapps-4.7.3/dolphin/src/dolphinmainwindow.cpp 2011-08-22 15:23:13.000000000 +0200 +++ new/kde-baseapps-4.7.4/dolphin/src/dolphinmainwindow.cpp 2011-12-02 00:25:08.000000000 +0100 @@ -1712,7 +1712,9 @@ connect(openTerminal, SIGNAL(triggered()), this, SLOT(openTerminal())); // setup 'Settings' menu - KStandardAction::showMenubar(this, SLOT(toggleShowMenuBar()), actionCollection()); + KToggleAction* showMenuBar = KStandardAction::showMenubar(0, 0, actionCollection()); + connect(showMenuBar, SIGNAL(triggered(bool)), // Fixes #286822 + this, SLOT(toggleShowMenuBar()), Qt::QueuedConnection); KStandardAction::preferences(this, SLOT(editSettings()), actionCollection()); // not in menu actions diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.7.3/konq-plugins/dirfilter/dirfilterplugin.cpp new/kde-baseapps-4.7.4/konq-plugins/dirfilter/dirfilterplugin.cpp --- old/kde-baseapps-4.7.3/konq-plugins/dirfilter/dirfilterplugin.cpp 2011-06-22 16:30:26.000000000 +0200 +++ new/kde-baseapps-4.7.4/konq-plugins/dirfilter/dirfilterplugin.cpp 2011-12-02 00:25:08.000000000 +0100 @@ -130,9 +130,12 @@ if ( !m_part ) return; - m_dirModel = qFindChild<KDirLister*>( m_part ); - if ( !m_dirModel ) + m_dirModel = qFindChild<KDirLister*>(m_part); + if (!m_dirModel && m_part->widget()) { + m_dirModel = qFindChild<KDirLister*>(m_part->widget()); + if ( !m_dirModel ) return; + } m_pFilterMenu = new KActionMenu (KIcon("view-filter"),i18n("View F&ilter"), actionCollection()); @@ -172,7 +175,7 @@ void DirFilterPlugin::slotOpenURL () { - KUrl url = m_part->url(); + const KUrl url (m_part->url()); //kDebug(90190) << "DirFilterPlugin: Current URL: " << m_pURL.url(); @@ -323,9 +326,8 @@ // We'd maybe benefit from an extra Q_PROPERTY in the DolphinPart // for setting the mime filter, here. For now, just refresh // the model - refreshing the DolphinPart is more complex. - KUrl url = m_part->url(); + const KUrl url (m_part->url()); m_dirModel->openUrl (url); - globalSessionManager->save (url, filters); } } @@ -409,12 +411,11 @@ for (; it != m_pMimeInfo.end(); ++it) it.value().useAsFilter = false; - QStringList filters; - KUrl url = m_part->url(); - + const QStringList filters; + const KUrl url (m_part->url()); m_dirModel->setMimeFilter (filters); - m_part->openUrl (url); - globalSessionManager->save (m_part->url(), filters); + m_dirModel->openUrl (url); + globalSessionManager->save (url, filters); } void DirFilterPlugin::slotShowCount() @@ -432,8 +433,8 @@ void DirFilterPlugin::slotTimeout() { - if (m_part) - m_part->openUrl (m_part->url()); + if (m_dirModel) + m_dirModel->openUrl (m_part->url()); } void DirFilterPlugin::slotFilterTextEdited(const QString& nextText) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.7.3/konq-plugins/domtreeviewer/plugin_domtreeviewer.desktop new/kde-baseapps-4.7.4/konq-plugins/domtreeviewer/plugin_domtreeviewer.desktop --- old/kde-baseapps-4.7.3/konq-plugins/domtreeviewer/plugin_domtreeviewer.desktop 2011-07-19 23:34:05.000000000 +0200 +++ new/kde-baseapps-4.7.4/konq-plugins/domtreeviewer/plugin_domtreeviewer.desktop 2011-12-02 00:25:08.000000000 +0100 @@ -77,7 +77,7 @@ Comment[bs]=Prikazuje DOM stablo trenutne stranice Comment[ca]=Visualitza l'arbre DOM de la pàgina actual Comment[ca@valencia]=Visualitza l'arbre DOM de la pàgina actual -Comment[cs]=Prohládne DOM strom současné stránky +Comment[cs]=Prohlédne DOM strom současné stránky Comment[da]=Vis DOM-træ af den aktuelle side. Comment[de]=DOM-Baum der aktuellen Webseite anzeigen Comment[el]=Εμφάνιση του δέντρου DOM της τρέχουσας σελίδας diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.7.3/konq-plugins/imagerotation/jpegorient.desktop new/kde-baseapps-4.7.4/konq-plugins/imagerotation/jpegorient.desktop --- old/kde-baseapps-4.7.3/konq-plugins/imagerotation/jpegorient.desktop 2011-07-19 23:34:05.000000000 +0200 +++ new/kde-baseapps-4.7.4/konq-plugins/imagerotation/jpegorient.desktop 2011-12-02 00:25:08.000000000 +0100 @@ -127,7 +127,7 @@ Name[tg]=Баргардондани соатӣ Name[th]=หมุนตามเข็มนาฬิกา Name[tr]=Saat Yönünde Çevir -Name[ug]=ئوڭغا ئايلاندۇر +Name[ug]=سائەت ئىسترېلكىسى يۆنىلىشىدە چۆرگىلىتىش Name[uk]=Обернути за годинниковою стрілкою Name[vi]=Xoay xuôi chiều Name[wa]=Tourner dins l' sins des aweyes @@ -269,7 +269,7 @@ Name[tg]=Гардонидани амудӣ Name[th]=พลิกกลับทางแนวตั้ง Name[tr]=Dikey Olarak Çevir -Name[ug]=تىك ئايلاندۇر +Name[ug]=تىك يۆنىلىشتە چۆرگىلىتىش Name[uk]=Віддзеркалити вертикально Name[vi]=Lật dọc Name[wa]=Ratourner d' astampé @@ -339,7 +339,7 @@ Name[tg]=Гардонидани уфуқӣ Name[th]=พลิกกลับทางแนวนอน Name[tr]=Yatay Olarak Çevir -Name[ug]=يانتۇ ئايلاندۇر +Name[ug]=توغرىسىغا چۆرگىلىتىش Name[uk]=Віддзеркалити горизонтально Name[vi]=Lật ngang Name[wa]=Ratourner di coutchî diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.7.3/konq-plugins/searchbar/searchbar.cpp new/kde-baseapps-4.7.4/konq-plugins/searchbar/searchbar.cpp --- old/kde-baseapps-4.7.3/konq-plugins/searchbar/searchbar.cpp 2011-06-22 16:30:26.000000000 +0200 +++ new/kde-baseapps-4.7.4/konq-plugins/searchbar/searchbar.cpp 2011-12-02 00:25:08.000000000 +0100 @@ -63,7 +63,6 @@ SearchBarPlugin::SearchBarPlugin(QObject *parent, const QVariantList &) : KParts::Plugin(parent), - m_part(0), m_popupMenu(0), m_addWSWidget(0), m_searchMode(UseSearchProvider), @@ -87,7 +86,7 @@ KAction *a = actionCollection()->addAction("focus_search_bar"); a->setText(i18n("Focus Searchbar")); - a->setShortcut(Qt::CTRL+Qt::Key_S); + a->setShortcut(QKeySequence(Qt::CTRL+Qt::ALT+Qt::Key_S)); connect(a, SIGNAL(triggered()), this, SLOT(focusSearchbar())); configurationChanged(); @@ -127,7 +126,7 @@ KParts::PartActivateEvent* partEvent = static_cast<KParts::PartActivateEvent *>(e); KParts::ReadOnlyPart *part = qobject_cast<KParts::ReadOnlyPart *>(partEvent->part()); //kDebug() << "Embedded part changed to " << part; - if (part && (part != m_part)) { + if (part && (!m_part || part != m_part.data())) { m_part = part; // Delete the popup menu so a new one can be created with the @@ -145,8 +144,8 @@ if (m_searchMode == FindInThisPage && enableFindInPage()) nextSearchEntry(); - connect(m_part, SIGNAL(completed()), this, SLOT(HTMLDocLoaded())); - connect(m_part, SIGNAL(started(KIO::Job *)), this, SLOT(HTMLLoadingStarted())); + connect(part, SIGNAL(completed()), this, SLOT(HTMLDocLoaded())); + connect(part, SIGNAL(started(KIO::Job*)), this, SLOT(HTMLLoadingStarted())); } // Delay since when destroying tabs part 0 gets activated for a bit, before the proper part QTimer::singleShot(0, this, SLOT(updateComboVisibility())); @@ -213,7 +212,7 @@ m_lastSearch = search; if (m_searchMode == FindInThisPage) { - KParts::TextExtension* textExt = KParts::TextExtension::childObject(m_part); + KParts::TextExtension* textExt = KParts::TextExtension::childObject(m_part.data()); if (textExt) textExt->findText(search, 0); } else if (m_searchMode == UseSearchProvider) { @@ -227,7 +226,7 @@ return; } - KParts::BrowserExtension * ext = KParts::BrowserExtension::childObject(m_part); + KParts::BrowserExtension * ext = KParts::BrowserExtension::childObject(m_part.data()); if (QApplication::keyboardModifiers() & Qt::ControlModifier) { KParts::OpenUrlArguments arguments; KParts::BrowserArguments browserArguments; @@ -237,7 +236,8 @@ } else { if (ext) { emit ext->openUrlRequest(data.uri()); - m_part->widget()->setFocus(); // #152923 + if (m_part) + m_part.data()->widget()->setFocus(); // #152923 } } } @@ -356,7 +356,7 @@ const QString openSearchHref = m_openSearchDescs.value(openSearchTitle); KUrl url; if (QUrl(openSearchHref).isRelative()) { - KUrl docUrl = m_part->url(); + const KUrl docUrl = m_part ? m_part.data()->url() : KUrl(); QString host = docUrl.scheme() + QLatin1String("://") + docUrl.host(); if (docUrl.port() != -1) { host += QLatin1String(":") + QString::number(docUrl.port()); @@ -373,7 +373,7 @@ void SearchBarPlugin::selectSearchEngines() { - KRun::runCommand("kcmshell4 ebrowsing", (m_part ? m_part->widget() : 0)); + KRun::runCommand("kcmshell4 ebrowsing", (m_part ? m_part.data()->widget() : 0)); } void SearchBarPlugin::configurationChanged() @@ -421,9 +421,11 @@ void SearchBarPlugin::updateComboVisibility() { + if (!m_part) + return; // NOTE: We hide the search combobox if the embedded kpart is ReadWrite // because web browsers by their very nature are ReadOnly kparts... - m_searchComboAction->setVisible((!qobject_cast<KParts::ReadWritePart *>(m_part) && + m_searchComboAction->setVisible((!m_part.data()->inherits("ReadWritePart") && !m_searchComboAction->associatedWidgets().isEmpty())); m_openSearchDescs.clear(); } @@ -467,11 +469,11 @@ void SearchBarPlugin::HTMLDocLoaded() { - if (!m_part || m_part->url().host().isEmpty()) + if (!m_part || m_part.data()->url().host().isEmpty()) return; // Testcase for this code: http://search.iwsearch.net - KParts::HtmlExtension* ext = KParts::HtmlExtension::childObject(m_part); + KParts::HtmlExtension* ext = KParts::HtmlExtension::childObject(m_part.data()); KParts::SelectorInterface* selectorInterface = qobject_cast<KParts::SelectorInterface*>(ext); if (selectorInterface) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.7.3/konq-plugins/searchbar/searchbar.h new/kde-baseapps-4.7.4/konq-plugins/searchbar/searchbar.h --- old/kde-baseapps-4.7.3/konq-plugins/searchbar/searchbar.h 2011-05-20 22:33:30.000000000 +0200 +++ new/kde-baseapps-4.7.4/konq-plugins/searchbar/searchbar.h 2011-12-02 00:25:08.000000000 +0100 @@ -199,7 +199,7 @@ void nextSearchEntry(); void previousSearchEntry(); - KParts::ReadOnlyPart* m_part; + QWeakPointer<KParts::ReadOnlyPart> m_part; SearchBarCombo* m_searchCombo; KAction* m_searchComboAction; QList<KAction *> m_addSearchActions; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.7.3/konqueror/konquerorsu.desktop new/kde-baseapps-4.7.4/konqueror/konquerorsu.desktop --- old/kde-baseapps-4.7.3/konqueror/konquerorsu.desktop 2011-07-19 23:34:05.000000000 +0200 +++ new/kde-baseapps-4.7.4/konqueror/konquerorsu.desktop 2011-12-02 00:25:08.000000000 +0100 @@ -19,7 +19,7 @@ Name[bs]=Menadžer datoteka (superkorisnički) Name[ca]=Gestor de fitxers (mode superusuari) Name[ca@valencia]=Gestor de fitxers (mode superusuari) -Name[cs]=Správce souborů - superuživatelský režim +Name[cs]=Správce souborů - super uživatelský režim Name[csb]=Menadżera lopków - trib sprôwnika Name[cy]=Trefnydd Ffeiliau - Modd Defnyddiwr Uwch Name[da]=Filhåndtering (superbruger-tilstand) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.7.3/konqueror/src/konqframe.cpp new/kde-baseapps-4.7.4/konqueror/src/konqframe.cpp --- old/kde-baseapps-4.7.3/konqueror/src/konqframe.cpp 2011-05-20 22:33:30.000000000 +0200 +++ new/kde-baseapps-4.7.4/konqueror/src/konqframe.cpp 2011-12-02 00:25:08.000000000 +0100 @@ -116,7 +116,7 @@ void KonqFrame::saveConfig( KConfigGroup& config, const QString &prefix, const KonqFrameBase::Options &options, KonqFrameBase* docContainer, int /*id*/, int /*depth*/ ) { - childView()->saveConfig(config, prefix, options); + if (m_pView) m_pView->saveConfig(config, prefix, options); //config.writeEntry( QString::fromLatin1( "ShowStatusBar" ).prepend( prefix ), statusbar()->isVisible() ); if (this == docContainer) config.writeEntry( QString::fromLatin1( "docContainer" ).prepend( prefix ), true ); @@ -129,7 +129,8 @@ void KonqFrame::copyHistory( KonqFrameBase *other ) { assert(other->frameType() == KonqFrameBase::View); - childView()->copyHistory( static_cast<KonqFrame *>( other )->childView() ); + if (m_pView) + m_pView->copyHistory( static_cast<KonqFrame *>( other )->childView() ); } KParts::ReadOnlyPart *KonqFrame::attach( const KonqViewFactory &viewFactory ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.7.3/konqueror/src/konqrun.cpp new/kde-baseapps-4.7.4/konqueror/src/konqrun.cpp --- old/kde-baseapps-4.7.3/konqueror/src/konqrun.cpp 2011-05-20 22:33:30.000000000 +0200 +++ new/kde-baseapps-4.7.4/konqueror/src/konqrun.cpp 2011-12-02 00:25:08.000000000 +0100 @@ -153,7 +153,7 @@ else if (mime && (mime->is("text/html") || mime->name().startsWith("image/")) // #83513 - && !m_pView->showsDirectory()) { + && (m_pView && !m_pView->showsDirectory())) { m_req.forceAutoEmbed = true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.7.3/konqueror/src/konqview.cpp new/kde-baseapps-4.7.4/konqueror/src/konqview.cpp --- old/kde-baseapps-4.7.3/konqueror/src/konqview.cpp 2011-06-22 16:30:26.000000000 +0200 +++ new/kde-baseapps-4.7.4/konqueror/src/konqview.cpp 2011-12-02 00:25:08.000000000 +0100 @@ -848,6 +848,9 @@ void KonqView::copyHistory( KonqView *other ) { + if (!other) + return; + qDeleteAll( m_lstHistory ); m_lstHistory.clear(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.7.3/plasma/applets/folderview/folderview.cpp new/kde-baseapps-4.7.4/plasma/applets/folderview/folderview.cpp --- old/kde-baseapps-4.7.3/plasma/applets/folderview/folderview.cpp 2011-07-19 23:34:05.000000000 +0200 +++ new/kde-baseapps-4.7.4/plasma/applets/folderview/folderview.cpp 2011-12-02 00:25:08.000000000 +0100 @@ -96,7 +96,13 @@ if (!index.isValid()) { return QVariant(); } + KMimeType *mime = static_cast<KMimeType*>(index.internalPointer()); + + if (!mime) { + return QVariant(); + } + switch (role) { case Qt::DisplayRole: { if (!mime->comment().isEmpty()) { @@ -190,6 +196,12 @@ KMimeType *leftPtr = static_cast<KMimeType*>(left.internalPointer()); KMimeType *rightPtr = static_cast<KMimeType*>(right.internalPointer()); + if (!leftPtr) { + return true; + } else if (!rightPtr) { + return false; + } + return KStringHandler::naturalCompare(leftPtr->comment(), rightPtr->comment()) < 0; } @@ -197,6 +209,10 @@ { QModelIndex sourceIndex = sourceModel()->index(source_row, 0, source_parent); KMimeType *mime = static_cast<KMimeType*>(sourceIndex.internalPointer()); + if (!mime) { + return false; + } + if (m_filter.isEmpty()) { return true; } @@ -710,7 +726,7 @@ for (int i = 0; i < pMimeModel->rowCount(); i++) { const QModelIndex index = pMimeModel->index(i, 0); const KMimeType *mime = static_cast<KMimeType*>(pMimeModel->mapToSource(index).internalPointer()); - if (selectedItems.contains(mime->name())) { + if (mime && selectedItems.contains(mime->name())) { selectedItems.removeAll(mime->name()); uiFilter.filterFilesList->model()->setData(index, Qt::Checked, Qt::CheckStateRole); } @@ -764,7 +780,10 @@ for (int i = 0; i < proxyModel->sourceModel()->rowCount(); i++) { const QModelIndex index = proxyModel->sourceModel()->index(i, 0); if (index.model()->data(index, Qt::CheckStateRole).toInt() == Qt::Checked) { - selectedItems << static_cast<KMimeType*>(index.internalPointer())->name(); + KMimeType *mime = static_cast<KMimeType*>(index.internalPointer()); + if (mime) { + selectedItems << mime->name(); + } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-baseapps-4.7.3/plasma/applets/folderview/plasma-applet-folderview.desktop new/kde-baseapps-4.7.4/plasma/applets/folderview/plasma-applet-folderview.desktop --- old/kde-baseapps-4.7.3/plasma/applets/folderview/plasma-applet-folderview.desktop 2011-07-19 23:34:05.000000000 +0200 +++ new/kde-baseapps-4.7.4/plasma/applets/folderview/plasma-applet-folderview.desktop 2011-12-02 00:25:08.000000000 +0100 @@ -132,7 +132,6 @@ Comment[pt_BR]=Mostra o conteúdo das pastas (pasta do usuário como padrão) Comment[ro]=Afișează conținutul dosarelor (implicit dosarul Acasă al utilizatorului) Comment[ru]=Вывод содержимого папки (по умолчанию — рабочего стола) -Comment[si]=බහාළුම්හී අන්තර්ගත පෙන්වන්න (පරිශීලකයාගේ නිවෙස් බහාළුම පෙරනිමියෙන්) Comment[sk]=Zobrazenie obsahu priečinkov (štandardne domovský priečinok) Comment[sl]=Prikaže vsebino mape Comment[sr]=Приказује садржај фасцикли (подразумевано корисникове домаће) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
