rpms/system-config-printer/F-9 system-config-printer-1.0.x.patch, 1.4, 1.5 system-config-printer.spec, 1.198, 1.199

Tue Nov 4 17:39:15 UTC 2008

Author: twaugh

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

Modified Files:
	system-config-printer-1.0.x.patch system-config-printer.spec 
Log Message:
* Tue Nov  4 2008 Tim Waugh <twaugh at redhat.com> 1.0.9-5
- Updated patch for 1.0.x changes:
  - Fixed icon view display.


system-config-printer-1.0.x.patch:

Index: system-config-printer-1.0.x.patch
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-9/system-config-printer-1.0.x.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5

--- system-config-printer-1.0.x.patch	4 Nov 2008 16:32:27 -0000	1.4
+++ system-config-printer-1.0.x.patch	4 Nov 2008 17:39:14 -0000	1.5
@@ -1,7 +1,13 @@
 diff -U0 system-config-printer-1.0.9/ChangeLog.1.0.x system-config-printer-1.0.9/ChangeLog
 --- system-config-printer-1.0.9/ChangeLog.1.0.x	2008-10-21 17:26:45.000000000 +0100
-+++ system-config-printer-1.0.9/ChangeLog	2008-11-04 16:27:58.000000000 +0000
-@@ -0,0 +1,159 @@
++++ system-config-printer-1.0.9/ChangeLog	2008-11-04 17:35:18.000000000 +0000
+@@ -0,0 +1,165 @@
++2008-11-04  Tim Waugh  <twaugh at redhat.com>
++
++	* system-config-printer.py (GUI.__init__): Don't set the
++	IconView's item_width as that causes problem.  Set the column and
++	row spacing instead.
++
 +2008-11-04  Tim Waugh  <twaugh at redhat.com>
 +
 +	* monitor.py (Monitor.fetch_jobs): Apply specific_dests filter to
@@ -163,7 +169,7 @@
 +
 diff -up system-config-printer-1.0.9/cupshelpers/ppds.py.1.0.x system-config-printer-1.0.9/cupshelpers/ppds.py
 --- system-config-printer-1.0.9/cupshelpers/ppds.py.1.0.x	2008-10-21 17:21:24.000000000 +0100
-+++ system-config-printer-1.0.9/cupshelpers/ppds.py	2008-11-04 16:27:58.000000000 +0000
++++ system-config-printer-1.0.9/cupshelpers/ppds.py	2008-11-04 17:35:18.000000000 +0000
 @@ -327,7 +327,7 @@ class PPDs:
          particular printer model, given its make and model name.
  
@@ -175,7 +181,7 @@
          try:
 diff -up system-config-printer-1.0.9/jobviewer.py.1.0.x system-config-printer-1.0.9/jobviewer.py
 --- system-config-printer-1.0.9/jobviewer.py.1.0.x	2008-10-21 10:02:45.000000000 +0100
-+++ system-config-printer-1.0.9/jobviewer.py	2008-11-04 16:27:58.000000000 +0000
++++ system-config-printer-1.0.9/jobviewer.py	2008-11-04 17:35:18.000000000 +0000
 @@ -296,6 +296,7 @@ class JobViewer (monitor.Watcher):
          if bus == None:
              bus = dbus.SystemBus ()
@@ -531,7 +537,7 @@
  
 diff -up system-config-printer-1.0.9/monitor.py.1.0.x system-config-printer-1.0.9/monitor.py
 --- system-config-printer-1.0.9/monitor.py.1.0.x	2008-10-21 10:02:45.000000000 +0100
-+++ system-config-printer-1.0.9/monitor.py	2008-11-04 16:27:58.000000000 +0000
++++ system-config-printer-1.0.9/monitor.py	2008-11-04 17:35:18.000000000 +0000
 @@ -129,6 +129,7 @@ class Monitor:
          self.jobs = {}
          self.printer_state_reasons = {}
@@ -657,7 +663,7 @@
  
 diff -up system-config-printer-1.0.9/my-default-printer.py.1.0.x system-config-printer-1.0.9/my-default-printer.py
 --- system-config-printer-1.0.9/my-default-printer.py.1.0.x	2008-10-21 10:02:45.000000000 +0100
-+++ system-config-printer-1.0.9/my-default-printer.py	2008-11-04 16:27:58.000000000 +0000
++++ system-config-printer-1.0.9/my-default-printer.py	2008-11-04 17:35:18.000000000 +0000
 @@ -138,6 +138,7 @@ class Server:
  
  class Dialog:
@@ -668,7 +674,7 @@
                                    gtk.DIALOG_MODAL | gtk.DIALOG_NO_SEPARATOR,
 diff -up system-config-printer-1.0.9/po/pt_BR.po.1.0.x system-config-printer-1.0.9/po/pt_BR.po
 --- system-config-printer-1.0.9/po/pt_BR.po.1.0.x	2008-10-21 10:02:45.000000000 +0100
-+++ system-config-printer-1.0.9/po/pt_BR.po	2008-11-04 16:27:58.000000000 +0000
++++ system-config-printer-1.0.9/po/pt_BR.po	2008-11-04 17:35:18.000000000 +0000
 @@ -17,7 +17,7 @@ msgstr ""
  "Project-Id-Version: system-config-printer\n"
  "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/bugzilla\n"
@@ -2248,7 +2254,7 @@
 +
 diff -up system-config-printer-1.0.9/po/sr at latin.po.1.0.x system-config-printer-1.0.9/po/sr at latin.po
 --- system-config-printer-1.0.9/po/sr at latin.po.1.0.x	2008-10-21 10:02:45.000000000 +0100
-+++ system-config-printer-1.0.9/po/sr at latin.po	2008-11-04 16:27:58.000000000 +0000
++++ system-config-printer-1.0.9/po/sr at latin.po	2008-11-04 17:35:19.000000000 +0000
 @@ -1,61 +1,62 @@
  # translation of system-config-printer.0.7.82.x.sr.po to Serbian
 -# Serbian(Latin) translations for system-config-printer
@@ -3225,7 +3231,7 @@
  #~ msgstr "Lozinka je neophodna"
 diff -up system-config-printer-1.0.9/po/sr.po.1.0.x system-config-printer-1.0.9/po/sr.po
 --- system-config-printer-1.0.9/po/sr.po.1.0.x	2008-10-21 10:02:52.000000000 +0100
-+++ system-config-printer-1.0.9/po/sr.po	2008-11-04 16:27:58.000000000 +0000
++++ system-config-printer-1.0.9/po/sr.po	2008-11-04 17:35:18.000000000 +0000
 @@ -11,7 +11,7 @@ msgstr ""
  "Project-Id-Version: system-config-printer.0.7.82.x.sr\n"
  "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/bugzilla\n"
@@ -3297,8 +3303,18 @@
  msgid "Provide PPD file"
 diff -up system-config-printer-1.0.9/system-config-printer.py.1.0.x system-config-printer-1.0.9/system-config-printer.py
 --- system-config-printer-1.0.9/system-config-printer.py.1.0.x	2008-10-21 10:02:45.000000000 +0100
-+++ system-config-printer-1.0.9/system-config-printer.py	2008-11-04 16:27:58.000000000 +0000
-@@ -3410,9 +3410,12 @@ class NewPrinterGUI(GtkGUI):
++++ system-config-printer-1.0.9/system-config-printer.py	2008-11-04 17:35:19.000000000 +0000
+@@ -374,7 +374,8 @@ class GUI(GtkGUI, monitor.Watcher):
+                                       gobject.TYPE_STRING)   # Tooltip
+         
+         self.dests_iconview.set_model(self.mainlist)
+-        self.dests_iconview.set_item_width (145)
++        self.dests_iconview.set_column_spacing (30)
++        self.dests_iconview.set_row_spacing (20)
+         self.dests_iconview.set_pixbuf_column (1)
+         self.dests_iconview.set_text_column (2)
+         self.dests_iconview.set_tooltip_column (3)
+@@ -3410,9 +3411,12 @@ class NewPrinterGUI(GtkGUI):
          if step > 0 and next_page_nr == 0: # About to choose a name.
              # Suggest an appropriate name.
              name = None
@@ -3312,7 +3328,7 @@
              except:
                  nonfatalException ()
  
-@@ -3421,6 +3424,7 @@ class NewPrinterGUI(GtkGUI):
+@@ -3421,6 +3425,7 @@ class NewPrinterGUI(GtkGUI):
                      mname = self.ppd.findAttr ("modelName").value
                      make, model = cupshelpers.ppds.ppdMakeModelSplit (mname)
                      name = "%s %s" % (make, model)
@@ -3320,7 +3336,7 @@
              except:
                  nonfatalException ()
  
-@@ -3430,6 +3434,9 @@ class NewPrinterGUI(GtkGUI):
+@@ -3430,6 +3435,9 @@ class NewPrinterGUI(GtkGUI):
              name = self.mainapp.makeNameUnique (name)
              self.entNPName.set_text (name)
  


Index: system-config-printer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-printer/F-9/system-config-printer.spec,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -r1.198 -r1.199
--- system-config-printer.spec	4 Nov 2008 16:32:27 -0000	1.198
+++ system-config-printer.spec	4 Nov 2008 17:39:14 -0000	1.199
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.0.9
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -151,6 +151,10 @@
 exit 0
 
 %changelog
+* Tue Nov  4 2008 Tim Waugh <twaugh at redhat.com> 1.0.9-5
+- Updated patch for 1.0.x changes:
+  - Fixed icon view display.
+
 * Tue Nov  4 2008 Tim Waugh <twaugh at redhat.com> 1.0.9-4
 - Updated patch for 1.0.x changes:
   - More job monitoring fixes.


