rpms/kdebase-workspace/F-12 kdebase-workspace-4.4.0-kde217882.patch, NONE, 1.1 kdebase-workspace.spec, 1.324, 1.325

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15921/F-12

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.4.0-kde217882.patch 
Log Message:
sync w/devel


kdebase-workspace-4.4.0-kde217882.patch:
 lockdlg.cc |   11 ++++++++++-
 lockdlg.h  |    1 +
 2 files changed, 11 insertions(+), 1 deletion(-)

--- NEW FILE kdebase-workspace-4.4.0-kde217882.patch ---
--- trunk/KDE/kdebase/workspace/krunner/lock/lockdlg.cc	2010/01/30 15:05:57	1082437
+++ trunk/KDE/kdebase/workspace/krunner/lock/lockdlg.cc	2010/02/12 17:51:21	1089213
@@ -85,7 +85,8 @@
     : KDialog(parent, Qt::X11BypassWindowManagerHint),
       mPlugin( plugin ),
       mCapsLocked(-1),
-      mUnlockingFailed(false)
+      mUnlockingFailed(false),
+      sNot(0)
 {
     QWidget* w = mainWidget();
 
@@ -435,6 +436,8 @@
 //
 void PasswordDlg::gplugStart()
 {
+    if (sNot)
+        return;
     int sfd[2];
     char fdbuf[16];
 
@@ -465,6 +468,7 @@
     sFd = sfd[0];
     sNot = new QSocketNotifier(sFd, QSocketNotifier::Read, this);
     connect(sNot, SIGNAL(activated(int)), SLOT(handleVerify()));
+    connect(sNot, SIGNAL(destroyed()), SLOT(slotNotifierDestroyed()));
 }
 
 void PasswordDlg::gplugChanged()
@@ -651,6 +655,11 @@
         KDisplayManager().switchVT( itm->vt );
 }
 
+void PasswordDlg::slotNotifierDestroyed()
+{
+    sNot = 0;
+}
+
 void PasswordDlg::capsLocked()
 {
     unsigned int lmask;
--- trunk/KDE/kdebase/workspace/krunner/lock/lockdlg.h	2009/09/26 11:36:14	1028250
+++ trunk/KDE/kdebase/workspace/krunner/lock/lockdlg.h	2010/02/12 17:51:21	1089213
@@ -63,6 +63,7 @@
     void slotOK();
     void slotActivity();
     void handleVerify();
+    void slotNotifierDestroyed();
 
 private:
     void capsLocked();


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-12/kdebase-workspace.spec,v
retrieving revision 1.324
retrieving revision 1.325
diff -u -p -r1.324 -r1.325
--- kdebase-workspace.spec	11 Feb 2010 17:35:06 -0000	1.324
+++ kdebase-workspace.spec	12 Feb 2010 20:03:45 -0000	1.325
@@ -72,6 +72,8 @@ Patch51: kdebase-workspace-4.3.95-bright
 # 4.4 patches
 # kde#200184, Plasma Memory Leak and High CPU usage
 Patch100: kdebase-workspace-kde#200184.patch
+# kscreenlocker
+Patch101: kdebase-workspace-4.4.0-kde217882.patch
 
 # moving to non-multilib hack
 Obsoletes: kdebase-workspace < 4.3.0-2
@@ -321,6 +323,8 @@ Requires: akonadi
 %patch51 -p1 -b .brightness_keys
 
 %patch100 -p1 -b .kde#200184
+%patch101 -p4 -b .kde217882
+
 
 %build
 
@@ -344,9 +348,12 @@ make install/fast DESTDIR=%{buildroot} -
 
 # xsession support
 mkdir -p %{buildroot}%{_datadir}/xsessions/
-mv %{_kde4_appsdir}/kdm/sessions/kde.desktop %{buildroot}%{_datadir}/xsessions/kde.desktop
-# remove the rest of useless xsession files
-rm -rf %{buildroot}%{_kde4_appsdir}/kdm/sessions/
+mv %{buildroot}%{_kde4_appsdir}/kdm/sessions/kde.desktop \
+   %{buildroot}%{_kde4_appsdir}/kdm/sessions/kde-safe.desktop \ 
+   %{buildroot}%{_datadir}/xsessions/
+# remove the rest of useless xsession files (than)
+# debatable, let's talk about this first (rdieter)
+#rm -rf %{buildroot}%{_kde4_appsdir}/kdm/sessions/
 
 # nuke, use external kde-settings-kdm
 rm -rf  %{buildroot}%{_kde4_configdir}/kdm
@@ -669,9 +676,10 @@ fi
 
 
 %changelog
-* Thu Feb 11 2010 Than Ngo <than at redhat.com> - 4.4.0-5
-- user cannot start kde from gdm if kdm is not installed, it's only happend on fedora > 11
-  move kdm move xsession desktop file in main package
+* Thu Feb 11 2010 Than Ngo <than at redhat.com> - 4.4.0-4
+- move xsession desktop files to main package
+  (cannot start kde from gdm if kdm not installed)
+- Desktop locking crashes (kde#217882#16)
 
 * Thu Feb 11 2010 Jaroslav Reznik <jreznik at redhat.com> - 4.4.0-3
 - requires bluez for solid-bluetooth