Index: gnome-settings-daemon-2.24.1/plugins/xrandr/gsd-xrandr-manager.c
===================================================================
--- gnome-settings-daemon-2.24.1.orig/plugins/xrandr/gsd-xrandr-manager.c	2009-04-16 10:08:15.904851080 +0200
+++ gnome-settings-daemon-2.24.1/plugins/xrandr/gsd-xrandr-manager.c	2009-04-16 10:14:24.334003102 +0200
@@ -118,7 +118,7 @@ on_client_message (GdkXEvent  *xevent,
             ev->type == ClientMessage &&
             ev->xclient.message_type == gnome_randr_xatom ()) {
 
-                gnome_rr_config_apply_stored (screen);
+                gnome_rr_config_apply_stored (screen, NULL);
 
                 return GDK_FILTER_REMOVE;
         }
@@ -146,7 +146,7 @@ event_filter (GdkXEvent           *xeven
                 /* FIXME: here we should cycle between valid
                  * configurations, and save them
                  */
-                gnome_rr_config_apply_stored (manager->priv->rw_screen);
+                gnome_rr_config_apply_stored (manager->priv->rw_screen, NULL);
 
                 return GDK_FILTER_CONTINUE;
         }
@@ -391,7 +391,7 @@ get_allowed_rotations_for_output (GsdXra
 
                 output->rotation = rotation_to_test;
 
-                if (gnome_rr_config_applicable (priv->configuration, priv->rw_screen)) {
+                if (gnome_rr_config_applicable (priv->configuration, priv->rw_screen, NULL)) {
                         (*out_num_rotations)++;
                         (*out_rotations) |= rotation_to_test;
                 }
@@ -456,7 +456,7 @@ output_rotation_item_activate_cb (GtkChe
 
         error = NULL;
         if (gnome_rr_config_save (priv->configuration, &error)) {
-                if (!gnome_rr_config_apply_stored (priv->rw_screen)) {
+                if (!gnome_rr_config_apply_stored (priv->rw_screen, NULL)) {
                         error_dialog (_("The selected rotation could not be applied"),
                                       _("An error occurred while configuring the screen"));
                         /* FIXME: that message is really useless.  Make
@@ -694,7 +694,7 @@ gsd_xrandr_manager_start (GsdXrandrManag
         g_debug ("Starting xrandr manager");
 
         manager->priv->rw_screen = gnome_rr_screen_new (
-                gdk_screen_get_default (), on_randr_event, manager);
+                gdk_screen_get_default (), on_randr_event, manager, NULL);
 
         if (manager->priv->rw_screen == NULL) {
                 g_set_error (error, 0, 0, "Failed to initialize XRandR extension");
@@ -728,7 +728,7 @@ gsd_xrandr_manager_start (GsdXrandrManag
                 gdk_error_trap_pop ();
         }
 
-        gnome_rr_config_apply_stored (manager->priv->rw_screen);
+        gnome_rr_config_apply_stored (manager->priv->rw_screen, NULL);
 
         gdk_window_add_filter (gdk_get_default_root_window(),
                                (GdkFilterFunc)event_filter,