Hello community,
here is the log from the commit of package kdebase3
checked in at Mon Dec 18 18:53:27 CET 2006.
--------
--- KDE/kdebase3/kdebase3.changes 2006-12-11 15:09:51.000000000 +0100
+++ /mounts/work_src_done/STABLE/kdebase3/kdebase3.changes 2006-12-18 18:45:10.000000000 +0100
@@ -1,0 +2,5 @@
+Mon Dec 18 18:44:45 CET 2006 - llunak@suse.cz
+
+- handle custom browser specified as .desktop file (#224897)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase3.spec ++++++
--- /var/tmp/diff_new_pack.9a36hp/_old 2006-12-18 18:52:03.000000000 +0100
+++ /var/tmp/diff_new_pack.9a36hp/_new 2006-12-18 18:52:03.000000000 +0100
@@ -52,7 +52,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Url: http://www.kde.org/
Version: 3.5.5
-Release: 79
+Release: 85
%define kde_version 3.5.5
Source0: kdebase-%{kde_version}.tar.bz2
Source3: startkde.suse.sh
@@ -385,7 +385,7 @@
Summary: Set and list fileshares
Group: System/Management
Version: 2.0
-Release: 210
+Release: 218
%description -n fileshareset
This package contains the the fileshareset utility to allow users to
@@ -1527,6 +1527,8 @@
%endif
%changelog -n kdebase3
+* Mon Dec 18 2006 - llunak@suse.cz
+- handle custom browser specified as .desktop file (#224897)
* Mon Dec 11 2006 - stbinner@suse.de
- unbreak mach_blass_legacy.diff (revert brain damage)
* Wed Dec 06 2006 - stbinner@suse.de
++++++ khotkeys-multimedia-action2.diff ++++++
--- /var/tmp/diff_new_pack.9a36hp/_old 2006-12-18 18:52:07.000000000 +0100
+++ /var/tmp/diff_new_pack.9a36hp/_new 2006-12-18 18:52:07.000000000 +0100
@@ -1,6 +1,14 @@
---- khotkeys/shared/actions.cpp.sav
-+++ khotkeys/shared/actions.cpp
-@@ -116,8 +116,10 @@
+--- khotkeys/shared/actions.cpp.sav 2006-12-06 16:54:40.000000000 +0100
++++ khotkeys/shared/actions.cpp 2006-12-18 18:11:47.000000000 +0100
+@@ -29,6 +29,7 @@
+ #include
+ #include
+ #include
++#include
+
+ #include "windows.h"
+ #include "action_data.h"
+@@ -116,8 +117,10 @@ void Command_url_action::execute()
{
if( command_url().isEmpty())
return;
@@ -12,7 +20,7 @@
// int space_pos = command_url().find( ' ' );
// if( command_url()[ 0 ] != '\'' && command_url()[ 0 ] != '"' && space_pos > -1
// && command_url()[ space_pos - 1 ] != '\\' )
-@@ -170,6 +172,29 @@
+@@ -170,6 +173,38 @@ void Command_url_action::execute()
timeout.start( 1000, true ); // 1sec timeout
}
@@ -26,6 +34,15 @@
+ QString browser = config.readEntry("BrowserApplication");
+ if( browser.startsWith( QString::fromLatin1( "!" )))
+ browser = browser.mid( 1 );
++ else
++ {
++ KService::Ptr service = KService::serviceByStorageId( browser );
++ if( service )
++ {
++ browser = service->exec();
++ browser.replace( QRegExp( " %.?" ), "" ); // remove " %u" and others
++ }
++ }
+ if( browser.isEmpty())
+ browser = QString::fromLatin1( "konqueror" ); // opens in webbrowsing profile by default
+ cmd = cmd.replace( "KHOTKEYS_BROWSER", browser );
@@ -42,9 +59,9 @@
const QString Command_url_action::description() const
{
return i18n( "Command/URL : " ) + command_url();
---- khotkeys/shared/actions.h.sav
-+++ khotkeys/shared/actions.h
-@@ -75,6 +75,7 @@
+--- khotkeys/shared/actions.h.sav 2006-12-06 16:54:40.000000000 +0100
++++ khotkeys/shared/actions.h 2006-12-14 15:53:16.000000000 +0100
+@@ -75,6 +75,7 @@ class KDE_EXPORT Command_url_action
protected:
QTimer timeout;
private:
++++++ kicker-defaults.diff ++++++
--- /var/tmp/diff_new_pack.9a36hp/_old 2006-12-18 18:52:07.000000000 +0100
+++ /var/tmp/diff_new_pack.9a36hp/_new 2006-12-18 18:52:07.000000000 +0100
@@ -13,6 +13,11 @@
Name[af]=Beheer Sentrum
Name[ar]=مركز التحكم
Name[az]=İdarə Mərkəzi
+@@ -86,3 +88,4 @@
+
+ X-DCOP-ServiceType=Unique
+ Categories=Qt;KDE;Core;
++Keywords=control,center
--- kicker/libkicker/kickerSettings.kcfg
+++ kicker/libkicker/kickerSettings.kcfg
@@ -175,7 +175,7 @@
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org