Hello community,
here is the log from the commit of package kdeaddons3
checked in at Thu Dec 7 20:37:45 CET 2006.
--------
--- KDE/kdeaddons3/kdeaddons3.changes 2006-11-08 16:51:42.000000000 +0100
+++ /mounts/work_src_done/STABLE/kdeaddons3/kdeaddons3.changes 2006-12-01 14:52:29.000000000 +0100
@@ -1,0 +2,5 @@
+Fri Dec 1 14:52:10 CET 2006 - stbinner@suse.de
+
+- fix possible crash of KonquerorDirFilterPlugin (#223957)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdeaddons3.spec ++++++
--- /var/tmp/diff_new_pack.nyYfaq/_old 2006-12-07 20:34:52.000000000 +0100
+++ /var/tmp/diff_new_pack.nyYfaq/_new 2006-12-07 20:34:52.000000000 +0100
@@ -15,12 +15,12 @@
%if %suse_version < 1000
BuildRequires: slang-devel
%endif
-License: GNU General Public License (GPL) - all versions, GNU Library General Public License v. 2.0 and 2.1 (LGPL)
+License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL)
Group: System/GUI/KDE
Summary: Additional Modules for Kate, Kicker, Konqueror, and Noatun
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Version: 3.5.5
-Release: 4
+Release: 5
Url: http://www.kde.org
Requires: kdelibs3 >= %(rpm -q --queryformat '%{VERSION}' kdelibs3)
Source: kdeaddons-%{version}.tar.bz2
@@ -341,6 +341,8 @@
/opt/kde3/share/icons/*/*/*/ksig.*
%changelog -n kdeaddons3
+* Fri Dec 01 2006 - stbinner@suse.de
+- fix possible crash of KonquerorDirFilterPlugin (#223957)
* Wed Nov 08 2006 - stbinner@suse.de
- remove historic "Provides:" (#218798)
* Tue Oct 31 2006 - coolo@suse.de
++++++ permanent-searchbar.diff ++++++
--- /var/tmp/diff_new_pack.nyYfaq/_old 2006-12-07 20:34:52.000000000 +0100
+++ /var/tmp/diff_new_pack.nyYfaq/_new 2006-12-07 20:34:52.000000000 +0100
@@ -1,7 +1,5 @@
-Index: konq-plugins/dirfilter/dirfilterplugin.cpp
-===================================================================
---- konq-plugins/dirfilter/dirfilterplugin.cpp (revision 593836)
-+++ konq-plugins/dirfilter/dirfilterplugin.cpp (working copy)
+--- ./konq-plugins/dirfilter/dirfilterplugin.cpp 2006/12/01 10:54:21 1.1
++++ ./konq-plugins/dirfilter/dirfilterplugin.cpp 2006/12/01 13:51:40
@@ -19,6 +19,8 @@
#include
#include
@@ -45,7 +43,7 @@
m_searchWidget(0)
{
m_part = ::qt_cast(parent);
-@@ -172,33 +179,26 @@
+@@ -172,40 +179,77 @@
QHBox *hbox = new QHBox(m_part->widget());
hbox->hide();
@@ -55,8 +53,7 @@
0, 0, 0, actionCollection(), "clear_filter");
- clear->setWhatsThis(i18n("Clear filter field<p>Clears the content of the filter field."));
-+ m_clear->setWhatsThis(i18n("Clear filter field<p>Clears the content of the filter field."));
-
+-
- if ( ::qt_cast(m_part->scrollWidget()) )
- {
- m_searchWidget = new KListViewSearchLine(hbox);
@@ -67,30 +64,38 @@
- m_searchWidget = new KIconViewSearchLine(hbox);
- static_cast(m_searchWidget)->setIconView(static_cast(m_part->scrollWidget()));
- }
++ m_clear->setWhatsThis(i18n("Clear filter field<p>Clears the content of the filter field."));
+
+-
+- if ( m_searchWidget )
+- {
+- QWhatsThis::add(m_searchWidget, i18n("Enter here a text which an item in the view must contain anywhere to be shown."));
+- connect(clear, SIGNAL(activated()), m_searchWidget, SLOT(clear()));
+- }
+ m_searchWidget = new SearchBarCombo(hbox, "search combo");
+ m_searchWidget->setDuplicatesEnabled(false);
+ m_searchWidget->setMaxCount(5);
+ m_searchWidget->setFixedWidth(180);
-
+ connect(m_searchWidget, SIGNAL(activated(const QString &)),
+ SLOT(startSearch(const QString &)));
+ connect(m_searchWidget, SIGNAL(iconClicked()), SLOT(showSelectionMenu()));
-- if ( m_searchWidget )
-- {
-- QWhatsThis::add(m_searchWidget, i18n("Enter here a text which an item in the view must contain anywhere to be shown."));
-- connect(clear, SIGNAL(activated()), m_searchWidget, SLOT(clear()));
-- }
--
KWidgetAction *filterAction = new KWidgetAction(hbox, i18n("Filter Field"),
0, 0, 0, actionCollection(), "toolbar_filter_field");
filterAction->setShortcutConfigurable(false);
+
-+ QTimer::singleShot(0, this, SLOT(slotDetectBeagle()));
++ m_timerDetectBeagle = new QTimer(this);
++ connect(m_timerDetectBeagle, SIGNAL(timeout()), SLOT(slotDetectBeagle()));
++ m_timerDetectBeagle->start(0, true);
}
DirFilterPlugin::~DirFilterPlugin()
-@@ -206,6 +206,41 @@
+ {
++ m_timerDetectBeagle->stop();
++ if (checking_for_beagle) {
++ checking_for_beagle = false;
++ qApp->exit_loop();
++ }
delete m_pFilterMenu;
}
@@ -99,11 +104,14 @@
+ KIO::UDSEntry uds;
+ const KURL kurl("beagle:?beagled-status");
+ if (checking_for_beagle) {
-+ QTimer::singleShot(10, this, SLOT(slotDetectBeagle()));
++ m_timerDetectBeagle->start(10, true);
+ return;
+ }
+ checking_for_beagle = true;
-+ if (!KIO::NetAccess::stat(kurl, uds)) {
++ bool stat_result = KIO::NetAccess::stat(kurl, uds);
++ if (!checking_for_beagle)
++ return;
++ if (!stat_result) {
+ switchToFilter();
+ }
+ else {
@@ -132,7 +140,7 @@
void DirFilterPlugin::slotOpenURL ()
{
KURL url = m_part->url();
-@@ -218,12 +253,13 @@
+@@ -218,12 +262,13 @@
//Clears the hidden list which is by now outdated...
if (m_searchWidget)
{
@@ -148,7 +156,7 @@
}
m_pURL = url;
-@@ -485,6 +521,162 @@
+@@ -485,6 +530,162 @@
m_part->openURL (m_part->url());
}
@@ -311,10 +319,8 @@
typedef KGenericFactory<DirFilterPlugin> DirFilterFactory;
K_EXPORT_COMPONENT_FACTORY (libdirfilterplugin, DirFilterFactory("dirfilterplugin"))
-Index: konq-plugins/dirfilter/dirfilterplugin.rc
-===================================================================
---- konq-plugins/dirfilter/dirfilterplugin.rc (revision 593836)
-+++ konq-plugins/dirfilter/dirfilterplugin.rc (working copy)
+--- ./konq-plugins/dirfilter/dirfilterplugin.rc 2006/12/01 10:54:23 1.1
++++ ./konq-plugins/dirfilter/dirfilterplugin.rc 2006/12/01 10:54:38
@@ -9,5 +9,6 @@
<Action name="filterdir"/>
</ToolBar>
@@ -322,10 +328,8 @@
+ <Action name="toolbar_filter_field" />
</ToolBar>
</kpartplugin>
-Index: konq-plugins/dirfilter/dirfilterplugin.h
-===================================================================
---- konq-plugins/dirfilter/dirfilterplugin.h (revision 593836)
-+++ konq-plugins/dirfilter/dirfilterplugin.h (working copy)
+--- ./konq-plugins/dirfilter/dirfilterplugin.h 2006/12/01 10:54:19 1.1
++++ ./konq-plugins/dirfilter/dirfilterplugin.h 2006/12/01 13:09:31
@@ -27,10 +27,13 @@
#include
#include
@@ -369,7 +373,7 @@
private slots:
void slotReset();
-@@ -119,14 +128,85 @@
+@@ -119,14 +128,86 @@
void slotItemSelected(int);
void slotItemRemoved(const KFileItem *);
void slotItemsAdded(const KFileItemList &);
@@ -384,6 +388,7 @@
+
+
+ bool m_beagled_running;
++ QTimer *m_timerDetectBeagle;
KURL m_pURL;
KonqDirPart* m_part;
KActionMenu* m_pFilterMenu;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org