rpms/xfce4-settings/devel xfce4-settings-4.6.0-randr.patch, NONE, 1.1 xfce4-settings.spec, 1.8, 1.9

[Kevin Fenzi]

Author: kevin

Update of /cvs/extras/rpms/xfce4-settings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32422

Modified Files:
	xfce4-settings.spec 
Added Files:
	xfce4-settings-4.6.0-randr.patch 
Log Message:
display settings fixes from upstream svn


xfce4-settings-4.6.0-randr.patch:

--- NEW FILE xfce4-settings-4.6.0-randr.patch ---
diff -Nur xfce4-settings-4.6.0.orig/dialogs/display-settings/main.c xfce4-settings/dialogs/display-settings/main.c
--- xfce4-settings-4.6.0.orig/dialogs/display-settings/main.c	2009-01-26 11:35:22.000000000 -0700
+++ xfce4-settings/dialogs/display-settings/main.c	2009-03-19 15:05:16.000000000 -0600
@@ -1,4 +1,4 @@
-/* $Id: main.c 29350 2009-01-25 19:51:31Z nick $ */
+/* $Id: main.c 29667 2009-03-15 11:55:41Z nick $ */
 /*
  *  Copyright (c) 2008 Nick Schermer <nick at xfce.org>
  *
@@ -296,10 +296,10 @@
             /* get the active rate closest to the current diff */
             diff = ABS (rates[n] - XFCE_RANDR_LEGACY_RATE (xfce_randr_legacy));
 
-            /* store active*/
+            /* store active */
             if (active_diff > diff)
             {
-                active = n;
+                active = nrates - n - 1;
                 active_diff = diff;
             }
         }
diff -Nur xfce4-settings-4.6.0.orig/dialogs/display-settings/xfce-randr-legacy.c xfce4-settings/dialogs/display-settings/xfce-randr-legacy.c
--- xfce4-settings-4.6.0.orig/dialogs/display-settings/xfce-randr-legacy.c	2009-01-26 11:35:22.000000000 -0700
+++ xfce4-settings/dialogs/display-settings/xfce-randr-legacy.c	2009-03-19 15:05:16.000000000 -0600
@@ -1,4 +1,4 @@
-/* $Id: xfce-randr-legacy.c 29350 2009-01-25 19:51:31Z nick $ */
+/* $Id: xfce-randr-legacy.c 29650 2009-03-11 18:00:30Z nick $ */
 /*
  *  Copyright (c) 2008 Nick Schermer <nick at xfce.org>
  *
@@ -27,11 +27,6 @@
 
 #include "xfce-randr-legacy.h"
 
-/** CLAMP gives a warning with comparing unsigned values */
-#define UCLAMP(x, low, high) \
-  (((x) > (high)) ? (high) : \
-   (((low) > 0) ? (((low) < (x)) ? (low) : (x)) : 0))
-
 
 
 XfceRandrLegacy *
@@ -184,7 +179,7 @@
     {
         /* find the resolution and save it as a string */
         sizes = XRRConfigSizes (legacy->config[n], &nsizes);
-        size = UCLAMP (legacy->resolution[n], 0, nsizes - 1);
+        size = MIN (legacy->resolution[n], MAX (0, nsizes - 1));
         resolution = g_strdup_printf ("%dx%d", sizes[size].width, sizes[size].height);
         g_snprintf (property, sizeof (property), "/%s/Screen_%d/Resolution", scheme, n);
         xfconf_channel_set_string (channel, property, resolution);


Index: xfce4-settings.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-settings/devel/xfce4-settings.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xfce4-settings.spec	28 Feb 2009 01:38:05 -0000	1.8
+++ xfce4-settings.spec	20 Mar 2009 04:21:05 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           xfce4-settings
 Version:        4.6.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Settings Manager for Xfce
 
 Group:          User Interface/Desktops
@@ -8,6 +8,7 @@
 License:        GPLv2+ and GPLv2
 URL:            http://www.xfce.org/
 Source0:        http://www.xfce.org/archive/xfce-%{version}/src/xfce4-settings-%{version}.tar.bz2
+Patch1:		xfce4-settings-4.6.0-randr.patch
 # use vendor's artwork
 Patch10:        xfce4-settings-4.6.0-fedora.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -37,6 +38,7 @@
 
 %prep
 %setup -q
+%patch1 -p1 -b .xrandr
 %patch10 -p1 -b .vendor
 
 %build
@@ -109,6 +111,9 @@
 %{_datadir}/applications/xfce*.desktop
 
 %changelog
+* Thu Mar 19 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.0-3
+- display settings fixes from upstream svn. 
+
 * Fri Feb 27 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.0-2
 - Rebase patch for artwork