[system-config-printer/f19] Don't call into Gtk directly from scp-dbus-service (bug #951710).
Tim Waugh
twaugh at fedoraproject.org
Mon Apr 15 11:44:04 UTC 2013
commit 2dac84ffc46e852645bd5e4a0e0140e3d04c468f
Author: Tim Waugh <twaugh at redhat.com>
Date: Mon Apr 15 12:12:07 2013 +0100
Don't call into Gtk directly from scp-dbus-service (bug #951710).
system-config-printer-DISPLAY.patch | 20 --------------------
system-config-printer.spec | 1 +
2 files changed, 1 insertions(+), 20 deletions(-)
---
diff --git a/system-config-printer-DISPLAY.patch b/system-config-printer-DISPLAY.patch
index 88d9192..890e47f 100644
--- a/system-config-printer-DISPLAY.patch
+++ b/system-config-printer-DISPLAY.patch
@@ -23,26 +23,6 @@ diff -up system-config-printer-1.4.0/applet.py.DISPLAY system-config-printer-1.4
APPDIR="/usr/share/system-config-printer"
ICON="printer"
-diff -up system-config-printer-1.4.0/scp-dbus-service.py.DISPLAY system-config-printer-1.4.0/scp-dbus-service.py
---- system-config-printer-1.4.0/scp-dbus-service.py.DISPLAY 2013-03-27 12:19:08.000000000 +0000
-+++ system-config-printer-1.4.0/scp-dbus-service.py 2013-04-11 15:33:03.102010436 +0100
-@@ -2,7 +2,7 @@
-
- ## system-config-printer
-
--## Copyright (C) 2010, 2011, 2012 Red Hat, Inc.
-+## Copyright (C) 2010, 2011, 2012, 2013 Red Hat, Inc.
- ## Authors:
- ## Tim Waugh <twaugh at redhat.com>
-
-@@ -531,6 +531,7 @@ if __name__ == '__main__':
- _client_demo ()
- sys.exit (0)
-
-+ Gtk.init (sys.argv)
- debugprint ("Service running...")
- loop = GObject.MainLoop ()
- g_killtimer = KillTimer (killfunc=loop.quit)
diff -up system-config-printer-1.4.0/system-config-printer.py.DISPLAY system-config-printer-1.4.0/system-config-printer.py
--- system-config-printer-1.4.0/system-config-printer.py.DISPLAY 2013-03-27 12:19:08.000000000 +0000
+++ system-config-printer-1.4.0/system-config-printer.py 2013-04-11 15:33:03.103010439 +0100
diff --git a/system-config-printer.spec b/system-config-printer.spec
index ccc1f15..18db775 100644
--- a/system-config-printer.spec
+++ b/system-config-printer.spec
@@ -180,6 +180,7 @@ exit 0
%changelog
* Mon Apr 15 2013 Tim Waugh <twaugh at redhat.com> 1.4.0-4
+- Don't call into Gtk directly from scp-dbus-service (bug #951710).
- Adjusted dependencies now we use GObject introspection.
* Fri Apr 12 2013 Tim Waugh <twaugh at redhat.com> 1.4.0-3
More information about the scm-commits
mailing list