From 5da49def1d879f184c870adae9d9bf8b2c05ccce Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Sat, 6 Sep 2014 13:24:51 +0100
Subject: [PATCH] Take the gdk lock before entering gtk_main() (bug #1052203
 comment #24).

Resolves: rhbz#1052203
---
 system-config-printer-lock.patch | 20 ++++++++++++++++++++
 system-config-printer.spec       |  9 ++++++++-
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 system-config-printer-lock.patch

diff --git a/system-config-printer-lock.patch b/system-config-printer-lock.patch
new file mode 100644
index 0000000..cd0b729
--- /dev/null
+++ b/system-config-printer-lock.patch
@@ -0,0 +1,20 @@
+diff -up system-config-printer-1.5.1/scp-dbus-service.py.lock system-config-printer-1.5.1/scp-dbus-service.py
+--- system-config-printer-1.5.1/scp-dbus-service.py.lock	2014-08-22 12:20:15.000000000 +0100
++++ system-config-printer-1.5.1/scp-dbus-service.py	2014-09-06 13:23:34.292543622 +0100
+@@ -2,7 +2,7 @@
+ 
+ ## system-config-printer
+ 
+-## Copyright (C) 2010, 2011, 2012, 2013 Red Hat, Inc.
++## Copyright (C) 2010, 2011, 2012, 2013, 2014 Red Hat, Inc.
+ ## Authors:
+ ##  Tim Waugh <twaugh@redhat.com>
+ 
+@@ -572,5 +572,7 @@ if __name__ == '__main__':
+     debugprint ("Service running...")
+     g_killtimer = KillTimer (killfunc=Gtk.main_quit)
+     cp = ConfigPrinting ()
++    Gdk.threads_enter ()
+     Gtk.main ()
++    Gdk.threads_leave ()
+     cp.destroy ()
diff --git a/system-config-printer.spec b/system-config-printer.spec
index 728ddc0..9781152 100644
--- a/system-config-printer.spec
+++ b/system-config-printer.spec
@@ -7,12 +7,13 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.5.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
 Source0: http://cyberelk.net/tim/data/system-config-printer/1.4/%{name}-%{version}.tar.xz
 Patch1: system-config-printer-no-applet-in-gnome.patch
+Patch2: system-config-printer-lock.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: desktop-file-utils >= 0.2.92
@@ -84,6 +85,9 @@ printers.
 # Don't start the applet in GNOME.
 %patch1 -p1 -b .no-applet-in-gnome
 
+# Take the gdk lock before entering gtk_main() (bug #1052203 comment #24).
+%patch2 -p1 -b .lock
+
 %build
 %configure --with-udev-rules
 make %{?_smp_mflags}
@@ -183,6 +187,9 @@ touch %buildroot%{_localstatedir}/run/udev-configure-printer/usb-uris
 exit 0
 
 %changelog
+* Sat Sep  6 2014 Tim Waugh <twaugh@redhat.com> - 1.5.1-2
+- Take the gdk lock before entering gtk_main() (bug #1052203 comment #24).
+
 * Tue Sep  2 2014 Tim Waugh <twaugh@redhat.com> - 1.5.1-1
 - 1.5.1, with some Python3 fixes (bug #1136470),
   udev-configure-printer fixes, and a fix for a D-Bus service