rpms/gnome-settings-daemon/devel gnome-settings-daemon-2.23.91-fnf7-cycle.patch, 1.2, 1.3 gnome-settings-daemon.spec, 1.54, 1.55

[Soren Sandmann Pedersen]

Author: ssp

Update of /cvs/pkgs/rpms/gnome-settings-daemon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30816

Modified Files:
	gnome-settings-daemon-2.23.91-fnf7-cycle.patch 
	gnome-settings-daemon.spec 
Log Message:
Fix various bugs in the fn-f7 support

gnome-settings-daemon-2.23.91-fnf7-cycle.patch:

Index: gnome-settings-daemon-2.23.91-fnf7-cycle.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/gnome-settings-daemon-2.23.91-fnf7-cycle.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnome-settings-daemon-2.23.91-fnf7-cycle.patch	4 Sep 2008 19:36:21 -0000	1.2
+++ gnome-settings-daemon-2.23.91-fnf7-cycle.patch	11 Sep 2008 07:57:39 -0000	1.3
@@ -1,5 +1,5 @@
 diff --git a/plugins/xrandr/gsd-xrandr-manager.c b/plugins/xrandr/gsd-xrandr-manager.c
-index 4d8ce2f..b80e55d 100644
+index 4d8ce2f..4057962 100644
 --- a/plugins/xrandr/gsd-xrandr-manager.c
 +++ b/plugins/xrandr/gsd-xrandr-manager.c
 @@ -82,6 +82,10 @@ struct GsdXrandrManagerPrivate
@@ -13,7 +13,7 @@
  };
  
  static void     gsd_xrandr_manager_class_init  (GsdXrandrManagerClass *klass);
-@@ -127,6 +131,418 @@ on_client_message (GdkXEvent  *xevent,
+@@ -127,6 +131,421 @@ on_client_message (GdkXEvent  *xevent,
          return GDK_FILTER_CONTINUE;
  }
  
@@ -136,6 +136,7 @@
 +                                info->width = width;
 +                                info->height = height;
 +                                info->rate = best_rate;
++                                info->rotation = GNOME_RR_ROTATION_0;
 +                                info->x = 0;
 +                                info->y = 0;
 +                        }
@@ -219,10 +220,8 @@
 +                GnomeOutputInfo *info = result->outputs[i];
 +
 +                if (is_laptop (info)) {
-+                        if (!info->on) {
-+                                if (turn_on (screen, info, x, 0)) {
-+                                        x += info->width;
-+                                }
++                        if (info->on || turn_on (screen, info, x, 0)) {
++                                x += info->width;
 +                        }
 +                }
 +        }
@@ -231,10 +230,8 @@
 +                GnomeOutputInfo *info = result->outputs[i];
 +
 +                if (info->connected && !is_laptop (info)) {
-+                        if (!info->on) {
-+                                if (turn_on (screen, info, x, 0)) {
-+                                        x += info->width;
-+                                }
++                        if (info->on || turn_on (screen, info, x, 0)) {
++                                x += info->width;
 +                        }
 +                }
 +        }
@@ -403,8 +400,14 @@
 +
 +        current = gnome_rr_config_new_current (screen);
 +        
-+        if (priv->fn_f7_configs && !gnome_rr_config_match (current, priv->fn_f7_configs[0]))
-+                generate_fn_f7_configs (mgr);
++        if (priv->fn_f7_configs && 
++            (!gnome_rr_config_match (current, priv->fn_f7_configs[0]) ||
++             !gnome_rr_config_equal (current, priv->fn_f7_configs[mgr->priv->current_fn_f7_config]))) {
++                    /* Our view of the world is incorrect, so regenerate the
++                     * configurations
++                     */
++                    generate_fn_f7_configs (mgr);
++            }
 +
 +        gnome_rr_config_free (current);
 +        
@@ -432,7 +435,7 @@
  static GdkFilterReturn
  event_filter (GdkXEvent           *xevent,
                GdkEvent            *event,
-@@ -142,12 +558,9 @@ event_filter (GdkXEvent           *xevent,
+@@ -142,12 +561,9 @@ event_filter (GdkXEvent           *xevent,
          if (xev->xany.type != KeyPress && xev->xany.type != KeyRelease)
                  return GDK_FILTER_CONTINUE;
  
@@ -448,7 +451,7 @@
                  return GDK_FILTER_CONTINUE;
          }
  
-@@ -869,6 +1282,9 @@ gsd_xrandr_manager_init (GsdXrandrManager *manager)
+@@ -869,6 +1285,9 @@ gsd_xrandr_manager_init (GsdXrandrManager *manager)
          manager->priv = GSD_XRANDR_MANAGER_GET_PRIVATE (manager);
  
          manager->priv->keycode = keycode;


Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/devel/gnome-settings-daemon.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- gnome-settings-daemon.spec	8 Sep 2008 16:34:05 -0000	1.54
+++ gnome-settings-daemon.spec	11 Sep 2008 07:57:39 -0000	1.55
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
 Version:	2.23.92
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -155,6 +155,9 @@
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Thu Sep 11 2008 Soren Sandmann <sandmann at redhat.com> - 2.23.91-5
+- Fix various bugs in the fn-F7 support
+
 * Mon Sep  8 2008 Matthias Clasen <mclasen at redhat.com> - 2.23.92-1
 - Update to 2.23.92