From c7bdda5b645b17ef59f634cb332654d1af724620 Mon Sep 17 00:00:00 2001
From: Soren Sandmann Pedersen <ssp@fedoraproject.org>
Date: Sep 04 2008 19:36:21 +0000
Subject: Use fn-f7, not F7


---

diff --git a/gnome-settings-daemon-2.23.91-fnf7-cycle.patch b/gnome-settings-daemon-2.23.91-fnf7-cycle.patch
index cd36c14..d7afa08 100644
--- a/gnome-settings-daemon-2.23.91-fnf7-cycle.patch
+++ b/gnome-settings-daemon-2.23.91-fnf7-cycle.patch
@@ -1,16 +1,8 @@
-Index: plugins/xrandr/gsd-xrandr-manager.c
-===================================================================
---- plugins/xrandr/gsd-xrandr-manager.c	(revision 480)
-+++ plugins/xrandr/gsd-xrandr-manager.c	(working copy)
-@@ -61,6 +61,7 @@
- #define CONF_KEY "show_notification_icon"
- 
- #define VIDEO_KEYSYM    "XF86Display"
-+#define VIDEO_KEYSYM    "F7"
- 
- /* name of the icon files (gsd-xrandr.svg, etc.) */
- #define GSD_XRANDR_ICON_NAME "gsd-xrandr"
-@@ -82,6 +83,10 @@
+diff --git a/plugins/xrandr/gsd-xrandr-manager.c b/plugins/xrandr/gsd-xrandr-manager.c
+index 4d8ce2f..b80e55d 100644
+--- a/plugins/xrandr/gsd-xrandr-manager.c
++++ b/plugins/xrandr/gsd-xrandr-manager.c
+@@ -82,6 +82,10 @@ struct GsdXrandrManagerPrivate
          GnomeRRLabeler *labeler;
          GConfClient *client;
          int notify_id;
@@ -21,7 +13,7 @@ Index: plugins/xrandr/gsd-xrandr-manager.c
  };
  
  static void     gsd_xrandr_manager_class_init  (GsdXrandrManagerClass *klass);
-@@ -127,6 +132,418 @@
+@@ -127,6 +131,418 @@ on_client_message (GdkXEvent  *xevent,
          return GDK_FILTER_CONTINUE;
  }
  
@@ -440,7 +432,7 @@ Index: plugins/xrandr/gsd-xrandr-manager.c
  static GdkFilterReturn
  event_filter (GdkXEvent           *xevent,
                GdkEvent            *event,
-@@ -142,12 +559,9 @@
+@@ -142,12 +558,9 @@ event_filter (GdkXEvent           *xevent,
          if (xev->xany.type != KeyPress && xev->xany.type != KeyRelease)
                  return GDK_FILTER_CONTINUE;
  
@@ -456,7 +448,7 @@ Index: plugins/xrandr/gsd-xrandr-manager.c
                  return GDK_FILTER_CONTINUE;
          }
  
-@@ -869,6 +1283,9 @@
+@@ -869,6 +1282,9 @@ gsd_xrandr_manager_init (GsdXrandrManager *manager)
          manager->priv = GSD_XRANDR_MANAGER_GET_PRIVATE (manager);
  
          manager->priv->keycode = keycode;
diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec
index 591f7bc..ae80532 100644
--- a/gnome-settings-daemon.spec
+++ b/gnome-settings-daemon.spec
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
 Version:	2.23.91
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -55,7 +55,7 @@ developing applications that use %{name}.
 
 %patch2 -p1 -b .ignore-layout-if-using-evdev
 %patch6 -p1 -b .drop-sample-cache
-%patch7 -p0 -b .fnf7-cycle
+%patch7 -p1 -b .fnf7-cycle
 
 %build
 aclocal
@@ -155,6 +155,9 @@ fi
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Tue Sep 04 2008 Soren Sandmann <sandmann@redhat.com> - 2.23.91-4
+- Use the fn-F7 key, not the F7 key.
+
 * Wed Sep 03 2008 Soren Sandmann <sandmann@redhat.com> - 2.23.91-3
 - Bump gnome-desktop requirement