rpms/gnome-desktop/F-9 add-randr-12.patch, 1.18, 1.19 gnome-desktop.spec, 1.141, 1.142

[Soren Sandmann Pedersen (ssp)]

Author: ssp

Update of /cvs/pkgs/rpms/gnome-desktop/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9965

Modified Files:
	add-randr-12.patch gnome-desktop.spec 
Log Message:
Fix bug 443903

add-randr-12.patch:

Index: add-randr-12.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/F-9/add-randr-12.patch,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- add-randr-12.patch	25 Apr 2008 04:57:29 -0000	1.18
+++ add-randr-12.patch	30 Apr 2008 22:17:05 -0000	1.19
@@ -1219,10 +1219,10 @@
 +#endif
 diff --git a/libgnome-desktop/monitor-db.c b/libgnome-desktop/monitor-db.c
 new file mode 100644
-index 0000000..95b03bd
+index 0000000..a9b064d
 --- /dev/null
 +++ b/libgnome-desktop/monitor-db.c
-@@ -0,0 +1,1286 @@
+@@ -0,0 +1,1292 @@
 +#include <stdlib.h>
 +#include <string.h>
 +#include <glib.h>
@@ -1262,6 +1262,12 @@
 +    return strtol (text, NULL, 0);
 +}
 +
++static guint
++parse_uint (const char *text)
++{
++    return strtoul (text, NULL, 0);
++}
++
 +static gboolean
 +stack_is (Parser *parser,
 +	  const char *s1,
@@ -1416,7 +1422,7 @@
 +    {
 +	parser->output->connected = TRUE;
 +
-+	parser->output->serial = parse_int (text);
++	parser->output->serial = parse_uint (text);
 +    }
 +    else if (stack_is (parser, "width", "output", "configuration", NULL))
 +    {


Index: gnome-desktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-desktop/F-9/gnome-desktop.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- gnome-desktop.spec	25 Apr 2008 04:57:29 -0000	1.141
+++ gnome-desktop.spec	30 Apr 2008 22:17:05 -0000	1.142
@@ -12,7 +12,7 @@
 Summary: Package containing code shared among gnome-panel, gnome-session, nautilus, etc
 Name: gnome-desktop
 Version: 2.22.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-desktop/2.22/%{name}-%{version}.tar.bz2
 License: GPLv2+ and LGPLv2+
@@ -126,6 +126,9 @@
 %doc %{_datadir}/gtk-doc/html/gnome-desktop/
 
 %changelog
+* Fri Apr 25 2008 Soren Sandmann <sandmann at redhat.com> - 2.22.1-4
+- Fix signed/unsigned mixup, bug 443903
+
 * Fri Apr 25 2008 Soren Sandmann <sandmann at redhat.com> - 2.22.1-3
 - Integrate a number of fixes from other distributions