Hello community,
here is the log from the commit of package kdeaddons3
checked in at Mon Oct 9 18:29:43 CEST 2006.
--------
--- KDE/kdeaddons3/kdeaddons3.changes 2006-10-03 10:29:15.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdeaddons3/kdeaddons3.changes 2006-10-09 12:56:47.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Oct 9 12:56:22 CEST 2006 - stbinner@suse.de
+
+- fix konqueror blocks while opening a profile with more than
+ one windows (#210147)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdeaddons3.spec ++++++
--- /var/tmp/diff_new_pack.CBOd6j/_old 2006-10-09 18:25:22.000000000 +0200
+++ /var/tmp/diff_new_pack.CBOd6j/_new 2006-10-09 18:25:22.000000000 +0200
@@ -20,7 +20,7 @@
Summary: Additional Modules for Kate, Kicker, Konqueror, and Noatun
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Version: 3.5.5
-Release: 1
+Release: 2
Url: http://www.kde.org
Requires: kdelibs3 >= %(rpm -q --queryformat '%{VERSION}' kdelibs3)
Source: kdeaddons-%{version}.tar.bz2
@@ -347,6 +347,9 @@
/opt/kde3/share/icons/*/*/*/ksig.*
%changelog -n kdeaddons3
+* Mon Oct 09 2006 - stbinner@suse.de
+- fix konqueror blocks while opening a profile with more than
+ one windows (#210147)
* Tue Oct 03 2006 - stbinner@suse.de
- update to 3.5.5 release tarball
* Tue Sep 19 2006 - stbinner@suse.de
++++++ permanent-searchbar.diff ++++++
--- /var/tmp/diff_new_pack.CBOd6j/_old 2006-10-09 18:25:22.000000000 +0200
+++ /var/tmp/diff_new_pack.CBOd6j/_new 2006-10-09 18:25:22.000000000 +0200
@@ -1,6 +1,6 @@
Index: konq-plugins/dirfilter/dirfilterplugin.cpp
===================================================================
---- konq-plugins/dirfilter/dirfilterplugin.cpp (revision 586270)
+--- konq-plugins/dirfilter/dirfilterplugin.cpp (revision 593836)
+++ konq-plugins/dirfilter/dirfilterplugin.cpp (working copy)
@@ -19,6 +19,8 @@
#include
@@ -90,7 +90,7 @@
}
DirFilterPlugin::~DirFilterPlugin()
-@@ -206,6 +206,35 @@
+@@ -206,6 +206,41 @@
delete m_pFilterMenu;
}
@@ -98,6 +98,11 @@
+{
+ KIO::UDSEntry uds;
+ const KURL kurl("beagle:?beagled-status");
++ if (checking_for_beagle) {
++ QTimer::singleShot(10, this, SLOT(slotDetectBeagle()));
++ return;
++ }
++ checking_for_beagle = true;
+ if (!KIO::NetAccess::stat(kurl, uds)) {
+ switchToFilter();
+ }
@@ -112,6 +117,7 @@
+ switchToFilter();
+ }
+ }
++ checking_for_beagle = false;
+}
+
+void DirFilterPlugin::startSearch(const QString &search)
@@ -126,7 +132,7 @@
void DirFilterPlugin::slotOpenURL ()
{
KURL url = m_part->url();
-@@ -218,12 +247,13 @@
+@@ -218,12 +253,13 @@
//Clears the hidden list which is by now outdated...
if (m_searchWidget)
{
@@ -142,7 +148,7 @@
}
m_pURL = url;
-@@ -485,6 +515,162 @@
+@@ -485,6 +521,162 @@
m_part->openURL (m_part->url());
}
@@ -307,7 +313,7 @@
Index: konq-plugins/dirfilter/dirfilterplugin.rc
===================================================================
---- konq-plugins/dirfilter/dirfilterplugin.rc (revision 586270)
+--- konq-plugins/dirfilter/dirfilterplugin.rc (revision 593836)
+++ konq-plugins/dirfilter/dirfilterplugin.rc (working copy)
@@ -9,5 +9,6 @@
<Action name="filterdir"/>
@@ -318,7 +324,7 @@
</kpartplugin>
Index: konq-plugins/dirfilter/dirfilterplugin.h
===================================================================
---- konq-plugins/dirfilter/dirfilterplugin.h (revision 586270)
+--- konq-plugins/dirfilter/dirfilterplugin.h (revision 593836)
+++ konq-plugins/dirfilter/dirfilterplugin.h (working copy)
@@ -27,10 +27,13 @@
#include
@@ -347,7 +353,15 @@
protected:
-@@ -108,6 +115,7 @@
+@@ -76,6 +83,7 @@
+ QMap m_typedFilter;
+ };
+
++static bool checking_for_beagle = false;
+
+ class DirFilterPlugin : public KParts::Plugin
+ {
+@@ -108,6 +116,7 @@
void loadSettings();
void saveSettings();
@@ -355,7 +369,7 @@
private slots:
void slotReset();
-@@ -119,14 +127,85 @@
+@@ -119,14 +128,85 @@
void slotItemSelected(int);
void slotItemRemoved(const KFileItem *);
void slotItemsAdded(const KFileItemList &);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org