rpms/gtk2/F-10 default_printer.patch, NONE, 1.1 gtk2.spec, 1.340, 1.341

Marek Kašík mkasik at fedoraproject.org
Mon Jan 19 13:41:59 UTC 2009


Author: mkasik

Update of /cvs/pkgs/rpms/gtk2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7654

Modified Files:
	gtk2.spec 
Added Files:
	default_printer.patch 
Log Message:
* Mon Jan 19 2009 Marek Kasik <mkasik at redhat.com> - 2.14.7-2
- fix a problem with default printer in a network
- Resolves: #478400


default_printer.patch:

--- NEW FILE default_printer.patch ---
--- modules/printbackends/cups/gtkprintbackendcups.c	2009-01-07 17:33:32.000000000 +0100
+++ modules/printbackends/cups/gtkprintbackendcups.c	2009-01-19 13:20:05.000000000 +0100
@@ -1247,7 +1247,8 @@ cups_request_printer_list_cb (GtkPrintBa
         else if (strcmp (attr->name, "printer-type") == 0)
           {
             got_printer_type = TRUE;
-            if (attr->values[0].integer & 0x00020000)
+            if ((attr->values[0].integer & 0x00020000) &&
+               !(attr->values[0].integer & 0x00000002))
               default_printer = TRUE;
             else
               default_printer = FALSE;


Index: gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk2/F-10/gtk2.spec,v
retrieving revision 1.340
retrieving revision 1.341
diff -u -r1.340 -r1.341
--- gtk2.spec	8 Jan 2009 00:11:56 -0000	1.340
+++ gtk2.spec	19 Jan 2009 13:41:29 -0000	1.341
@@ -16,7 +16,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.14/gtk+-%{version}.tar.bz2
@@ -30,6 +30,8 @@
 # a workaround for some brokenness in the flash plugin
 # see http://bugzilla.gnome.org/show_bug.cgi?id=463773
 Patch2: workaround.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=478400
+Patch3: default_printer.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -116,6 +118,7 @@
 %patch0 -p1 -b .lib64
 %patch1 -p1 -b .set-invisible-char-to-bullet
 %patch2 -p1 -b .workaround
+%patch3 -p0 -b default-printer
 
 for i in config.guess config.sub ; do
   test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -297,6 +300,10 @@
 %{_datadir}/gtk-2.0
 
 %changelog
+* Mon Jan 19 2009 Marek Kasik <mkasik at redhat.com> - 2.14.7-2
+- fix a problem with default printer in a network
+- Resolves: #478400
+
 * Wed Jan  7 2009 Matthias Clasen <mclasen at redhat.com> - 2.14.7-1
 - Upate to 2.14.7
 




More information about the fedora-extras-commits mailing list