[SCM] Polkit KDE 1 packaging branch, master, updated. debian/0.99.0-2-2-g0a9988b

[Scott Kitterman]

The following commit has been merged in the master branch:
commit 0a9988bbd6ad4275c4ae465e82b44345c6786429
Author: Scott Kitterman <scott at kitterman.com>
Date:   Sat May 28 09:38:57 2011 -0400

    Add debian/patches/fix_dialog_focus.diff to prevent the auth dialog from popping up in the background where it can't be seen
---
 debian/changelog                     |    4 +++-
 debian/patches/fix_dialog_focus.diff |   24 ++++++++++++++++++++++++
 debian/patches/series                |    1 +
 3 files changed, 28 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a203ba6..6825ef7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,9 @@
 polkit-kde-1 (0.99.0-3) UNRELEASED; urgency=low
 
   [ Scott Kitterman ]
-  * 
+  * Add debian/patches/fix_dialog_focus.diff from Kubuntu
+    - Prevents the auth dialog from popping up in the background where it can't
+      be seen
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 28 May 2011 09:21:15 -0400
 
diff --git a/debian/patches/fix_dialog_focus.diff b/debian/patches/fix_dialog_focus.diff
new file mode 100644
index 0000000..b6c5a62
--- /dev/null
+++ b/debian/patches/fix_dialog_focus.diff
@@ -0,0 +1,24 @@
+Patch from Kubuntu
+Committed upstream in 0701f84a57156f8f584bb4fe928811a26ceefcf0
+Prevents the auth dialog from popping up in the background where it can't be
+seen
+Index: polkit-kde-agent-1-0.99.0/policykitlistener.cpp
+===================================================================
+--- polkit-kde-agent-1-0.99.0.orig/policykitlistener.cpp	2011-01-19 10:24:09.413897000 -0500
++++ polkit-kde-agent-1-0.99.0/policykitlistener.cpp	2011-01-19 10:24:36.577897000 -0500
+@@ -22,6 +22,7 @@
+ #include "AuthDialog.h"
+ 
+ #include <KDebug>
++#include <KWindowSystem>
+ 
+ #include <PolkitQt1/Agent/Listener>
+ #include <PolkitQt1/Agent/Session>
+@@ -100,6 +101,7 @@
+     kDebug() << "WinId of the dialog is " << m_dialog.data()->winId() << m_dialog.data()->effectiveWinId();
+     m_dialog.data()->setOptions();
+     m_dialog.data()->show();
++    KWindowSystem::forceActiveWindow(m_dialog.data()->winId());
+     kDebug() << "WinId of the shown dialog is " << m_dialog.data()->winId() << m_dialog.data()->effectiveWinId();
+ 
+     m_numTries = 0;
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..12bcb6a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix_dialog_focus.diff

-- 
Polkit KDE 1 packaging