Attachment 509 Details for Bug 906 – SAK realization into TDM fix patch (updated for latest GIT)

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release.

[patch] SAK realization into TDM fix patch (updated for latest GIT)

tdebase-sak-fixes.diff (text/plain), 1.61 KB, created by Darrell on 2012-03-29 20:20:22 CDT

(hide)

Description:

Filename:

MIME Type:

Creator: Darrell

Created: 2012-03-29 20:20:22 CDT

Size: 1.61 KB

patch

obsolete

>diff -urN tdebase/tdm/kfrontend/kgapp.cpp tdebase.new/tdm/kfrontend/kgapp.cpp
>--- tdebase/tdm/kfrontend/kgapp.cpp	2012-03-23 19:53:24.000000000 -0500
>+++ tdebase.new/tdm/kfrontend/kgapp.cpp	2012-03-29 19:41:43.000000000 -0500
>@@ -170,6 +170,7 @@
> void
> checkSAK(GreeterApp* app)
> {
>+	if(!_useSAK)	return;
> 	app->restoreOverrideCursor();
> 	SAKDlg sak(0);
> 	sak.exec();
>diff -urN tdebase/tdm/kfrontend/sakdlg.cc tdebase.new/tdm/kfrontend/sakdlg.cc
>--- tdebase/tdm/kfrontend/sakdlg.cc	2012-03-23 19:53:23.000000000 -0500
>+++ tdebase.new/tdm/kfrontend/sakdlg.cc	2012-03-29 20:18:32.000000000 -0500
>@@ -68,6 +68,7 @@
> #include <signal.h>
> #include <libgen.h>
> 
>+#include "kdm_greet.h"
> #include "kfdialog.h"
> 
> #ifndef AF_LOCAL
>@@ -219,6 +220,13 @@
> 	}
> }
> 
>+void SAKDlg::keyPressEvent( TQKeyEvent *e )
>+{
>+    if(e->key() == Qt::Key_Delete &&
>+	    (e->state()&(Qt::ControlButton|Qt::AltButton)))
>+	closeDialogForced();
>+}
>+
> SAKDlg::~SAKDlg()
> {
>     if ((mSAKProcess) && (mSAKProcess->isRunning())) {
>@@ -235,12 +243,8 @@
> 
> void SAKDlg::closeDialogForced()
> {
>-    TQDialog::reject();
>-}
>-
>-void SAKDlg::reject()
>-{
>-
>+    closingDown = true;
>+    reject();
> }
> 
> void SAKDlg::updateLabel(TQString &txt)
>diff -urN tdebase/tdm/kfrontend/sakdlg.h tdebase.new/tdm/kfrontend/sakdlg.h
>--- tdebase/tdm/kfrontend/sakdlg.h	2012-03-23 19:53:24.000000000 -0500
>+++ tdebase.new/tdm/kfrontend/sakdlg.h	2012-03-29 20:18:34.000000000 -0500
>@@ -39,9 +39,7 @@
> private slots:
>     void slotSAKProcessExited();
>     void handleInputPipe();
>-
>-protected slots:
>-    virtual void reject();
>+    void keyPressEvent( TQKeyEvent* );
> 
> private:
>     TQFrame      *frame;

Actions: View | Diff

Attachments on bug 906: 480 | 508 | 509 | 510