|
|
Author: mclasen
Update of /cvs/dist/rpms/gtk2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv647
Modified Files:
gtk2.spec
Added Files:
gtk+-2.10.2-poll.patch
Log Message:
fix printer list polling
gtk+-2.10.2-poll.patch:
gtkprintbackendcups.c | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE gtk+-2.10.2-poll.patch ---
--- gtk+-2.10.2/modules/printbackends/cups/gtkprintbackendcups.c.poll
2006-08-28 12:42:26.000000000 -0400
+++ gtk+-2.10.2/modules/printbackends/cups/gtkprintbackendcups.c
2006-08-28 12:42:40.000000000 -0400
@@ -1185,7 +1185,7 @@
if (cups_backend->list_printers_poll == 0)
{
cups_request_printer_list (cups_backend);
- cups_backend->list_printers_poll = g_timeout_add (3000 * 100000,
+ cups_backend->list_printers_poll = g_timeout_add (3000,
(GSourceFunc)
cups_request_printer_list,
backend);
}
Index: gtk2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- gtk2.spec 23 Aug 2006 19:07:42 -0000 1.173
+++ gtk2.spec 28 Aug 2006 17:49:10 -0000 1.174
@@ -16,7 +16,7 @@
Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
Name: gtk2
Version: %{base_version}
-Release: 3%{?dist}
+Release: 4%{?dist}
License: LGPL
Group: System Environment/Libraries
Source: gtk+-%{version}.tar.bz2
@@ -28,9 +28,11 @@
Patch1: gtk+-2.8.10-set-invisible-char-to-bullet.patch
# Filechooser search
Patch2: gtk+-2.10.1-search.patch
-# Fixed in cvs
+
+# The following are fixed in upstream cvs
Patch3: gtk+-2.10.2-recent.patch
Patch4: gtk+-2.10.2-values-and-names.patch
+Patch5: gtk+-2.10.2-poll.patch
BuildPrereq: atk-devel >= %{atk_version}
BuildPrereq: pango-devel >= %{pango_version}
@@ -113,6 +115,7 @@
%patch2 -p1 -b .search
%patch3 -p1 -b .recent
%patch4 -p1 -b .values-and-names
+%patch5 -p1 -b .poll
for i in config.guess config.sub ; do
test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -284,6 +287,10 @@
%doc tmpdocs/examples
%changelog
+* Mon Aug 28 2006 Matthias Clasen <mclasen@xxxxxxxxxx> - 2.10.2-4.fc6
+- Use a reasonable timeout when polling for printer
+ list updates (#203585)
+
* Wed Aug 23 2006 Matthias Clasen <mclasen@xxxxxxxxxx> - 2.10.2-3.fc6
- Fix confusion between values and names in printer options (#203588)
--
fedora-cvs-commits mailing list
fedora-cvs-commits@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/fedora-cvs-commits
|
|