Hello community, here is the log from the commit of package kdelibs3 checked in at Fri Apr 7 16:49:45 CEST 2006. -------- --- KDE/kdelibs3/kdelibs3.changes 2006-04-03 12:10:22.000000000 +0200 +++ kdelibs3/kdelibs3.changes 2006-04-07 15:03:42.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Apr 7 14:57:03 CEST 2006 - dmueller@suse.de + +- fix media:/ urls in kfiledialog +- fix kdirwatch inducted memory corruption, often seen + as kate crashing during save. + +------------------------------------------------------------------- New: ---- 3_5_BRANCH-r526455.diff fix-kdirwatch-crash.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdelibs3-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.TcfhJm/_old 2006-04-07 16:48:18.000000000 +0200 +++ /var/tmp/diff_new_pack.TcfhJm/_new 2006-04-07 16:48:18.000000000 +0200 @@ -18,7 +18,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Additional Package Documentation Version: 3.5.1 -Release: 37 +Release: 38 %define kdelibs_patch_level b BuildArch: noarch Requires: kdelibs3 qt3-devel-doc ++++++ kdelibs3.spec ++++++ --- /var/tmp/diff_new_pack.TcfhJm/_old 2006-04-07 16:48:18.000000000 +0200 +++ /var/tmp/diff_new_pack.TcfhJm/_new 2006-04-07 16:48:18.000000000 +0200 @@ -18,7 +18,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: KDE Base Libraries Version: 3.5.1 -Release: 37 +Release: 38 %define kdelibs_patch_level a Obsoletes: kde3-i18n kups keramik kdelibs3-cups kdelibs3-33addons Provides: kups keramik kdelibs3-cups kdelibs3-33addons @@ -97,6 +97,8 @@ Patch100: kmessagebox-with-kinstance.diff Patch101: kdesu-lc_all.diff Patch102: 3_5_BRANCH-r521012.diff +Patch103: 3_5_BRANCH-r526455.diff +Patch104: fix-kdirwatch-crash.diff %description This package contains kdelibs, one of the basic packages of the K @@ -260,6 +262,8 @@ %patch100 %patch101 %patch102 +%patch103 +%patch104 # # define KDE version exactly # @@ -739,6 +743,10 @@ /opt/kde3/%_lib/libkwalletclient.so %changelog -n kdelibs3 +* Fri Apr 07 2006 - dmueller@suse.de +- fix media:/ urls in kfiledialog +- fix kdirwatch inducted memory corruption, often seen + as kate crashing during save. * Mon Apr 03 2006 - dmueller@suse.de - don't package xx locale * Tue Mar 28 2006 - dmueller@suse.de ++++++ testkhtml.spec ++++++ --- /var/tmp/diff_new_pack.TcfhJm/_old 2006-04-07 16:48:18.000000000 +0200 +++ /var/tmp/diff_new_pack.TcfhJm/_new 2006-04-07 16:48:18.000000000 +0200 @@ -16,7 +16,7 @@ License: Other License(s), see package, BSD Group: System/GUI/KDE Version: 3.5.1 -Release: 37 +Release: 38 Summary: Internal: regression testing for konqueror renderer BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: kdelibs-%{version}.tar.bz2 ++++++ 3_5_BRANCH-r526455.diff ++++++ ------------------------------------------------------------------------ r526455 | cartman | 2006-04-04 20:08:40 +0200 (Tue, 04 Apr 2006) | 6 lines teach KFileDialog about media:/ and system:/ BUG: 105771 BUG: 106077 CCMAIL: 123527 ------------------------------------------------------------------------ Index: kio/kfile/kfiledialog.cpp =================================================================== --- kio/kfile/kfiledialog.cpp (revision 526454) +++ kio/kfile/kfiledialog.cpp (revision 526455) @@ -402,8 +402,9 @@ void KFileDialog::slotOk() } } + KURL url = KIO::NetAccess::mostLocalURL(d->url,topLevelWidget()); if ( (mode() & KFile::LocalOnly) == KFile::LocalOnly && - !d->url.isLocalFile() ) { + !url.isLocalFile() ) { // ### after message freeze, add message for directories! KMessageBox::sorry( d->mainWidget, i18n("You can only select local files."), @@ -411,6 +412,7 @@ void KFileDialog::slotOk() return; } + d->url = url; accept(); return; } @@ -444,15 +446,16 @@ void KFileDialog::slotOk() return; } + KURL url = KIO::NetAccess::mostLocalURL(selectedURL,topLevelWidget()); if ( (mode() & KFile::LocalOnly) == KFile::LocalOnly && - !selectedURL.isLocalFile() ) { + !url.isLocalFile() ) { KMessageBox::sorry( d->mainWidget, i18n("You can only select local files."), i18n("Remote Files Not Accepted") ); return; } - d->url = selectedURL; + d->url = url; // d->url is a correct URL now @@ -1536,8 +1539,9 @@ QString KFileDialog::selectedFile() cons { if ( result() == QDialog::Accepted ) { - if (d->url.isLocalFile()) - return d->url.path(); + KURL url = KIO::NetAccess::mostLocalURL(d->url,topLevelWidget()); + if (url.isLocalFile()) + return url.path(); else { KMessageBox::sorry( d->mainWidget, i18n("You can only select local files."), @@ -1550,14 +1554,16 @@ QString KFileDialog::selectedFile() cons QStringList KFileDialog::selectedFiles() const { QStringList list; + KURL url; if ( result() == QDialog::Accepted ) { if ( (ops->mode() & KFile::Files) == KFile::Files ) { KURL::List urls = parseSelectedURLs(); QValueListConstIterator<KURL> it = urls.begin(); while ( it != urls.end() ) { - if ( (*it).isLocalFile() ) - list.append( (*it).path() ); + url = KIO::NetAccess::mostLocalURL(*it,topLevelWidget()); + if ( url.isLocalFile() ) + list.append( url.path() ); ++it; } } ++++++ fix-kdirwatch-crash.diff ++++++ Index: kio/kio/kdirwatch.cpp =================================================================== --- kio/kio/kdirwatch.cpp (revision 527249) +++ kio/kio/kdirwatch.cpp (working copy) @@ -431,8 +431,8 @@ void KDirWatchPrivate::slotActivated() //(void) inotify_rm_watch( m_inotify_fd, e->wd ); addEntry(0, QDir::cleanDirPath(e->path+"/.."), e, true); } - if ( event->mask & IN_CREATE ) { - kdDebug(7001) << "-->got create subfile signal for " << e->path << endl; + if ( event->mask & (IN_CREATE|IN_MOVED_TO) ) { + kdDebug(7001) << "-->got new subfile " << path << " in " << e->path << endl; Entry *sub_entry = e->m_entries.first(); for(;sub_entry; sub_entry = e->m_entries.next()) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...