rpms/system-config-printer/devel system-config-printer-iconify.patch, NONE, 1.1 system-config-printer.spec, 1.296, 1.297

Tim Waugh twaugh at fedoraproject.org
Fri Sep 18 13:01:39 UTC 2009


Author: twaugh

Update of /cvs/pkgs/rpms/system-config-printer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8744

Modified Files:
	system-config-printer.spec 
Added Files:
	system-config-printer-iconify.patch 
Log Message:
* Fri Sep 18 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-2
- Iconify jobs window into status icon.


system-config-printer-iconify.patch:
 jobviewer.py |   16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

--- NEW FILE system-config-printer-iconify.patch ---
diff -up system-config-printer-1.1.13/jobviewer.py.iconify system-config-printer-1.1.13/jobviewer.py
--- system-config-printer-1.1.13/jobviewer.py.iconify	2009-09-04 10:35:48.000000000 +0100
+++ system-config-printer-1.1.13/jobviewer.py	2009-09-18 13:52:20.235314913 +0100
@@ -389,14 +389,24 @@ class JobViewer (GtkGUI, monitor.Watcher
         return errordialogs.show_IPP_Error (exception, message, self.JobsWindow)
 
     def toggle_window_display(self, icon, force_show=False):
-        visible = self.JobsWindow.get_property('visible')
+        visible = self.JobsWindow.get_data('visible')
         if force_show:
             visible = False
 
         if visible:
-            self.JobsWindow.hide()
+            w = self.JobsWindow.window
+            (s, area, o) = self.statusicon.get_geometry ()
+            w.set_skip_taskbar_hint (True)
+            w.property_change ("_NET_WM_ICON_GEOMETRY",
+                               "CARDINAL", 32,
+                               gtk.gdk.PROP_MODE_REPLACE,
+                               list (area))
+            self.JobsWindow.iconify ()
         else:
-            self.JobsWindow.show()
+            self.JobsWindow.present ()
+            self.JobsWindow.window.set_skip_taskbar_hint (False)
+
+        self.JobsWindow.set_data ('visible', not visible)
 
     def on_show_completed_jobs_activate(self, menuitem):
         if menuitem.get_active():


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/devel/system-config-printer.spec,v
retrieving revision 1.296
retrieving revision 1.297
diff -u -p -r1.296 -r1.297
--- system-config-printer.spec	18 Sep 2009 12:52:16 -0000	1.296
+++ system-config-printer.spec	18 Sep 2009 13:01:39 -0000	1.297
@@ -18,6 +18,7 @@ Source2: http://cyberelk.net/tim/data/py
 Patch1: system-config-printer-data-button-state.patch
 Patch2: system-config-printer-cancel-traceback.patch
 Patch3: system-config-printer-publish-printers.patch
+Patch4: system-config-printer-iconify.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -81,6 +82,7 @@ printers.
 %patch1 -p1 -b .data-button-state
 %patch2 -p1 -b .cancel-traceback
 %patch3 -p1 -b .publish-printers
+%patch4 -p1 -b .iconify
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -193,6 +195,7 @@ exit 0
 
 %changelog
 * Fri Sep 18 2009 Tim Waugh <twaugh at redhat.com> 1.1.13-2
+- Iconify jobs window into status icon.
 - Avoid showing the publish-printers dialog when not necessary.
 - Fixed traceback when cancelling change-driver dialog.
 - Fixed data button state.




More information about the fedora-extras-commits mailing list