From a8dad7a37e568b636fa77c05e4e02b9f8d9a38bb Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Thu, 6 Jun 2013 17:14:51 +0100
Subject: [PATCH] Removed old pointer/keyboard grabbing code as it no longer
 works (bug #971459).

---
 system-config-printer-pointer-grab.patch | 32 ++++++++++++++++++++++++
 system-config-printer.spec               |  7 ++++++
 2 files changed, 39 insertions(+)
 create mode 100644 system-config-printer-pointer-grab.patch

diff --git a/system-config-printer-pointer-grab.patch b/system-config-printer-pointer-grab.patch
new file mode 100644
index 0000000..04b2d4b
--- /dev/null
+++ b/system-config-printer-pointer-grab.patch
@@ -0,0 +1,32 @@
+diff -up system-config-printer-1.4.1/pysmb.py.pointer-grab system-config-printer-1.4.1/pysmb.py
+--- system-config-printer-1.4.1/pysmb.py.pointer-grab	2013-05-09 12:10:45.000000000 +0100
++++ system-config-printer-1.4.1/pysmb.py	2013-06-06 17:13:43.906581683 +0100
+@@ -3,7 +3,7 @@
+ ## system-config-printer
+ ## CUPS backend
+  
+-## Copyright (C) 2002, 2003, 2006, 2007, 2008, 2010, 2012 Red Hat, Inc.
++## Copyright (C) 2002, 2003, 2006, 2007, 2008, 2010, 2012, 2013 Red Hat, Inc.
+ ## Authors:
+ ##  Tim Waugh <twaugh@redhat.com>
+  
+@@ -23,7 +23,6 @@
+ 
+ import errno
+ from gettext import gettext as _
+-from gi.repository import Gdk
+ from gi.repository import Gtk
+ import os
+ import pwd
+@@ -145,11 +144,7 @@ class AuthContext:
+         domain_entry.set_text (self.use_workgroup)
+ 
+         d.set_keep_above (True)
+-        Gdk.pointer_grab (d.get_window(), True)
+-        Gdk.keyboard_grab (d.get_window(), True)
+         response = d.run ()
+-        Gdk.keyboard_ungrab ()
+-        Gdk.pointer_ungrab ()
+ 
+         if response == Gtk.ResponseType.CANCEL:
+             self.cancel = True
diff --git a/system-config-printer.spec b/system-config-printer.spec
index 1206f11..8638214 100644
--- a/system-config-printer.spec
+++ b/system-config-printer.spec
@@ -16,6 +16,7 @@ Patch7: system-config-printer-utf8-969846.patch
 Patch8: system-config-printer-utf8-971417.patch
 Patch9: system-config-printer-typo.patch
 Patch10: system-config-printer-notify-urgency.patch
+Patch11: system-config-printer-pointer-grab.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: desktop-file-utils >= 0.2.92
@@ -93,6 +94,10 @@ printers.
 # Notify urgencies have new names with gi.repository (bug #970646).
 %patch10 -p1 -b .notify-urgency
 
+# Removed old pointer/keyboard grabbing code as it no longer
+# works (bug #971459).
+%patch11 -p1 -b .pointer-grab
+
 %build
 %configure --with-udev-rules
 
@@ -193,6 +198,8 @@ exit 0
 
 %changelog
 * Thu Jun  6 2013 Tim Waugh <twaugh@redhat.com> 1.4.1-4
+- Removed old pointer/keyboard grabbing code as it no longer
+  works (bug #971459).
 - Notify urgencies have new names with gi.repository (bug #970646).
 - More fixes for UTF-8 encoding issues (bug #969846, bug #971417).