Merge branch 'gobject-gnomerr'

Conflicts:
	panels/display/xrandr-capplet.c

1 files changed, 327 insertions, 337 deletions

diff --git a/panels/display/xrandr-capplet.c b/panels/display/xrandr-capplet.c
index ab1d80fa4..439675365 100644
--- a/panels/display/xrandr-capplet.c
+++ b/panels/display/xrandr-capplet.c
@@ -48,7 +48,7 @@ struct App
   GnomeRRScreen       *screen;
   GnomeRRConfig  *current_configuration;
   GnomeRRLabeler *labeler;
-  GnomeOutputInfo         *current_output;
+  GnomeRROutputInfo         *current_output;
 
   GtkBuilder     *builder;
 
@@ -84,13 +84,13 @@ struct App
 
 static void rebuild_gui (App *app);
 static void on_clone_changed (GtkWidget *box, gpointer data);
-static gboolean output_overlaps (GnomeOutputInfo *output, GnomeRRConfig *config);
+static gboolean output_overlaps (GnomeRROutputInfo *output, GnomeRRConfig *config);
 static void select_current_output_from_dialog_position (App *app);
 static void monitor_switch_active_cb (GObject *object, GParamSpec *pspec, gpointer data);
-static void get_geometry (GnomeOutputInfo *output, int *w, int *h);
+static void get_geometry (GnomeRROutputInfo *output, int *w, int *h);
 static void apply_configuration_returned_cb (DBusGProxy *proxy, DBusGProxyCall *call_id, void *data);
 static gboolean get_clone_size (GnomeRRScreen *screen, int *width, int *height);
-static gboolean output_info_supports_mode (App *app, GnomeOutputInfo *info, int width, int height);
+static gboolean output_info_supports_mode (App *app, GnomeRROutputInfo *info, int width, int height);
 
 static void
 error_message (App *app, const char *primary_text, const char *secondary_text)
@@ -138,11 +138,11 @@ on_screen_changed (GnomeRRScreen *scr,
   GnomeRRConfig *current;
   App *app = data;
 
-  current = gnome_rr_config_new_current (app->screen);
+  current = gnome_rr_config_new_current (app->screen, NULL);
   gnome_rr_config_ensure_primary (current);
 
   if (app->current_configuration)
-    gnome_rr_config_free (app->current_configuration);
+    g_object_unref (app->current_configuration);
 
   app->current_configuration = current;
   app->current_output = NULL;
@@ -284,7 +284,7 @@ get_current_modes (App *app)
 {
   GnomeRROutput *output;
 
-  if (app->current_configuration->clone)
+  if (gnome_rr_config_get_clone (app->current_configuration))
     {
       return gnome_rr_screen_list_clone_modes (app->screen);
     }
@@ -293,8 +293,8 @@ get_current_modes (App *app)
       if (!app->current_output)
         return NULL;
 
-      output = gnome_rr_screen_get_output_by_name (
-                                                   app->screen, app->current_output->name);
+      output = gnome_rr_screen_get_output_by_name (app->screen,
+                                                   gnome_rr_output_info_get_name (app->current_output));
 
       if (!output)
         return NULL;
@@ -308,8 +308,8 @@ rebuild_rotation_combo (App *app)
 {
   typedef struct
   {
-    GnomeRRRotation rotation;
-    const char *    name;
+    GnomeRRRotation	rotation;
+    const char *	name;
   } RotationInfo;
   static const RotationInfo rotations[] = {
     { GNOME_RR_ROTATION_0, N_("Normal") },
@@ -323,20 +323,20 @@ rebuild_rotation_combo (App *app)
 
   clear_combo (app->rotation_combo);
 
-  gtk_widget_set_sensitive (
-                            app->rotation_combo, app->current_output && app->current_output->on);
+  gtk_widget_set_sensitive (app->rotation_combo,
+                            app->current_output && gnome_rr_output_info_is_active (app->current_output));
 
   if (!app->current_output)
     return;
 
-  current = app->current_output->rotation;
+  current = gnome_rr_output_info_get_rotation (app->current_output);
 
   selection = NULL;
   for (i = 0; i < G_N_ELEMENTS (rotations); ++i)
     {
       const RotationInfo *info = &(rotations[i]);
 
-      app->current_output->rotation = info->rotation;
+      gnome_rr_output_info_set_rotation (app->current_output, info->rotation);
 
       /* NULL-GError --- FIXME: we should say why this rotation is not available! */
       if (gnome_rr_config_applicable (app->current_configuration, app->screen, NULL))
@@ -348,7 +348,7 @@ rebuild_rotation_combo (App *app)
         }
     }
 
-  app->current_output->rotation = current;
+  gnome_rr_output_info_set_rotation (app->current_output, current);
 
   if (!(selection && combo_select (app->rotation_combo, selection)))
     combo_select (app->rotation_combo, _("Normal"));
@@ -358,11 +358,11 @@ static int
 count_active_outputs (App *app)
 {
   int i, count = 0;
+  GnomeRROutputInfo **outputs = gnome_rr_config_get_outputs (app->current_configuration);
 
-  for (i = 0; app->current_configuration->outputs[i] != NULL; ++i)
+  for (i = 0; outputs[i] != NULL; ++i)
     {
-      GnomeOutputInfo *output = app->current_configuration->outputs[i];
-      if (output->on)
+      if (gnome_rr_output_info_is_active (outputs[i]))
         count++;
     }
 
@@ -374,8 +374,9 @@ static int
 count_all_outputs (GnomeRRConfig *config)
 {
   int i;
+  GnomeRROutputInfo **outputs = gnome_rr_config_get_outputs (config);
 
-  for (i = 0; config->outputs[i] != NULL; i++)
+  for (i = 0; outputs[i] != NULL; i++)
     ;
 
   return i;
@@ -402,19 +403,18 @@ mirror_screens_is_supported (App *app)
   if (have_clone_size) {
     int i;
     int num_outputs_with_clone_size;
+    GnomeRROutputInfo **outputs = gnome_rr_config_get_outputs (app->current_configuration);
 
     num_outputs_with_clone_size = 0;
 
-    for (i = 0; app->current_configuration->outputs[i] != NULL; i++)
+    for (i = 0; outputs[i] != NULL; i++)
       {
-        GnomeOutputInfo *output = app->current_configuration->outputs[i];
-
-        /* We count the connected outputs that support the clone size.  It
-         * doesn't matter if those outputs aren't actually On currently; we
-         * will turn them on in on_clone_changed().
-         */
-        if (output->connected && output_info_supports_mode (app, output, clone_width, clone_height))
-          num_outputs_with_clone_size++;
+         /* We count the connected outputs that support the clone size.  It
+          * doesn't matter if those outputs aren't actually On currently; we
+          * will turn them on in on_clone_changed().
+          */
+         if (gnome_rr_output_info_is_connected (outputs[i]) && output_info_supports_mode (app, outputs[i], clone_width, clone_height))
+           num_outputs_with_clone_size++;
       }
 
     if (num_outputs_with_clone_size >= 2)
@@ -432,7 +432,7 @@ rebuild_mirror_screens (App *app)
 
   g_signal_handlers_block_by_func (app->clone_checkbox, G_CALLBACK (on_clone_changed), app);
 
-  mirror_is_active = app->current_configuration && app->current_configuration->clone;
+  mirror_is_active = app->current_configuration && gnome_rr_config_get_clone (app->current_configuration);
 
   /* If mirror_is_active, then it *must* be possible to turn mirroring off */
   mirror_is_supported = mirror_is_active || mirror_screens_is_supported (app);
@@ -464,10 +464,10 @@ rebuild_current_monitor_label (App *app)
 
   if (app->current_output)
     {
-      if (app->current_configuration->clone)
+      if (gnome_rr_config_get_clone (app->current_configuration))
         tmp = mirror_monitor_name ();
       else
-        tmp = g_strdup (app->current_output->display_name);
+        tmp = g_strdup (gnome_rr_output_info_get_display_name (app->current_output));
 
       str = g_strdup_printf ("<b>%s</b>", tmp);
       gnome_rr_labeler_get_color_for_output (app->labeler, app->current_output, &color);
@@ -504,7 +504,7 @@ rebuild_current_monitor_label (App *app)
       gtk_widget_modify_style (app->current_monitor_label, reset_rc_style); /* takes ownership of, and destroys, the rc style */
     }
 
-  gtk_event_box_set_visible_window (GTK_EVENT_BOX (app->current_monitor_event_box), use_color);
+    gtk_event_box_set_visible_window (GTK_EVENT_BOX (app->current_monitor_event_box), use_color);
 }
 
 static void
@@ -520,14 +520,14 @@ rebuild_on_off_radios (App *app)
   on_active = FALSE;
   off_active = FALSE;
 
-  if (!app->current_configuration->clone && app->current_output)
+  if (!gnome_rr_config_get_clone (app->current_configuration) && app->current_output)
     {
-      if (count_active_outputs (app) > 1 || !app->current_output->on)
+      if (count_active_outputs (app) > 1 || !gnome_rr_output_info_is_active (app->current_output))
         sensitive = TRUE;
       else
         sensitive = FALSE;
 
-      on_active = app->current_output->on;
+      on_active = gnome_rr_output_info_is_active (app->current_output);
       off_active = !on_active;
     }
 
@@ -611,19 +611,22 @@ rebuild_resolution_combo (App *app)
   int i;
   GnomeRRMode **modes;
   const char *current;
+  int output_width, output_height;
 
   clear_combo (app->resolution_combo);
 
   if (!(modes = get_current_modes (app))
       || !app->current_output
-      || !app->current_output->on)
+      || !gnome_rr_output_info_is_active (app->current_output))
     {
       gtk_widget_set_sensitive (app->resolution_combo, FALSE);
       return;
     }
 
   g_assert (app->current_output != NULL);
-  g_assert (app->current_output->width != 0 && app->current_output->height != 0);
+
+  gnome_rr_output_info_get_geometry (app->current_output, NULL, NULL, &output_width, &output_height);
+  g_assert (output_width != 0 && output_height != 0);
 
   gtk_widget_set_sensitive (app->resolution_combo, TRUE);
 
@@ -639,7 +642,7 @@ rebuild_resolution_combo (App *app)
                width, height, 0, -1);
     }
 
-  current = idle_free (make_resolution_string (app->current_output->width, app->current_output->height));
+  current = idle_free (make_resolution_string (output_width, output_height));
 
   if (!combo_select (app->resolution_combo, current))
     {
@@ -675,7 +678,7 @@ rebuild_gui (App *app)
   rebuild_rotation_combo (app);
 
 #if 0
-  g_debug ("sensitive: %d, on: %d", sensitive, app->current_output->on);
+  g_debug ("sensitive: %d, on: %d", sensitive, gnome_rr_output_info_is_active (app->current_output));
 #endif
 
   app->ignore_gui_changes = FALSE;
@@ -726,7 +729,7 @@ on_rotation_changed (GtkComboBox *box, gpointer data)
     return;
 
   if (get_mode (app->rotation_combo, NULL, NULL, NULL, &rotation))
-    app->current_output->rotation = rotation;
+    gnome_rr_output_info_set_rotation (app->current_output, rotation);
 
   foo_scroll_area_invalidate (FOO_SCROLL_AREA (app->area));
 }
@@ -736,11 +739,15 @@ select_resolution_for_current_output (App *app)
 {
   GnomeRRMode **modes;
   int width, height;
+  int x,y;
+  gnome_rr_output_info_get_geometry (app->current_output, &x, &y, NULL, NULL);
+
+  width = gnome_rr_output_info_get_preferred_width (app->current_output);
+  height = gnome_rr_output_info_get_preferred_height (app->current_output);
 
-  if (app->current_output->pref_width != 0 && app->current_output->pref_height != 0)
+  if (width != 0 && height != 0)
     {
-      app->current_output->width = app->current_output->pref_width;
-      app->current_output->height = app->current_output->pref_height;
+      gnome_rr_output_info_set_geometry (app->current_output, x, y, width, height);
       return;
     }
 
@@ -750,8 +757,7 @@ select_resolution_for_current_output (App *app)
 
   find_best_mode (modes, &width, &height);
 
-  app->current_output->width = width;
-  app->current_output->height = height;
+  gnome_rr_output_info_set_geometry (app->current_output, x, y, width, height);
 }
 
 static void
@@ -769,12 +775,12 @@ monitor_switch_active_cb (GObject    *object,
 
   if (value)
     {
-      app->current_output->on = TRUE;
+      gnome_rr_output_info_set_active (app->current_output, TRUE);
       select_resolution_for_current_output (app);
     }
   else
     {
-      app->current_output->on = FALSE;
+      gnome_rr_output_info_set_active (app->current_output, FALSE);
       gnome_rr_config_ensure_primary (app->current_configuration);
     }
 
@@ -783,7 +789,7 @@ monitor_switch_active_cb (GObject    *object,
 }
 
 static void
-realign_outputs_after_resolution_change (App *app, GnomeOutputInfo *output_that_changed, int old_width, int old_height)
+realign_outputs_after_resolution_change (App *app, GnomeRROutputInfo *output_that_changed, int old_width, int old_height)
 {
   /* We find the outputs that were below or to the right of the output that
    * changed, and realign them; we also do that for outputs that shared the
@@ -794,39 +800,46 @@ realign_outputs_after_resolution_change (App *app, GnomeOutputInfo *output_that_
   int i;
   int old_right_edge, old_bottom_edge;
   int dx, dy;
+  int x, y, width, height;
+  GnomeRROutputInfo **outputs;
 
   g_assert (app->current_configuration != NULL);
 
-  if (output_that_changed->width == old_width && output_that_changed->height == old_height)
+  gnome_rr_output_info_get_geometry (output_that_changed, &x, &y, &width, &height); 
+
+  if (width == old_width && height == old_height)
     return;
 
-  old_right_edge = output_that_changed->x + old_width;
-  old_bottom_edge = output_that_changed->y + old_height;
+  old_right_edge = x + old_width;
+  old_bottom_edge = y + old_height;
 
-  dx = output_that_changed->width - old_width;
-  dy = output_that_changed->height - old_height;
+  dx = width - old_width;
+  dy = height - old_height;
 
-  for (i = 0; app->current_configuration->outputs[i] != NULL; i++) {
-    GnomeOutputInfo *output;
-    int output_width, output_height;
+  outputs = gnome_rr_config_get_outputs (app->current_configuration);
 
-    output = app->current_configuration->outputs[i];
+  for (i = 0; outputs[i] != NULL; i++)
+    {
+      int output_x, output_y;
+      int output_width, output_height;
 
-    if (output == output_that_changed || !output->connected)
-      continue;
+      if (outputs[i] == output_that_changed || !gnome_rr_output_info_is_connected (outputs[i]))
+        continue;
 
-    get_geometry (output, &output_width, &output_height);
+      gnome_rr_output_info_get_geometry (outputs[i], &output_x, &output_y, &output_width, &output_height);
 
-    if (output->x >= old_right_edge)
-      output->x += dx;
-    else if (output->x + output_width == old_right_edge)
-      output->x = output_that_changed->x + output_that_changed->width - output_width;
+      if (output_x >= old_right_edge)
+         output_x += dx;
+      else if (output_x + output_width == old_right_edge)
+         output_x = x + width - output_width;
 
-    if (output->y >= old_bottom_edge)
-      output->y += dy;
-    else if (output->y + output_height == old_bottom_edge)
-      output->y = output_that_changed->y + output_that_changed->height - output_height;
-  }
+      if (output_y >= old_bottom_edge)
+         output_y += dy;
+      else if (output_y + output_height == old_bottom_edge)
+         output_y = y + height - output_height;
+
+      gnome_rr_output_info_set_geometry (outputs[i], output_x, output_y, output_width, output_height);
+    }
 }
 
 static void
@@ -834,24 +847,23 @@ on_resolution_changed (GtkComboBox *box, gpointer data)
 {
   App *app = data;
   int old_width, old_height;
+  int x,y;
   int width;
   int height;
 
   if (!app->current_output)
     return;
 
-  old_width = app->current_output->width;
-  old_height = app->current_output->height;
+  gnome_rr_output_info_get_geometry (app->current_output, &x, &y, &old_width, &old_height);
 
   if (get_mode (app->resolution_combo, &width, &height, NULL, NULL))
     {
-      app->current_output->width = width;
-      app->current_output->height = height;
+      gnome_rr_output_info_set_geometry (app->current_output, x, y, width, height);
 
       if (width == 0 || height == 0)
-        app->current_output->on = FALSE;
+        gnome_rr_output_info_set_active (app->current_output, FALSE);
       else
-        app->current_output->on = TRUE;
+        gnome_rr_output_info_set_active (app->current_output, TRUE);
     }
 
   realign_outputs_after_resolution_change (app, app->current_output, old_width, old_height);
@@ -866,6 +878,7 @@ lay_out_outputs_horizontally (App *app)
 {
   int i;
   int x;
+  GnomeRROutputInfo **outputs;
 
   /* Lay out all the monitors horizontally when "mirror screens" is turned
    * off, to avoid having all of them overlapped initially.  We put the
@@ -875,31 +888,30 @@ lay_out_outputs_horizontally (App *app)
   x = 0;
 
   /* First pass, all "on" outputs */
+  outputs = gnome_rr_config_get_outputs (app->current_configuration);
 
-  for (i = 0; app->current_configuration->outputs[i]; ++i)
+  for (i = 0; outputs[i]; ++i)
     {
-      GnomeOutputInfo *output;
-
-      output = app->current_configuration->outputs[i];
-      if (output->connected && output->on) {
-        output->x = x;
-        output->y = 0;
-        x += output->width;
-      }
+      int width, height;
+      if (gnome_rr_output_info_is_connected (outputs[i]) && gnome_rr_output_info_is_active (outputs[i]))
+        {
+          gnome_rr_output_info_get_geometry (outputs[i], NULL, NULL, &width, &height);
+          gnome_rr_output_info_set_geometry (outputs[i], x, 0, width, height);
+          x += width;
+        }
     }
 
   /* Second pass, all the black screens */
 
-  for (i = 0; app->current_configuration->outputs[i]; ++i)
+    for (i = 0; outputs[i]; ++i)
     {
-      GnomeOutputInfo *output;
-
-      output = app->current_configuration->outputs[i];
-      if (!(output->connected && output->on)) {
-        output->x = x;
-        output->y = 0;
-        x += output->width;
-      }
+      int width, height;
+      if (!(gnome_rr_output_info_is_connected (outputs[i]) && gnome_rr_output_info_is_active (outputs[i])))
+        {
+          gnome_rr_output_info_get_geometry (outputs[i], NULL, NULL, &width, &height);
+          gnome_rr_output_info_set_geometry (outputs[i], x, 0, width, height);
+          x += width;
+        }
     }
 
 }
@@ -943,16 +955,16 @@ get_clone_size (GnomeRRScreen *screen, int *width, int *height)
 }
 
 static gboolean
-output_info_supports_mode (App *app, GnomeOutputInfo *info, int width, int height)
+output_info_supports_mode (App *app, GnomeRROutputInfo *info, int width, int height)
 {
   GnomeRROutput *output;
   GnomeRRMode **modes;
   int i;
 
-  if (!info->connected)
+  if (!gnome_rr_output_info_is_connected (info))
     return FALSE;
 
-  output = gnome_rr_screen_get_output_by_name (app->screen, info->name);
+  output = gnome_rr_screen_get_output_by_name (app->screen, gnome_rr_output_info_get_name (info));
   if (!output)
     return FALSE;
 
@@ -972,22 +984,22 @@ on_clone_changed (GtkWidget *box, gpointer data)
 {
   App *app = data;
 
-  app->current_configuration->clone =
-    gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (app->clone_checkbox));
+  gnome_rr_config_set_clone (app->current_configuration, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (app->clone_checkbox)));
 
-  if (app->current_configuration->clone)
+  if (gnome_rr_config_get_clone (app->current_configuration))
     {
       int i;
       int width, height;
+      GnomeRROutputInfo **outputs = gnome_rr_config_get_outputs (app->current_configuration);
 
-      for (i = 0; app->current_configuration->outputs[i]; ++i)
-        {
-          if (app->current_configuration->outputs[i]->connected)
-            {
-              app->current_output = app->current_configuration->outputs[i];
-              break;
-            }
-        }
+      for (i = 0; outputs[i]; ++i)
+	{
+	  if (gnome_rr_output_info_is_connected (outputs[i]))
+	    {
+	      app->current_output = outputs[i];
+	      break;
+	    }
+	}
 
       /* Turn on all the connected screens that support the best clone mode.
        * The user may hit "Mirror displays", but he shouldn't have to turn on
@@ -996,12 +1008,13 @@ on_clone_changed (GtkWidget *box, gpointer data)
 
       get_clone_size (app->screen, &width, &height);
 
-      for (i = 0; app->current_configuration->outputs[i]; i++) {
-        if (output_info_supports_mode (app, app->current_configuration->outputs[i], width, height)) {
-          app->current_configuration->outputs[i]->on = TRUE;
-          app->current_configuration->outputs[i]->width = width;
-          app->current_configuration->outputs[i]->height = height;
-        }
+      for (i = 0; outputs[i]; i++) {
+	int x, y;
+	if (output_info_supports_mode (app, outputs[i], width, height)) {
+	  gnome_rr_output_info_set_active (outputs[i], TRUE);
+	  gnome_rr_output_info_get_geometry (outputs[i], &x, &y, NULL, NULL);
+	  gnome_rr_output_info_set_geometry (outputs[i], x, y, width, height);
+	}
       }
     }
   else
@@ -1014,19 +1027,22 @@ on_clone_changed (GtkWidget *box, gpointer data)
 }
 
 static void
-get_geometry (GnomeOutputInfo *output, int *w, int *h)
+get_geometry (GnomeRROutputInfo *output, int *w, int *h)
 {
-  if (output->on)
+  GnomeRRRotation rotation;
+
+  if (gnome_rr_output_info_is_active (output))
     {
-      *h = output->height;
-      *w = output->width;
+      gnome_rr_output_info_get_geometry (output, NULL, NULL, w, h);
     }
   else
     {
-      *h = output->pref_height;
-      *w = output->pref_width;
+      *h = gnome_rr_output_info_get_preferred_height (output);
+      *w = gnome_rr_output_info_get_preferred_width (output);
     }
-  if ((output->rotation & GNOME_RR_ROTATION_90) || (output->rotation & GNOME_RR_ROTATION_270))
+
+  rotation = gnome_rr_output_info_get_rotation (output);
+  if ((rotation & GNOME_RR_ROTATION_90) || (rotation & GNOME_RR_ROTATION_270))
     {
       int tmp;
       tmp = *h;
@@ -1043,6 +1059,7 @@ list_connected_outputs (App *app, int *total_w, int *total_h)
 {
   int i, dummy;
   GList *result = NULL;
+  GnomeRROutputInfo **outputs;
 
   if (!total_w)
     total_w = &dummy;
@@ -1051,17 +1068,17 @@ list_connected_outputs (App *app, int *total_w, int *total_h)
 
   *total_w = 0;
   *total_h = 0;
-  for (i = 0; app->current_configuration->outputs[i] != NULL; ++i)
-    {
-      GnomeOutputInfo *output = app->current_configuration->outputs[i];
 
-      if (output->connected)
-        {
-          int w, h;
+  outputs = gnome_rr_config_get_outputs (app->current_configuration);
+  for (i = 0; outputs[i] != NULL; ++i)
+    {
+      if (gnome_rr_output_info_is_connected (outputs[i]))
+	{
+	  int w, h;
 
-          result = g_list_prepend (result, output);
+	  result = g_list_prepend (result, outputs[i]);
 
-          get_geometry (output, &w, &h);
+	  get_geometry (outputs[i], &w, &h);
 
           *total_w += w;
           *total_h += h;
@@ -1107,7 +1124,7 @@ compute_scale (App *app)
 
 typedef struct Edge
 {
-  GnomeOutputInfo *output;
+  GnomeRROutputInfo *output;
   int x1, y1;
   int x2, y2;
 } Edge;
@@ -1120,7 +1137,7 @@ typedef struct Snap
 } Snap;
 
 static void
-add_edge (GnomeOutputInfo *output, int x1, int y1, int x2, int y2, GArray *edges)
+add_edge (GnomeRROutputInfo *output, int x1, int y1, int x2, int y2, GArray *edges)
 {
   Edge e;
 
@@ -1134,13 +1151,11 @@ add_edge (GnomeOutputInfo *output, int x1, int y1, int x2, int y2, GArray *edges
 }
 
 static void
-list_edges_for_output (GnomeOutputInfo *output, GArray *edges)
+list_edges_for_output (GnomeRROutputInfo *output, GArray *edges)
 {
   int x, y, w, h;
 
-  x = output->x;
-  y = output->y;
-  get_geometry (output, &w, &h);
+  gnome_rr_output_info_get_geometry (output, &x, &y, &w, &h);
 
   /* Top, Bottom, Left, Right */
   add_edge (output, x, y, x + w, y, edges);
@@ -1153,13 +1168,12 @@ static void
 list_edges (GnomeRRConfig *config, GArray *edges)
 {
   int i;
+  GnomeRROutputInfo **outputs = gnome_rr_config_get_outputs (config);
 
-  for (i = 0; config->outputs[i]; ++i)
+  for (i = 0; outputs[i]; ++i)
     {
-      GnomeOutputInfo *output = config->outputs[i];
-
-      if (output->connected)
-        list_edges_for_output (output, edges);
+      if (gnome_rr_output_info_is_connected (outputs[i]))
+	list_edges_for_output (outputs[i], edges);
     }
 }
 
@@ -1244,7 +1258,7 @@ add_edge_snaps (Edge *snapper, Edge *snappee, GArray *snaps)
 }
 
 static void
-list_snaps (GnomeOutputInfo *output, GArray *edges, GArray *snaps)
+list_snaps (GnomeRROutputInfo *output, GArray *edges, GArray *snaps)
 {
   int i;
 
@@ -1300,7 +1314,7 @@ edges_align (Edge *e1, Edge *e2)
 }
 
 static gboolean
-output_is_aligned (GnomeOutputInfo *output, GArray *edges)
+output_is_aligned (GnomeRROutputInfo *output, GArray *edges)
 {
   gboolean result = FALSE;
   int i;
@@ -1337,40 +1351,33 @@ output_is_aligned (GnomeOutputInfo *output, GArray *edges)
 }
 
 static void
-get_output_rect (GnomeOutputInfo *output, GdkRectangle *rect)
+get_output_rect (GnomeRROutputInfo *output, GdkRectangle *rect)
 {
-  int w, h;
-
-  get_geometry (output, &w, &h);
-
-  rect->width = w;
-  rect->height = h;
-  rect->x = output->x;
-  rect->y = output->y;
+  gnome_rr_output_info_get_geometry (output, &rect->x, &rect->y, &rect->width, &rect->height);
 }
 
 static gboolean
-output_overlaps (GnomeOutputInfo *output, GnomeRRConfig *config)
+output_overlaps (GnomeRROutputInfo *output, GnomeRRConfig *config)
 {
   int i;
   GdkRectangle output_rect;
+  GnomeRROutputInfo **outputs;
 
   g_assert (output != NULL);
 
   get_output_rect (output, &output_rect);
 
-  for (i = 0; config->outputs[i]; ++i)
+  outputs = gnome_rr_config_get_outputs (config);
+  for (i = 0; outputs[i]; ++i)
     {
-      GnomeOutputInfo *other = config->outputs[i];
-
-      if (other != output && other->connected)
-        {
-          GdkRectangle other_rect;
-
-          get_output_rect (other, &other_rect);
-          if (gdk_rectangle_intersect (&output_rect, &other_rect, NULL))
-            return TRUE;
-        }
+      if (outputs[i] != output && gnome_rr_output_info_is_connected (outputs[i]))
+	{
+	  GdkRectangle other_rect;
+
+	  get_output_rect (outputs[i], &other_rect);
+	  if (gdk_rectangle_intersect (&output_rect, &other_rect, NULL))
+	    return TRUE;
+	}
     }
 
   return FALSE;
@@ -1381,19 +1388,19 @@ gnome_rr_config_is_aligned (GnomeRRConfig *config, GArray *edges)
 {
   int i;
   gboolean result = TRUE;
+  GnomeRROutputInfo **outputs;
 
-  for (i = 0; config->outputs[i]; ++i)
+  outputs = gnome_rr_config_get_outputs (config);
+  for (i = 0; outputs[i]; ++i)
     {
-      GnomeOutputInfo *output = config->outputs[i];
-
-      if (output->connected)
-        {
-          if (!output_is_aligned (output, edges))
-            return FALSE;
-
-          if (output_overlaps (output, config))
-            return FALSE;
-        }
+      if (gnome_rr_output_info_is_connected (outputs[i]))
+	{
+	  if (!output_is_aligned (outputs[i], edges))
+	    return FALSE;
+
+	  if (output_overlaps (outputs[i], config))
+	    return FALSE;
+	}
     }
 
   return result;
@@ -1500,7 +1507,7 @@ on_top_bar_event (FooScrollArea *area,
    * on_canvas_event() for where we reset the cursor to the default if it
    * exits the outputs' area.
    */
-  if (!app->current_configuration->clone && get_n_connected (app) > 1)
+  if (!gnome_rr_config_get_clone (app->current_configuration) && get_n_connected (app) > 1)
     set_cursor (GTK_WIDGET (area), GDK_HAND1);
 
   if (event->type == FOO_BUTTON_PRESS)
@@ -1508,7 +1515,7 @@ on_top_bar_event (FooScrollArea *area,
       rebuild_gui (app);
       set_top_bar_tooltip (app, TRUE);
 
-      if (!app->current_configuration->clone && get_n_connected (app) > 1)
+      if (!gnome_rr_config_get_clone (app->current_configuration) && get_n_connected (app) > 1)
         {
           app->dragging_top_bar = TRUE;
           foo_scroll_area_begin_grab (area, (FooScrollAreaEventFunc) on_top_bar_event, app);
@@ -1547,23 +1554,14 @@ set_monitors_tooltip (App *app, gboolean is_dragging)
 
 static void
 set_primary_output (App *app,
-                    GnomeOutputInfo *output)
+                    GnomeRROutputInfo *output)
 {
   int i;
+  GnomeRROutputInfo **outputs;
 
-  for (i = 0; app->current_configuration->outputs[i] != NULL; ++i)
-    {
-      GnomeOutputInfo *output2 = app->current_configuration->outputs[i];
-      if (output2 != output)
-        {
-          output2->primary = FALSE;
-        }
-      else
-        {
-          output2->primary = TRUE;
-        }
-    }
-
+  outputs = gnome_rr_config_get_outputs (app->current_configuration);
+  for (i = 0; outputs[i] != NULL; ++i)
+    gnome_rr_output_info_set_primary (outputs[i], outputs[i] == output);
 }
 
 static void
@@ -1571,16 +1569,15 @@ on_output_event (FooScrollArea *area,
                  FooScrollAreaEvent *event,
                  gpointer data)
 {
-  GnomeOutputInfo *output = data;
+  GnomeRROutputInfo *output = data;
   App *app = g_object_get_data (G_OBJECT (area), "app");
 
   if (event->type == FOO_DRAG_HOVER)
     {
-      if (output->on && app->dragging_top_bar)
+      if (gnome_rr_output_info_is_active (output) && app->dragging_top_bar)
         set_primary_output (app, output);
       return;
     }
-
   if (event->type == FOO_DROP)
     {
       /* Activate new primary? */
@@ -1591,7 +1588,7 @@ on_output_event (FooScrollArea *area,
    * on_canvas_event() for where we reset the cursor to the default if it
    * exits the outputs' area.
    */
-  if (!app->current_configuration->clone && get_n_connected (app) > 1)
+  if (!gnome_rr_config_get_clone (app->current_configuration) && get_n_connected (app) > 1)
     set_cursor (GTK_WIDGET (area), GDK_FLEUR);
 
   if (event->type == FOO_BUTTON_PRESS)
@@ -1603,86 +1600,84 @@ on_output_event (FooScrollArea *area,
       rebuild_gui (app);
       set_monitors_tooltip (app, TRUE);
 
-      if (!app->current_configuration->clone && get_n_connected (app) > 1)
-        {
-          foo_scroll_area_begin_grab (area, on_output_event, data);
+      if (!gnome_rr_config_get_clone (app->current_configuration) && get_n_connected (app) > 1)
+	{
+	  int output_x, output_y;
+	  gnome_rr_output_info_get_geometry (output, &output_x, &output_y, NULL, NULL);
 
-          info = g_new0 (GrabInfo, 1);
-          info->grab_x = event->x;
-          info->grab_y = event->y;
-          info->output_x = output->x;
-          info->output_y = output->y;
+	  foo_scroll_area_begin_grab (area, on_output_event, data);
 
-          output->user_data = info;
-        }
+	  info = g_new0 (GrabInfo, 1);
+	  info->grab_x = event->x;
+	  info->grab_y = event->y;
+	  info->output_x = output_x;
+	  info->output_y = output_y;
 
+	  g_object_set_data (G_OBJECT (output), "grab-info", info);
+	}
       foo_scroll_area_invalidate (area);
     }
   else
     {
       if (foo_scroll_area_is_grabbed (area))
-        {
-          GrabInfo *info = output->user_data;
-          double scale = compute_scale (app);
-          int old_x, old_y;
-          int new_x, new_y;
-          int i;
-          GArray *edges, *snaps, *new_edges;
+	{
+	  GrabInfo *info = g_object_get_data (G_OBJECT (output), "grab-info");
+	  double scale = compute_scale (app);
+	  int old_x, old_y;
+	  int width, height;
+	  int new_x, new_y;
+	  int i;
+	  GArray *edges, *snaps, *new_edges;
 
-          old_x = output->x;
-          old_y = output->y;
-          new_x = info->output_x + (event->x - info->grab_x) / scale;
-          new_y = info->output_y + (event->y - info->grab_y) / scale;
+	  gnome_rr_output_info_get_geometry (output, &old_x, &old_y, &width, &height);
+	  new_x = info->output_x + (event->x - info->grab_x) / scale;
+	  new_y = info->output_y + (event->y - info->grab_y) / scale;
 
-          output->x = new_x;
-          output->y = new_y;
+	  gnome_rr_output_info_set_geometry (output, new_x, new_y, width, height);
 
-          edges = g_array_new (TRUE, TRUE, sizeof (Edge));
-          snaps = g_array_new (TRUE, TRUE, sizeof (Snap));
-          new_edges = g_array_new (TRUE, TRUE, sizeof (Edge));
+	  edges = g_array_new (TRUE, TRUE, sizeof (Edge));
+	  snaps = g_array_new (TRUE, TRUE, sizeof (Snap));
+	  new_edges = g_array_new (TRUE, TRUE, sizeof (Edge));
 
-          list_edges (app->current_configuration, edges);
-          list_snaps (output, edges, snaps);
+	  list_edges (app->current_configuration, edges);
+	  list_snaps (output, edges, snaps);
 
-          g_array_sort (snaps, compare_snaps);
+	  g_array_sort (snaps, compare_snaps);
 
-          output->x = info->output_x;
-          output->y = info->output_y;
+	  gnome_rr_output_info_set_geometry (output, new_x, new_y, width, height);
 
-          for (i = 0; i < snaps->len; ++i)
-            {
-              Snap *snap = &(g_array_index (snaps, Snap, i));
-              GArray *new_edges = g_array_new (TRUE, TRUE, sizeof (Edge));
+	  for (i = 0; i < snaps->len; ++i)
+	    {
+	      Snap *snap = &(g_array_index (snaps, Snap, i));
+	      GArray *new_edges = g_array_new (TRUE, TRUE, sizeof (Edge));
 
-              output->x = new_x + snap->dx;
-              output->y = new_y + snap->dy;
+	      gnome_rr_output_info_set_geometry (output, new_x + snap->dx, new_y + snap->dy, width, height);
 
-              g_array_set_size (new_edges, 0);
-              list_edges (app->current_configuration, new_edges);
+	      g_array_set_size (new_edges, 0);
+	      list_edges (app->current_configuration, new_edges);
 
-              if (gnome_rr_config_is_aligned (app->current_configuration, new_edges))
-                {
-                  g_array_free (new_edges, TRUE);
-                  break;
-                }
-              else
-                {
-                  output->x = info->output_x;
-                  output->y = info->output_y;
-                }
-            }
+	      if (gnome_rr_config_is_aligned (app->current_configuration, new_edges))
+		{
+		  g_array_free (new_edges, TRUE);
+		  break;
+		}
+	      else
+		{
+		  gnome_rr_output_info_set_geometry (output, info->output_x, info->output_y, width, height);
+		}
+	    }
 
-          g_array_free (new_edges, TRUE);
-          g_array_free (snaps, TRUE);
-          g_array_free (edges, TRUE);
+	  g_array_free (new_edges, TRUE);
+	  g_array_free (snaps, TRUE);
+	  g_array_free (edges, TRUE);
 
-          if (event->type == FOO_BUTTON_RELEASE)
-            {
-              foo_scroll_area_end_grab (area, NULL);
-              set_monitors_tooltip (app, FALSE);
+	  if (event->type == FOO_BUTTON_RELEASE)
+	    {
+	      foo_scroll_area_end_grab (area, event);
+	      set_monitors_tooltip (app, FALSE);
 
-              g_free (output->user_data);
-              output->user_data = NULL;
+	      g_free (g_object_get_data (G_OBJECT (output), "grab-info"));
+	      g_object_set_data (G_OBJECT (output), "grab-info", NULL);
 
 #if 0
               g_debug ("new position: %d %d %d %d", output->x, output->y, output->width, output->height);
@@ -1708,15 +1703,15 @@ on_canvas_event (FooScrollArea *area,
 
 static PangoLayout *
 get_display_name (App *app,
-                  GnomeOutputInfo *output)
+		  GnomeRROutputInfo *output)
 {
   PangoLayout *layout;
   char *text;
 
-  if (app->current_configuration->clone)
+  if (gnome_rr_config_get_clone (app->current_configuration))
     text = mirror_monitor_name ();
   else
-    text = g_strdup (output->display_name);
+    text = g_strdup (gnome_rr_output_info_get_display_name (output));
 
   layout = gtk_widget_create_pango_layout (GTK_WIDGET (app->area), text);
   g_free (text);
@@ -1788,12 +1783,14 @@ static void
 paint_output (App *app, cairo_t *cr, int i)
 {
   int w, h;
-  double scale;
+  double scale = compute_scale (app);
   double x, y;
+  int output_x, output_y;
+  GnomeRRRotation rotation;
   int total_w, total_h;
-  GList *connected_outputs;
-  GnomeOutputInfo *output;
-  PangoLayout *layout;
+  GList *connected_outputs = list_connected_outputs (app, &total_w, &total_h);
+  GnomeRROutputInfo *output = g_list_nth (connected_outputs, i)->data;
+  PangoLayout *layout = get_display_name (app, output);
   PangoRectangle ink_extent, log_extent;
   GdkRectangle viewport;
   GdkColor output_color;
@@ -1801,11 +1798,6 @@ paint_output (App *app, cairo_t *cr, int i)
   double available_w;
   double factor;
 
-  scale = compute_scale (app);
-
-  connected_outputs = list_connected_outputs (app, &total_w, &total_h);
-  output = g_list_nth (connected_outputs, i)->data;
-
   cairo_save (cr);
 
   foo_scroll_area_get_viewport (FOO_SCROLL_AREA (app->area), &viewport);
@@ -1819,8 +1811,9 @@ paint_output (App *app, cairo_t *cr, int i)
   viewport.height -= 2 * MARGIN;
   viewport.width -= 2 * MARGIN;
 
-  x = output->x * scale + MARGIN + (viewport.width - total_w * scale) / 2.0;
-  y = output->y * scale + MARGIN + (viewport.height - total_h * scale) / 2.0;
+  gnome_rr_output_info_get_geometry (output, &output_x, &output_y, NULL, NULL);
+  x = output_x * scale + MARGIN + (viewport.width - total_w * scale) / 2.0;
+  y = output_y * scale + MARGIN + (viewport.height - total_h * scale) / 2.0;
 
 #if 0
   g_debug ("scaled: %f %f", x, y);
@@ -1836,10 +1829,11 @@ paint_output (App *app, cairo_t *cr, int i)
 
   /* rotation is already applied in get_geometry */
 
-  if (output->rotation & GNOME_RR_REFLECT_X)
+  rotation = gnome_rr_output_info_get_rotation (output);
+  if (rotation & GNOME_RR_REFLECT_X)
     cairo_scale (cr, -1, 1);
 
-  if (output->rotation & GNOME_RR_REFLECT_Y)
+  if (rotation & GNOME_RR_REFLECT_Y)
     cairo_scale (cr, 1, -1);
 
   cairo_translate (cr,
@@ -1872,7 +1866,7 @@ paint_output (App *app, cairo_t *cr, int i)
   g = output_color.green / 65535.0;
   b = output_color.blue / 65535.0;
 
-  if (!output->on)
+  if (!gnome_rr_output_info_is_active (output))
     {
       /* If the output is turned off, just darken the selected color */
       color_shade (&r, &g, &b, 0.4);
@@ -1909,8 +1903,7 @@ paint_output (App *app, cairo_t *cr, int i)
                  y + ((h * scale + 0.5) - factor * log_extent.height) / 2);
 
   cairo_scale (cr, factor, factor);
-
-  if (output->on)
+  if (gnome_rr_output_info_is_active (output))
     cairo_set_source_rgb (cr, 0.0, 0.0, 0.0);
   else
     cairo_set_source_rgb (cr, 1.0, 1.0, 1.0);
@@ -1919,7 +1912,7 @@ paint_output (App *app, cairo_t *cr, int i)
   g_object_unref (layout);
   cairo_restore (cr);
 
-  if (output->primary)
+  if (gnome_rr_output_info_get_primary (output))
     {
       const char *clock_format;
       char *text;
@@ -2000,8 +1993,8 @@ on_area_paint (FooScrollArea  *area,
     {
       paint_output (app, cr, g_list_position (connected_outputs, list));
 
-      if (app->current_configuration->clone)
-        break;
+      if (gnome_rr_config_get_clone (app->current_configuration))
+	break;
     }
 }
 
@@ -2043,20 +2036,20 @@ compute_virtual_size_for_configuration (GnomeRRConfig *config, int *ret_width, i
 {
   int i;
   int width, height;
+  int output_x, output_y, output_width, output_height;
+  GnomeRROutputInfo **outputs;
 
   width = height = 0;
 
-  for (i = 0; config->outputs[i] != NULL; i++)
+  outputs = gnome_rr_config_get_outputs (config);
+  for (i = 0; outputs[i] != NULL; i++)
     {
-      GnomeOutputInfo *output;
-
-      output = config->outputs[i];
-
-      if (output->on)
-        {
-          width = MAX (width, output->x + output->width);
-          height = MAX (height, output->y + output->height);
-        }
+      if (gnome_rr_output_info_is_active (outputs[i]))
+	{
+	  gnome_rr_output_info_get_geometry (outputs[i], &output_x, &output_y, &output_width, &output_height);
+	  width = MAX (width, output_x + output_width);
+	  height = MAX (height, output_y + output_height);
+	}
     }
 
   *ret_width = width;
@@ -2154,16 +2147,16 @@ ensure_current_configuration_is_saved (void)
    * that there *will* be a backup file in the end.
    */
 
-  rr_screen = gnome_rr_screen_new (gdk_screen_get_default (), NULL, NULL, NULL); /* NULL-GError */
+  rr_screen = gnome_rr_screen_new (gdk_screen_get_default (), NULL); /* NULL-GError */
   if (!rr_screen)
     return;
 
-  rr_config = gnome_rr_config_new_current (rr_screen);
+  rr_config = gnome_rr_config_new_current (rr_screen, NULL);
   gnome_rr_config_ensure_primary (rr_config);
   gnome_rr_config_save (rr_config, NULL); /* NULL-GError */
 
-  gnome_rr_config_free (rr_config);
-  gnome_rr_screen_destroy (rr_screen);
+  g_object_unref (rr_config);
+  g_object_unref (rr_screen);
 }
 
 /* Callback for dbus_g_proxy_begin_call() */
@@ -2281,7 +2274,7 @@ driver_is_randr_10 (GnomeRRConfig *config)
    * or is gnome_rr_screen_new()'s return value sufficient?
    */
 
-  return (count_all_outputs (config) == 1 && strcmp (config->outputs[0]->name, "default") == 0);
+  return (count_all_outputs (config) == 1 && strcmp (gnome_rr_output_info_get_name (gnome_rr_config_get_outputs (config)[0]), "default") == 0);
 }
 #endif
 
@@ -2300,64 +2293,66 @@ on_detect_displays (GtkWidget *widget, gpointer data)
   }
 }
 
-static GnomeOutputInfo *
+static GnomeRROutputInfo *
 get_nearest_output (GnomeRRConfig *configuration, int x, int y)
 {
   int i;
   int nearest_index;
   int nearest_dist;
+  GnomeRROutputInfo **outputs;
 
   nearest_index = -1;
   nearest_dist = G_MAXINT;
 
-  for (i = 0; configuration->outputs[i] != NULL; i++)
+  outputs = gnome_rr_config_get_outputs (configuration);
+  for (i = 0; outputs[i] != NULL; i++)
     {
-      GnomeOutputInfo *output;
       int dist_x, dist_y;
+      int output_x, output_y, output_width, output_height;
 
-      output = configuration->outputs[i];
+      if (!(gnome_rr_output_info_is_connected (outputs[i]) && gnome_rr_output_info_is_active (outputs[i])))
+	continue;
 
-      if (!(output->connected && output->on))
-        continue;
+      gnome_rr_output_info_get_geometry (outputs[i], &output_x, &output_y, &output_width, &output_height);
 
-      if (x < output->x)
-        dist_x = output->x - x;
-      else if (x >= output->x + output->width)
-        dist_x = x - (output->x + output->width) + 1;
+      if (x < output_x)
+	dist_x = output_x - x;
+      else if (x >= output_x + output_width)
+	dist_x = x - (output_x + output_width) + 1;
       else
-        dist_x = 0;
+	dist_x = 0;
 
-      if (y < output->y)
-        dist_y = output->y - y;
-      else if (y >= output->y + output->height)
-        dist_y = y - (output->y + output->height) + 1;
+      if (y < output_y)
+	dist_y = output_y - y;
+      else if (y >= output_y + output_height)
+	dist_y = y - (output_y + output_height) + 1;
       else
-        dist_y = 0;
+	dist_y = 0;
 
       if (MIN (dist_x, dist_y) < nearest_dist)
-        {
-          nearest_dist = MIN (dist_x, dist_y);
-          nearest_index = i;
-        }
+	{
+	  nearest_dist = MIN (dist_x, dist_y);
+	  nearest_index = i;
+	}
     }
 
   if (nearest_index != -1)
-    return configuration->outputs[nearest_index];
+    return outputs[nearest_index];
   else
     return NULL;
-
 }
 
 /* Gets the output that contains the largest intersection with the window.
  * Logic stolen from gdk_screen_get_monitor_at_window().
  */
-static GnomeOutputInfo *
+static GnomeRROutputInfo *
 get_output_for_window (GnomeRRConfig *configuration, GdkWindow *window)
 {
   GdkRectangle win_rect;
   int i;
   int largest_area;
   int largest_index;
+  GnomeRROutputInfo **outputs;
 
   gdk_window_get_geometry (window, &win_rect.x, &win_rect.y, &win_rect.width, &win_rect.height);
   gdk_window_get_origin (window, &win_rect.x, &win_rect.y);
@@ -2365,37 +2360,32 @@ get_output_for_window (GnomeRRConfig *configuration, GdkWindow *window)
   largest_area = 0;
   largest_index = -1;
 
-  for (i = 0; configuration->outputs[i] != NULL; i++)
+  outputs = gnome_rr_config_get_outputs (configuration);
+  for (i = 0; outputs[i] != NULL; i++)
     {
-      GnomeOutputInfo *output;
       GdkRectangle output_rect, intersection;
 
-      output = configuration->outputs[i];
+      gnome_rr_output_info_get_geometry (outputs[i], &output_rect.x, &output_rect.y, &output_rect.width, &output_rect.height);
 
-      output_rect.x      = output->x;
-      output_rect.y      = output->y;
-      output_rect.width  = output->width;
-      output_rect.height = output->height;
+      if (gnome_rr_output_info_is_connected (outputs[i]) && gdk_rectangle_intersect (&win_rect, &output_rect, &intersection))
+	{
+	  int area;
 
-      if (output->connected && gdk_rectangle_intersect (&win_rect, &output_rect, &intersection))
-        {
-          int area;
-
-          area = intersection.width * intersection.height;
-          if (area > largest_area)
-            {
-              largest_area = area;
-              largest_index = i;
-            }
-        }
+	  area = intersection.width * intersection.height;
+	  if (area > largest_area)
+	    {
+	      largest_area = area;
+	      largest_index = i;
+	    }
+	}
     }
 
   if (largest_index != -1)
-    return configuration->outputs[largest_index];
+    return outputs[largest_index];
   else
     return get_nearest_output (configuration,
-                               win_rect.x + win_rect.width / 2,
-                               win_rect.y + win_rect.height / 2);
+			       win_rect.x + win_rect.width / 2,
+			       win_rect.y + win_rect.height / 2);
 }
 
 static void
@@ -2463,7 +2453,7 @@ _gtk_builder_get_widget (GtkBuilder *builder, const gchar *name)
 static void
 destroy_app (App *app)
 {
-  gnome_rr_screen_destroy (app->screen);
+  g_object_unref (app->screen);
   g_object_unref (app->builder);
   gnome_rr_labeler_hide (app->labeler);
   g_object_unref (app->labeler);
@@ -2497,8 +2487,8 @@ run_application (void)
       return NULL;
     }
 
-  app->screen = gnome_rr_screen_new (gdk_screen_get_default (),
-                                     on_screen_changed, app, &error);
+  app->screen = gnome_rr_screen_new (gdk_screen_get_default (), &error);
+  g_signal_connect (app->screen, "changed", G_CALLBACK (on_screen_changed), app);
   if (!app->screen)
     {
       error_message (NULL, _("Could not get screen information"), error->message);