Hello community, here is the log from the commit of package kdewebdev3 checked in at Wed Nov 1 01:38:38 CET 2006. -------- --- KDE/kdewebdev3/kdewebdev3.changes 2006-10-09 11:08:00.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdewebdev3/kdewebdev3.changes 2006-10-31 16:16:11.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Oct 31 16:14:27 CET 2006 - coolo@suse.de + +- add 3_5_BRANCH.diff: + - fix crash in klinkstatus + - show the Find in Files when KFileReplace is installed + +------------------------------------------------------------------- New: ---- 3_5_BRANCH.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdewebdev3.spec ++++++ --- /var/tmp/diff_new_pack.X0lKxe/_old 2006-11-01 01:38:27.000000000 +0100 +++ /var/tmp/diff_new_pack.X0lKxe/_new 2006-11-01 01:38:27.000000000 +0100 @@ -15,11 +15,11 @@ %if %suse_version < 1010 BuildRequires: libgcrypt-devel %endif -License: GPL +License: GNU General Public License (GPL) - all versions Group: Productivity/Publishing/HTML/Editors Summary: KDE Web Development Suite Version: 3.5.5 -Release: 2 +Release: 16 # should not be a hard require Requires: tidy Requires: kommander-runtime @@ -31,7 +31,7 @@ Source2: html.tar.bz2 Source3: javascript.tar.bz2 Source4: php.tar.bz2 -#Patch0: 3_5_BRANCH.diff +Patch0: 3_5_BRANCH.diff Patch1: disable-icon.diff Patch2: javascript.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -97,7 +97,7 @@ %prep %setup -q -n kdewebdev-%version -b 1 -b 2 -b 3 -b 4 -#%patch0 +%patch0 %patch1 pushd ../javascript %patch2 -p1 @@ -187,6 +187,10 @@ /opt/kde3/share/mimelnk/application/x-kommander.desktop %changelog -n kdewebdev3 +* Tue Oct 31 2006 - coolo@suse.de +- add 3_5_BRANCH.diff: + - fix crash in klinkstatus + - show the Find in Files when KFileReplace is installed * Mon Oct 09 2006 - stbinner@suse.de - add Provides: to kommander package for upgrade case * Tue Oct 03 2006 - stbinner@suse.de @@ -206,38 +210,38 @@ * Mon Mar 20 2006 - stbinner@suse.de - update to 3.5.2 * Quanta Plus -- allow opening of read-only remote files, like from http:// -- fix insertion of files to the project [bug #120629] -- fix detection of existing shortcuts -- ignore special areas inside comments -- set the user action tooltips correctly -- fix random crashing when editing PHP files -- fix a crash when using the attribute tree -- fix insertion of relative URLs from the attribute tree -- fix resolving of relative URLs when there are symlinks around -- fix addition of local directories to the project (creates weird + - allow opening of read-only remote files, like from http:// + - fix insertion of files to the project [bug #120629] + - fix detection of existing shortcuts + - ignore special areas inside comments + - set the user action tooltips correctly + - fix random crashing when editing PHP files + - fix a crash when using the attribute tree + - fix insertion of relative URLs from the attribute tree + - fix resolving of relative URLs when there are symlinks around + - fix addition of local directories to the project (creates weird project error like in bug #122419) -- fix for dtep data of xhtml1.1 [bug #122272] -- fix some bugs in the new project wizard -- always reload a file if the user wants it [bug #121329] -- fix previewing of read-only files -- reload project tree for remote projects after rescanning the + - fix for dtep data of xhtml1.1 [bug #122272] + - fix some bugs in the new project wizard + - always reload a file if the user wants it [bug #121329] + - fix previewing of read-only files + - reload project tree for remote projects after rescanning the project folder -- less reparsing of the document while typing is in progress -- open dropped files [bug #102605] -- don't try to remove an empty, unmodified buffer, if it is + - less reparsing of the document while typing is in progress + - open dropped files [bug #102605] + - don't try to remove an empty, unmodified buffer, if it is the last opened one [bug #111599] -- remember cursor position for project documents [bug #101966] -- add the standard show/hide menubar action [bug #113064] -- add possibility to limit the number of recent files/projects. + - remember cursor position for project documents [bug #101966] + - add the standard show/hide menubar action [bug #113064] + - add possibility to limit the number of recent files/projects. No GUI, use "Recent Files Limit" in the [General Options] section -- show the project name in the window titlebar -- mark uploaded files as uploaded even if upload fails later [bug #111857] -- new DCOP methods: -- WindowManagerIf::uploadURL(url, profile, markOnly) -- QuantaIf::groupElements(groupName) + - show the project name in the window titlebar + - mark uploaded files as uploaded even if upload fails later [bug #111857] + - new DCOP methods: + - WindowManagerIf::uploadURL(url, profile, markOnly) + - QuantaIf::groupElements(groupName) * Kommander -- accept DCOP methods without parantheses + - accept DCOP methods without parantheses * Fri Mar 03 2006 - stbinner@suse.de - add frequent Quanta crashes upstream fix (#154777) * Mon Jan 30 2006 - stbinner@suse.de ++++++ 3_5_BRANCH.diff ++++++ --- quanta/parsers/dtd/dtdparser.cpp +++ quanta/parsers/dtd/dtdparser.cpp @@ -98,6 +98,7 @@ s = QString::fromLatin1(errorPtr->str2); if (!s.isEmpty()) errorStr += "<br>" + s; + errorStr += QString("(%1, %2)").arg(errorPtr->line).arg(errorPtr->int2); xmlResetError(errorPtr); } #endif @@ -182,7 +183,7 @@ { dtepDlg.saveResult(); } - } + } } return true; } @@ -254,14 +255,14 @@ attributes.append(attr); at_ptr = at_ptr->nexth; } - + if (!attributes.isEmpty()) stream << QuantaCommon::xmlFromAttributes(&attributes); const xmlChar *list_ptr[MAX_CHILD_ELEMENTS]; int childNum = 0; childNum = xmlValidGetPotentialChildren(el_ptr->content, list_ptr, &childNum, MAX_CHILD_ELEMENTS); - + if (childNum > 0) { stream << "<children>" << endl; @@ -291,7 +292,7 @@ } stream << " />" << endl; } - + stream << "</children>" << endl; stream << endl; } --- quanta/ChangeLog +++ quanta/ChangeLog @@ -1,7 +1,11 @@ This files contains the changes since Quanta 2.0 until the current 3.5.x series. -Version 3.5.5 (Release date: xx-10-2006; Started 01-09-2006): +Version 3.5.6 (Release date: xx-xx-2006; Started 01-09-2006): - bugfixes: + - show Find in Files menu if KFileReplace is installed [related to #132530] + +Version 3.5.5 (Release date: 11-10-2006; Started 01-09-2006): + - bugfixes: - do not allow growing of quantarc until it crashes Quanta [#111049] - symlink handling fixes (hopefully won't break anything) - fix Save As problems, possibly #131728 --- quanta/src/quanta_init.cpp +++ quanta/src/quanta_init.cpp @@ -176,8 +176,6 @@ m_quanta->m_debugger, SLOT(slotHandleEvent(const QString &, const QString &, const QString &))); connect(m_quanta->m_debugger, SIGNAL(hideSplash()), m_quanta, SLOT(slotHideSplash())); - m_quanta->m_pluginInterface->readConfig(); //call here, so the plugin actions are created before the GUI - //m_quanta->KDockMainWindow::createGUI( QString::null, false /* conserveMemory */ ); m_quanta->createShellGUI(true); @@ -1094,8 +1092,8 @@ connect(m_quanta->m_pluginInterface, SIGNAL(statusMsg(const QString &)), m_quanta, SLOT(slotStatusMsg(const QString & ))); - QuantaPlugin *fileReplacePlugin =m_quanta-> m_pluginInterface->plugin("KFileReplace"); - if (!fileReplacePlugin) + m_quanta->m_pluginInterface->readConfig(); + if (!m_quanta->m_pluginInterface->pluginAvailable("KFileReplace")) { delete m_quanta->actionCollection()->action("find_in_files"); } --- quanta/quanta.kdevelop +++ quanta/quanta.kdevelop @@ -245,10 +245,10 @@ </kdevcvs> <kdevfilecreate> <filetypes> - <type icon="" ext="h" create="template" name="C++ header" > + <type icon="" ext="h" name="C++ header" create="template" > <descr>Quanta speicfic header</descr> </type> - <type icon="source_cpp" ext="cpp" create="template" name="C++ source" > + <type icon="source_cpp" ext="cpp" name="C++ source" create="template" > <descr>A new empty C++ file.</descr> </type> </filetypes> @@ -275,10 +275,7 @@ <processPrimaryTypes>true</processPrimaryTypes> <processFunctionArguments>false</processFunctionArguments> </codecompletion> - <references> - <pcs>Qt3</pcs> - <pcs>KDElibs3</pcs> - </references> + <references/> <creategettersetter> <prefixGet/> <prefixSet>set</prefixSet> --- kdewebdev.lsm +++ kdewebdev.lsm @@ -1,7 +1,7 @@ Begin4 Title: kdewebdev Version: 3.5.5 -Entered-date: 2006-10-10 +Entered-date: 2006-10-11 Description: Web Development Applications for the K Desktop Environment (KDE) Keywords: KDE X11 desktop Qt Author: http://bugs.kde.org/ (KDE Bugtracking System) --- klinkstatus/src/klinkstatus_part.cpp +++ klinkstatus/src/klinkstatus_part.cpp @@ -49,7 +49,7 @@ const char KLinkStatusPart::description_[] = I18N_NOOP( "A Link Checker" ); -const char KLinkStatusPart::version_[] = "0.3.1"; +const char KLinkStatusPart::version_[] = "0.3.2"; // Factory code for KDE 3 typedef KParts::GenericFactory<KLinkStatusPart> KLinkStatusFactory; --- klinkstatus/src/engine/linkchecker.cpp +++ klinkstatus/src/engine/linkchecker.cpp @@ -99,6 +99,8 @@ this, SLOT(slotRedirection(KIO::Job *, const KURL &))); QTimer::singleShot( time_out_ * 1000, this, SLOT(slotTimeOut()) ); + + t_job_->setInteractive(false); } } @@ -346,7 +348,8 @@ if(job->error()) { - kdDebug(23100) << job->errorString() << endl; + kdDebug(23100) << "Job error: " << job->errorString() << endl; + kdDebug(23100) << "Job error code: " << job->error() << endl; if(job->error() == KIO::ERR_IS_DIRECTORY) { @@ -356,14 +359,17 @@ else { ls->setErrorOccurred(true); - ls->setStatus(LinkStatus::BROKEN); + if(job->error() == KIO::ERR_SERVER_TIMEOUT) + ls->setStatus(LinkStatus::TIMEOUT); + else + ls->setStatus(LinkStatus::BROKEN); if(job->errorString().isEmpty()) kdWarning(23100) << "\n\nError string is empty, error = " << job->error() << "\n\n\n"; if(job->error() != KIO::ERR_NO_CONTENT) ls->setError(job->errorString()); else - ls->setError(i18n( "No Content") ); + ls->setError(i18n("No Content")); } } --- klinkstatus/src/main.cpp +++ klinkstatus/src/main.cpp @@ -33,7 +33,7 @@ static const char description[] = I18N_NOOP("A Link Checker.\n\nKLinkStatus belongs to the kdewebdev module from KDE."); -static const char version[] = "0.3.1"; +static const char version[] = "0.3.2"; static KCmdLineOptions options[] = { --- klinkstatus/src/ui/documentrootdialog.cpp +++ klinkstatus/src/ui/documentrootdialog.cpp @@ -43,6 +43,7 @@ m_urlRequester = new KURLRequester(page); m_urlRequester->setURL(url); m_urlRequester->setMinimumWidth(fontMetrics().maxWidth()*20); + m_urlRequester->setFocus(); topLayout->addWidget(m_urlRequester); topLayout->addStretch(10); --- klinkstatus/src/ui/sessionwidget.cpp +++ klinkstatus/src/ui/sessionwidget.cpp @@ -251,7 +251,8 @@ if(!url.protocol().startsWith("http")) { - DocumentRootDialog dialog(this, url.directory()); + QString documentRootHint = url.directory().isEmpty() ? "/" : url.directory(); + DocumentRootDialog dialog(this, documentRootHint); dialog.exec(); search_manager_->setDocumentRoot(KURL::fromPathOrURL(dialog.url())); } @@ -494,9 +495,12 @@ combobox_url->addToHistory(url); } -void SessionWidget::showBottomStatusLabel(QListViewItem * item) +void SessionWidget::showBottomStatusLabel(QListViewItem* item) { kdDebug(23100) << "SessionWidget::showBottomStatusLabel" << endl; + + if(!item) + return; TreeViewItem* _item = tree_view->myItem(item); if(_item) --- klinkstatus/src/ui/treeview.cpp +++ klinkstatus/src/ui/treeview.cpp @@ -597,7 +597,7 @@ else if(linkStatus()->status() == LinkStatus::SUCCESSFULL) return SmallIcon("ok"); else if(linkStatus()->status() == LinkStatus::TIMEOUT) - return SmallIcon("kalarm"); + return SmallIcon("history_clear"); else if(linkStatus()->status() == LinkStatus::UNDETERMINED) return SmallIcon("help"); } Eigenschaftsänderungen: . ___________________________________________________________________ Name: svn:externals + admin https://svn.kde.org/home/kde/branches/KDE/3.5/kde-common/admin ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@suse.de