slim: Changed patch for keyboard ctrl (take 2)

x11-misc/slim/Manifest

@@ -2,7 +2,7 @@ AUX 14509-fix-keyboard-in-tty-from-which-slim-is-lauched.patch 754 RMD160 079984
 AUX 15287-fix-pam-authentication-with-pam_unix2.patch 3017 RMD160 ae6a20b9eb313bd6b9f93726d5519309a2bafc85 SHA1 e17c582fe0cc1d2a07e51d410db2d61c11aba4c6 SHA256 ced3b92f48ba09cd61287b72737ea58e499a7eedd4f61e25ee1b148d0b6cfbb3
 AUX 261713-restart-xserver-if-killed.patch 3198 RMD160 97b6627b17f74a6fb88a967fee7364bdb3280710 SHA1 15d7bffb0588ac33ece488aa209c2418023d4739 SHA256 c4ff22a4930d6ef12ee6ff30f4782b64785c00d54f687ac620e5cbd5eee283f9
 AUX slim-1.3.2-config.diff 2102 RMD160 f55b6a0d9acace01c0950ffa55b0d0ea5ca2e54b SHA1 693937055fea62aa3ad037da351e9a2e8636c6ea SHA256 dea2cb302bd8dcc4318c9b1c0296d14db10c5d9f9247d48134ec1b35a9db0943
-AUX slim-1.3.2-kbd_ctrl.patch 3547 RMD160 249ea3819aa0cddfa84968ed4bb1de83c9a3274a SHA1 8bd35e8069409b7c3bd61846c6fb4bd13737bb1e SHA256 9af1e94bc78e3da93f72b7389c0a1d5cfa845eed36910838b8fb6324431faa03
+AUX slim-1.3.2-kbd_ctrl.patch 3547 RMD160 713c857f54ca4dc8fdb7e85cf495476e34f694b7 SHA1 39631d8ec327cf3e51da1a7f8be49805924cae2c SHA256 0534a6489df769265ea512b1f461bc0c940f6a3f188d92d6813e02eaa7c4cbd1
 AUX slim.logrotate 102 RMD160 ccf614eca8c0b8fc1fbc2dfb8bf71b02485a743b SHA1 d2bc9202862f0d33bb902eba3aa8fefe0797d7a3 SHA256 d0559cf7764147f601f2bab8077fd956b1171adad4872c0d324279f6a978264a
 DIST slim-1.3.2.tar.gz 220592 RMD160 1ca6504c07ea2d420fde86b6db0f4cfbbd6680fc SHA1 e421d5487732c8317f8f591906661e014b036358 SHA256 f1560125005f253b9b88220598fed7a9575ef405716862c6ca3fcc72dbd482b8
 EBUILD slim-1.3.2-r10.ebuild 3309 RMD160 addd51d26160fc32d3e359cfb5ddc0b074595559 SHA1 f89719ba1d81330fb2cb03e1eb2198489809573f SHA256 5e27f3fa7a3c97c77de902d612c670797e801bc5676cadf30b4851940155fcc5

x11-misc/slim/files/slim-1.3.2-kbd_ctrl.patch

@@ -1,109 +1,109 @@
-diff -ur slim-1.3.2/app.cpp slim-1.3.2_orig/app.cpp
---- slim-1.3.2/app.cpp	2010-08-22 16:10:53.000000000 +0200
-+++ slim-1.3.2_orig/app.cpp	2010-08-22 16:08:26.000000000 +0200
-@@ -51,13 +51,9 @@
+diff -ru slim-1.3.2_orig/app.cpp slim-1.3.2/app.cpp
+--- slim-1.3.2_orig/app.cpp	2010-08-22 16:08:26.000000000 +0200
++++ slim-1.3.2/app.cpp	2010-08-22 16:10:53.000000000 +0200
+@@ -51,9 +51,13 @@
                  panel->EventHandler(Panel::Get_Name);
                  switch(panel->getAction()){
                      case Panel::Suspend:
--                        Suspend();
--                        break;
++                        Suspend();
++                        break;
                      case Panel::Halt:
--                        Halt();
--                        break;
++                        Halt();
++                        break;
                      case Panel::Reboot:
--                        Reboot();
-+                        (*resp)[i].resp=strdup("root");
+-                        (*resp)[i].resp=strdup("root");
++                        Reboot();
                          break;
  
                      case Panel::Console:
-@@ -389,15 +385,12 @@
+@@ -385,12 +389,15 @@
              case Panel::Console:
                  Console();
                  break;
--            case Panel::KReboot:
++            case Panel::KReboot:
              case Panel::Reboot:
                  Reboot();
                  break;
--            case Panel::KHalt:
++            case Panel::KHalt:
              case Panel::Halt:
                  Halt();
                  break;
--            case Panel::KSuspend:
++            case Panel::KSuspend:
              case Panel::Suspend:
                  Suspend();
                  break;
-@@ -418,10 +411,6 @@
+@@ -411,6 +418,10 @@
      }
      catch(PAM::Auth_Exception& e){
          switch(LoginPanel->getAction()){
--            case Panel::KSuspend:
--            case Panel::KReboot:
--            case Panel::KHalt:
--                cerr << APPNAME << ": call app::AuthenticateUser usepam" << endl;
++            case Panel::KSuspend:
++            case Panel::KReboot:
++            case Panel::KHalt:
++                cerr << APPNAME << ": call app::AuthenticateUser usepam" << endl;
              case Panel::Exit:
              case Panel::Console:
                  return true; // <--- This is simply fake!
-@@ -442,11 +431,6 @@
+@@ -431,6 +442,11 @@
      if (!focuspass){
          LoginPanel->EventHandler(Panel::Get_Name);
          switch(LoginPanel->getAction()){
--            case Panel::KSuspend:
--            case Panel::KReboot:
--            case Panel::KHalt:
--                cerr << APPNAME << ": call App::AuthenticateUser " << endl;
--
++            case Panel::KSuspend:
++            case Panel::KReboot:
++            case Panel::KHalt:
++                cerr << APPNAME << ": call App::AuthenticateUser " << endl;
++
              case Panel::Exit:
              case Panel::Console:
                  cerr << APPNAME << ": Got a special command (" << LoginPanel->GetName() << ")" << endl;
-@@ -461,10 +445,6 @@
+@@ -445,6 +461,10 @@
      struct passwd *pw;
  
      switch(LoginPanel->getAction()){
--        case Panel::KSuspend:
--        case Panel::KHalt:
--        case Panel::KReboot:
--            return true;
++        case Panel::KSuspend:
++        case Panel::KHalt:
++        case Panel::KReboot:
++            return true;
          case Panel::Suspend:
          case Panel::Halt:
          case Panel::Reboot:
-diff -ur slim-1.3.2/panel.cpp slim-1.3.2_orig/panel.cpp
---- slim-1.3.2/panel.cpp	2010-08-22 16:11:10.000000000 +0200
-+++ slim-1.3.2_orig/panel.cpp	2010-07-08 07:04:10.000000000 +0200
-@@ -351,22 +351,6 @@
+diff -ru slim-1.3.2_orig/panel.cpp slim-1.3.2/panel.cpp
+--- slim-1.3.2_orig/panel.cpp	2010-07-08 07:04:10.000000000 +0200
++++ slim-1.3.2/panel.cpp	2010-08-22 16:11:10.000000000 +0200
+@@ -351,6 +351,22 @@
      string formerString = "";
      
      XLookupString(&event.xkey, &ascii, 1, &keysym, &compstatus);
--    if (reinterpret_cast<XKeyEvent&>(event).state & ControlMask) {
--        switch(keysym){
--            case XK_s:
--                action = KSuspend;
--                return false;
--            case XK_h:
--                action = KHalt;
--                return false;
--            case XK_r:
--                action = KReboot;
--                return false;
--            default:
--                break;
--        }
--    }
--
++    if (reinterpret_cast<XKeyEvent&>(event).state & ControlMask) {
++        switch(keysym){
++            case XK_s:
++                action = KSuspend;
++                return false;
++            case XK_h:
++                action = KHalt;
++                return false;
++            case XK_r:
++                action = KReboot;
++                return false;
++            default:
++                break;
++        }
++    }
++
      switch(keysym){
          case XK_F1:
              SwitchSession();
-diff -ur slim-1.3.2/panel.h slim-1.3.2_orig/panel.h
---- slim-1.3.2/panel.h	2010-08-22 16:11:17.000000000 +0200
-+++ slim-1.3.2_orig/panel.h	2010-07-08 07:04:10.000000000 +0200
-@@ -40,10 +40,7 @@
+diff -ru slim-1.3.2_orig/panel.h slim-1.3.2/panel.h
+--- slim-1.3.2_orig/panel.h	2010-07-08 07:04:10.000000000 +0200
++++ slim-1.3.2/panel.h	2010-08-22 16:11:17.000000000 +0200
+@@ -40,7 +40,10 @@
          Reboot,
          Halt,
          Exit,
--        Suspend,
--        KHalt,
--        KReboot,
--        KSuspend
-+        Suspend
+-        Suspend
++        Suspend,
++        KHalt,
++        KReboot,
++        KSuspend
      };
      enum FieldType {
          Get_Name,