rpms/system-config-printer
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Another fix from the move to gi.repository (bug #973662).

Browse Source 
Resolves: rhbz#973662
This commit is contained in:
Tim Waugh 2013-07-02 12:47:34 +01:00
parent 01b4f5471d
commit aeb0b9deca
2 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
system-config-printer-statusicon-geometry.patch Normal file
View File

@ -0,0 +1,32 @@
diff -up system-config-printer-1.4.1/jobviewer.py.statusicon-geometry system-config-printer-1.4.1/jobviewer.py
--- system-config-printer-1.4.1/jobviewer.py.statusicon-geometry 2013-07-02 12:44:38.076105142 +0100
+++ system-config-printer-1.4.1/jobviewer.py 2013-07-02 12:44:54.770626200 +0100
@@ -683,16 +683,19 @@ class JobViewer (GtkGUI):
if visible:
w = self.JobsWindow.get_window()
aw = self.JobsAttributesWindow.get_window()
- (s, area, o) = self.statusicon.get_geometry ()
- w.set_skip_taskbar_hint (True)
- if aw != None:
- aw.set_skip_taskbar_hint (True)
+ (loc, s, area, o) = self.statusicon.get_geometry ()
- w.property_change ("_NET_WM_ICON_GEOMETRY",
- "CARDINAL", 32,
- Gdk.PROP_MODE_REPLACE,
- list (area))
- self.JobsWindow.iconify ()
+ if loc:
+ w.set_skip_taskbar_hint (True)
+ if aw != None:
+ aw.set_skip_taskbar_hint (True)
+ w.property_change ("_NET_WM_ICON_GEOMETRY",
+ "CARDINAL", 32,
+ Gdk.PROP_MODE_REPLACE,
+ list (area))
+ self.JobsWindow.iconify ()
+ else:
+ self.JobsWindow.set_visible (False)
else:
self.JobsWindow.present ()
self.JobsWindow.set_skip_taskbar_hint (False)

5
system-config-printer.spec
View File

@ -23,6 +23,7 @@ Patch14: system-config-printer-np-traceback.patch
Patch15: system-config-printer-rename.patch
Patch16: system-config-printer-notification-new.patch
Patch17: system-config-printer-utf8-971973.patch
Patch18: system-config-printer-statusicon-geometry.patch
BuildRequires: cups-devel >= 1.2
BuildRequires: desktop-file-utils >= 0.2.92
@ -120,6 +121,9 @@ printers.
# Fixed another codec issue (bug #971973).
%patch17 -p1 -b .utf8-971973
# Another fix from the move to gi.repository (bug #973662).
%patch18 -p1 -b .statusicon-geometry
%build
%configure --with-udev-rules
@ -220,6 +224,7 @@ exit 0
%changelog
* Tue Jul 2 2013 Tim Waugh <twaugh@redhat.com> 1.4.1-8
- Another fix from the move to gi.repository (bug #973662).
- Fixed another codec issue (bug #971973).
* Thu Jun 20 2013 Jiri Popelka <jpopelka@redhat.com> - 1.4.1-7