From 5d29b70aaf811c5925caf4f7ef7db0cde1543fab Mon Sep 17 00:00:00 2001 From: Soren Sandmann Pedersen Date: Apr 30 2008 22:17:05 +0000 Subject: Fix bug 443903 --- diff --git a/add-randr-12.patch b/add-randr-12.patch index aa95a17..8d0ff07 100644 --- a/add-randr-12.patch +++ b/add-randr-12.patch @@ -1219,10 +1219,10 @@ index 0000000..f9ab2c9 +#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 +#include +#include @@ -1262,6 +1262,12 @@ index 0000000..95b03bd + 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 @@ index 0000000..95b03bd + { + 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)) + { diff --git a/gnome-desktop.spec b/gnome-desktop.spec index af65a76..9fd74d2 100644 --- a/gnome-desktop.spec +++ b/gnome-desktop.spec @@ -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 @@ rm -rf $RPM_BUILD_ROOT %doc %{_datadir}/gtk-doc/html/gnome-desktop/ %changelog +* Fri Apr 25 2008 Soren Sandmann - 2.22.1-4 +- Fix signed/unsigned mixup, bug 443903 + * Fri Apr 25 2008 Soren Sandmann - 2.22.1-3 - Integrate a number of fixes from other distributions