Author: ltinkl
Update of /cvs/extras/rpms/kdebase-workspace/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10936/F-9
Modified Files:
kdebase-workspace-4.0.72-rootprivs.patch
kdebase-workspace.spec
Log Message:
- fix 457479: "Run as root" dialog of kdm system settings is shown twice
(due to activated signal being connected to twice)
kdebase-workspace-4.0.72-rootprivs.patch:
Index: kdebase-workspace-4.0.72-rootprivs.patch
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/F-9/kdebase-workspace-4.0.72-rootprivs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdebase-workspace-4.0.72-rootprivs.patch 19 Jul 2008 18:15:11 -0000 1.1
+++ kdebase-workspace-4.0.72-rootprivs.patch 1 Aug 2008 14:54:58 -0000 1.2
@@ -1,6 +1,7 @@
-diff -ur kdebase-workspace-4.0.72/systemsettings/mainwindow.cpp kdebase-workspace-4.0.72-rootprivs/systemsettings/mainwindow.cpp
---- kdebase-workspace-4.0.72/systemsettings/mainwindow.cpp 2008-04-30 15:58:34.000000000 +0200
-+++ kdebase-workspace-4.0.72-rootprivs/systemsettings/mainwindow.cpp 2008-05-07 01:05:14.000000000 +0200
+Index: mainwindow.cpp
+===================================================================
+--- mainwindow.cpp (revision 835492)
++++ mainwindow.cpp (working copy)
@@ -27,6 +27,7 @@
#include <QLayout>
@@ -17,7 +18,21 @@
#include <kcategorizedview.h>
#include <kcategorydrawer.h>
#include <kiconloader.h>
-@@ -297,9 +299,13 @@
+@@ -176,13 +178,6 @@
+ connect( tv,
+ SIGNAL(activated(const QModelIndex&)),
+ SLOT(selectionChanged(const QModelIndex&)) );
+- if (KGlobalSettings::singleClick()) {
+- connect( tv, SIGNAL(clicked(const QModelIndex&)),
+- SLOT(selectionChanged(const QModelIndex&)));
+- } else {
+- connect( tv, SIGNAL(doubleClicked(const QModelIndex&)),
+- SLOT(selectionChanged(const QModelIndex&)));
+- }
+ connect( search, SIGNAL(textChanged(const QString&)),
+ kcsfpm, SLOT(setFilterRegExp(const QString&)));
+ connect( kcsfpm, SIGNAL(layoutChanged()),
+@@ -299,9 +294,13 @@
return;
MenuItem * mItem = selected.data( Qt::UserRole ).value<MenuItem*>();
@@ -31,7 +46,7 @@
} else {
kDebug() << ":'( Got dud pointer from " << selected.data( Qt::DisplayRole ).toString();
Q_ASSERT(mItem); // Would core dump below. Do it now
-@@ -311,6 +317,35 @@
+@@ -313,6 +312,35 @@
if ( groupWidget )
return;
Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/F-9/kdebase-workspace.spec,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- kdebase-workspace.spec 1 Aug 2008 00:54:16 -0000 1.97
+++ kdebase-workspace.spec 1 Aug 2008 14:54:58 -0000 1.98
@@ -4,7 +4,7 @@
Name: kdebase-workspace
Version: 4.1.0
-Release: 4%{?dist}
+Release: 5%{?dist}
Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
License: GPLv2
Group: User Interface/Desktops
@@ -304,6 +304,10 @@
%changelog
+* Fri Aug 1 2008 Lukáš Tinkl <ltinkl at redhat.com> 4.1.0-5
+- fix 457479: "Run as root" dialog of kdm system settings is shown twice
+ (due to activated signal being connected to twice)
+
* Fri Aug 01 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.1.0-4
- fix KDM configuration using the wrong appsdir for themes (#455623)