Attachment 1110 Details for Bug 1288 – Fix incorrect dialog existence checks

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] Fix incorrect dialog existence checks

fix_kdesktop_lock_crash.diff (text/plain), 1.71 KB, created by Timothy Pearson on 2013-02-20 00:19:26 CST

(hide)

Description:

Filename:

MIME Type:

Creator: Timothy Pearson

Created: 2013-02-20 00:19:26 CST

Size: 1.71 KB

patch

obsolete

>diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc
>index aa68ba1..c08c4d4 100644
>--- a/kdesktop/lock/lockprocess.cc
>+++ b/kdesktop/lock/lockprocess.cc
>@@ -1845,8 +1845,9 @@ bool LockProcess::checkPass()
>             // Wait for SAK press before continuing...
>             SAKDlg inDlg( this );
>             execDialog( &inDlg );
>-            if (trinity_desktop_lock_closing_windows)
>+            if (trinity_desktop_lock_closing_windows) {
>                 return 0;
>+            }
>         }
> 
>         showVkbd();
>@@ -2028,7 +2029,9 @@ void LockProcess::cleanupPopup()
> {
>     TQWidget *dlg = (TQWidget *)sender();
>     mDialogs.remove( dlg );
>-    fakeFocusIn( mDialogs.first()->winId() );
>+    if ( mDialogs.isEmpty() ) {
>+        fakeFocusIn( mDialogs.first()->winId() );
>+    }
> }
> 
> void LockProcess::doFunctionKeyBroadcast() {
>@@ -2547,7 +2550,7 @@ void LockProcess::slotMouseActivity(XEvent *event)
> 	bool inDialog = 0;
> 	XButtonEvent *be = (XButtonEvent *) event;
> 	XMotionEvent *me = (XMotionEvent *) event;
>-	if ((event->type == ButtonPress) && (mDialogs.first())) {
>+	if ((event->type == ButtonPress) && (!mDialogs.isEmpty())) {
> 		// Get geometry including window frame/titlebar
> 		TQRect fgeom = mDialogs.first()->frameGeometry();
> 		TQRect wgeom = mDialogs.first()->geometry();
>@@ -2588,7 +2591,7 @@ void LockProcess::slotMouseActivity(XEvent *event)
> 			int deltaY = me->y_root - m_mousePrevY;
> 			m_dialogPrevX = m_dialogPrevX + deltaX;
> 			m_dialogPrevY = m_dialogPrevY + deltaY;
>-			if (mDialogs.first()) mDialogs.first()->move(m_dialogPrevX, m_dialogPrevY);
>+			if (!mDialogs.isEmpty()) mDialogs.first()->move(m_dialogPrevX, m_dialogPrevY);
> 
> 			m_mousePrevX = me->x_root;
> 			m_mousePrevY = me->y_root;

Actions: View | Diff

Attachments on bug 1288: 1073 | 1074 | 1075 | 1077 | 1104 | 1110