rev 6536 - in trunk/packages/kdeutils/debian: . patches

[Ana Beatriz Guerrero López]

Author: ana
Date: 2007-06-18 19:47:58 +0000 (Mon, 18 Jun 2007)
New Revision: 6536

Modified:
   trunk/packages/kdeutils/debian/changelog
   trunk/packages/kdeutils/debian/patches/16_klaptopdaemon_lock_and_hibernate.diff
Log:
New patch for 416824



Modified: trunk/packages/kdeutils/debian/changelog
===================================================================
--- trunk/packages/kdeutils/debian/changelog	2007-06-18 17:11:05 UTC (rev 6535)
+++ trunk/packages/kdeutils/debian/changelog	2007-06-18 19:47:58 UTC (rev 6536)
@@ -1,3 +1,10 @@
+kdeutils (4:3.5.7-2) unstable; urgency=low
+
+  * Redone patch 16_klaptopdaemon_lock_and_hibernate. Thanks to Raúl Sánchez 
+    Siles again. (Closes: #416824)
+
+ -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Mon, 18 Jun 2007 21:38:07 +0200
+
 kdeutils (4:3.5.7-1) unstable; urgency=low
 
   * New upstream release:

Modified: trunk/packages/kdeutils/debian/patches/16_klaptopdaemon_lock_and_hibernate.diff
===================================================================
--- trunk/packages/kdeutils/debian/patches/16_klaptopdaemon_lock_and_hibernate.diff	2007-06-18 17:11:05 UTC (rev 6535)
+++ trunk/packages/kdeutils/debian/patches/16_klaptopdaemon_lock_and_hibernate.diff	2007-06-18 19:47:58 UTC (rev 6536)
@@ -1,19 +1,22 @@
---- kdeutils-3.5.6/klaptopdaemon/daemondock.cpp.orig	2007-05-02 14:20:23.000000000 +0200
-+++ kdeutils-3.5.6/klaptopdaemon/daemondock.cpp	2007-05-02 14:22:23.000000000 +0200
+--- klaptopdaemon/daemondock.cpp	2007-06-18 22:08:51.000000000 +0200
++++ klaptopdaemon/daemondock.cpp	2007-06-18 22:16:24.000000000 +0200
 @@ -30,6 +30,7 @@
  #include <klocale.h>
  #include <kpopupmenu.h>
  #include <dcopclient.h>
-+#include <dcopref.h>
++#include <dcopref.h> 
  #include "kpcmciainfo.h"
  #include "daemondock.h"
  #include "portable.h"
-@@ -501,7 +502,7 @@
+@@ -501,7 +502,10 @@
  {
    DCOPClient* client = kapp->dcopClient();
    if (client)
 -      client->send("kdesktop", "KScreensaverIface", "lock()", "");
-+      DCOPRef("kdesktop", "KScreenSaverIface").call("lock"); 
++  { 
++    client->attach(); 
++    DCOPRef("kdesktop", "KScreenSaverIface").call("lock"); 
++  }
    laptop_portable::invoke_hibernation();
  }
  void laptop_dock::invokeStandby()