4 files changed, 525 insertions, 422 deletions
diff --git a/capplets/display/display-capplet.ui b/capplets/display/display-capplet.ui
index fec38817..9887a410 100644
--- a/capplets/display/display-capplet.ui
+++ b/capplets/display/display-capplet.ui
@@ -1,19 +1,99 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
 <requires lib="gtk+" version="2.16"/>
 <!-- interface-naming-policy toplevel-contextual -->
 <object class="GtkDialog" id="dialog">
+ <property name="can_focus">False</property>
 <property name="border_width">5</property>
 <property name="title" translatable="yes">Monitor Preferences</property>
 <property name="type_hint">dialog</property>
 <child internal-child="vbox">
 <object class="GtkVBox" id="dialog-vbox1">
 <property name="visible">True</property>
- <property name="orientation">vertical</property>
+ <property name="can_focus">False</property>
 <property name="spacing">2</property>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="helpbutton1">
+ <property name="label">gtk-help</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ <property name="secondary">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="make_default_button">
+ <property name="label" translatable="yes">Apply system-wide</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="tooltip_text" translatable="yes">Applies the current configuration for other MATE users on the computer. Note that this doesn't affect login screens or other desktop environments.</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="apply_button">
+ <property name="label">gtk-apply</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button2">
+ <property name="label">gtk-close</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
 <child>
 <object class="GtkTable" id="table2">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="n_rows">2</property>
 <property name="n_columns">2</property>
 <property name="column_spacing">12</property>
@@ -21,22 +101,26 @@
 <child>
 <object class="GtkVBox" id="vbox3">
 <property name="visible">True</property>
- <property name="orientation">vertical</property>
+ <property name="can_focus">False</property>
 <property name="spacing">12</property>
 <child>
 <object class="GtkAlignment" id="align">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
 <placeholder/>
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">0</property>
 </packing>
 </child>
 <child>
 <object class="GtkHBox" id="hbox1">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="spacing">12</property>
 <child>
 <object class="GtkCheckButton" id="clone_checkbox">
@@ -44,6 +128,7 @@
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
 <property name="use_underline">True</property>
 <property name="draw_indicator">True</property>
 </object>
@@ -59,6 +144,7 @@
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
 <property name="use_underline">True</property>
 </object>
 <packing>
@@ -80,10 +166,11 @@
 <child>
 <object class="GtkVBox" id="vbox4">
 <property name="visible">True</property>
- <property name="orientation">vertical</property>
+ <property name="can_focus">False</property>
 <child>
 <object class="GtkLabel" id="label8">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xalign">0</property>
 <property name="label" translatable="yes">Panel icon</property>
 <attributes>
@@ -99,6 +186,7 @@
 <child>
 <object class="GtkAlignment" id="alignment2">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="left_padding">12</property>
 <child>
 <object class="GtkCheckButton" id="show_notification_icon">
@@ -106,6 +194,7 @@
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
 <property name="use_underline">True</property>
 <property name="draw_indicator">True</property>
 </object>
@@ -127,72 +216,79 @@
 <child>
 <object class="GtkAlignment" id="alignment1">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xalign">0</property>
 <property name="yalign">0</property>
 <child>
 <object class="GtkTable" id="table1">
 <property name="visible">True</property>
- <property name="n_rows">6</property>
+ <property name="can_focus">False</property>
+ <property name="n_rows">7</property>
 <property name="n_columns">2</property>
 <property name="column_spacing">12</property>
 <property name="row_spacing">6</property>
 <child>
 <object class="GtkLabel" id="label2">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xalign">0</property>
 <property name="label" translatable="yes">_Resolution:</property>
 <property name="use_underline">True</property>
 <property name="mnemonic_widget">resolution_combo</property>
 </object>
 <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
 <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
 </packing>
 </child>
 <child>
 <object class="GtkLabel" id="label3">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xalign">0</property>
 <property name="label" translatable="yes">Re_fresh rate:</property>
 <property name="use_underline">True</property>
 <property name="mnemonic_widget">refresh_combo</property>
 </object>
 <packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
 <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
 </packing>
 </child>
 <child>
 <object class="GtkComboBox" id="resolution_combo">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 </object>
 <packing>
 <property name="left_attach">1</property>
 <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="y_options"></property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="y_options"/>
 </packing>
 </child>
 <child>
 <object class="GtkComboBox" id="refresh_combo">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 </object>
 <packing>
 <property name="left_attach">1</property>
 <property name="right_attach">2</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="y_options"></property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="y_options"/>
 </packing>
 </child>
 <child>
 <object class="GtkHBox" id="hbox2">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="spacing">12</property>
 <child>
 <object class="GtkRadioButton" id="monitor_on_radio">
@@ -200,6 +296,7 @@
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
 <property name="use_underline">True</property>
 <property name="active">True</property>
 <property name="draw_indicator">True</property>
@@ -216,6 +313,7 @@
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
 <property name="use_underline">True</property>
 <property name="draw_indicator">True</property>
 <property name="group">monitor_on_radio</property>
@@ -231,15 +329,17 @@
 <property name="right_attach">2</property>
 <property name="top_attach">1</property>
 <property name="bottom_attach">2</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
 </packing>
 </child>
 <child>
 <object class="GtkEventBox" id="current_monitor_event_box">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
 <object class="GtkLabel" id="current_monitor_label">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xalign">0</property>
 <property name="label" translatable="yes">Monitor</property>
 <attributes>
@@ -250,27 +350,29 @@
 </object>
 <packing>
 <property name="right_attach">2</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
 </packing>
 </child>
 <child>
 <object class="GtkLabel" id="label5">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="xalign">0</property>
 <property name="label" translatable="yes">R_otation:</property>
 <property name="use_underline">True</property>
 <property name="mnemonic_widget">rotation_combo</property>
 </object>
 <packing>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
 <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
 </packing>
 </child>
 <child>
 <object class="GtkComboBox" id="rotation_combo">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="model">liststore1</property>
 <child>
 <object class="GtkCellRendererText" id="cellrenderertext1"/>
@@ -282,9 +384,9 @@
 <packing>
 <property name="left_attach">1</property>
 <property name="right_attach">2</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="y_options"></property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
+ <property name="y_options"/>
 </packing>
 </child>
 <child>
@@ -292,19 +394,22 @@
 <property name="label" translatable="yes">Include _panel</property>
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
 <property name="use_underline">True</property>
 <property name="draw_indicator">True</property>
 </object>
 <packing>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">6</property>
+ <property name="bottom_attach">7</property>
 <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
 </packing>
 </child>
 <child>
 <object class="GtkAlignment" id="alignment4">
 <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <child>
 <placeholder/>
 </child>
@@ -314,8 +419,26 @@
 <property name="right_attach">2</property>
 <property name="top_attach">5</property>
 <property name="bottom_attach">6</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
+ <property name="x_options"/>
+ <property name="y_options"/>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="primary_button">
+ <property name="label" translatable="yes">Set as primary</property>
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="tooltip_text" translatable="yes">Sets the selected monitor as primary.</property>
+ <property name="use_action_appearance">False</property>
+ </object>
+ <packing>
+ <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options">GTK_FILL</property>
 </packing>
 </child>
 </object>
@@ -324,86 +447,17 @@
 <packing>
 <property name="left_attach">1</property>
 <property name="right_attach">2</property>
- <property name="x_options"></property>
+ <property name="x_options"/>
 <property name="y_options">GTK_FILL</property>
 </packing>
 </child>
 </object>
 <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
 <property name="position">1</property>
 </packing>
 </child>
- <child internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog-action_area1">
- <property name="visible">True</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="helpbutton1">
- <property name="label">gtk-help</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- <property name="secondary">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="make_default_button">
- <property name="label" translatable="yes">Make Default</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="apply_button">
- <property name="label">gtk-apply</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="button2">
- <property name="label">gtk-close</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
 </object>
 </child>
 <action-widgets>
diff --git a/capplets/display/mate-display-properties.desktop.in.in b/capplets/display/mate-display-properties.desktop.in.in
index 9031a275..324529fa 100644
--- a/capplets/display/mate-display-properties.desktop.in.in
+++ b/capplets/display/mate-display-properties.desktop.in.in
@@ -1,6 +1,6 @@
 [Desktop Entry]
-_Name=Monitors
-_Comment=Change resolution and position of monitors
+_Name=Displays
+_Comment=Change resolution and position of monitors and projectors
 Exec=mate-display-properties
 Icon=mate-preferences-desktop-display
 Terminal=false
diff --git a/capplets/display/scrollarea.c b/capplets/display/scrollarea.c
index 5dfd2e7f..711984a4 100644
--- a/capplets/display/scrollarea.c
+++ b/capplets/display/scrollarea.c
@@ -325,9 +325,14 @@ foo_scroll_area_class_init (FooScrollAreaClass *class)
 paint),
 NULL, NULL,
 foo_marshal_VOID__POINTER_BOXED_POINTER,
- G_TYPE_NONE, 3,
+ G_TYPE_NONE,
+#if GTK_CHECK_VERSION (3, 0, 0)
+ 1,
+#else
+ 3,
 G_TYPE_POINTER,
 GDK_TYPE_RECTANGLE, 
+#endif
 G_TYPE_POINTER);
 
 #if !GTK_CHECK_VERSION (3, 0, 0)
@@ -598,38 +603,18 @@ clip_to_region (cairo_t *cr, GdkRegion *region)
 }
 #endif
 
-#if !GTK_CHECK_VERSION (3, 0, 0)
-static void
-simple_draw_drawable (GdkDrawable *dst,
- GdkDrawable *src,
- int src_x,
- int src_y,
- int dst_x,
- int dst_y,
- int width,
- int height)
-{
- GdkGC *gc = gdk_gc_new (dst);
-
- gdk_draw_drawable (dst, gc, src, src_x, src_y, dst_x, dst_y, width, height);
-
- g_object_unref (gc);
-}
-#endif
-
 static gboolean
 #if GTK_CHECK_VERSION (3, 0, 0)
 foo_scroll_area_draw (GtkWidget *widget,
- cairo_t *cr)
+ cairo_t *widget_cr)
 #else
 foo_scroll_area_expose (GtkWidget *widget,
 GdkEventExpose *expose)
 #endif
 {
 FooScrollArea *scroll_area = FOO_SCROLL_AREA (widget);
-#if !GTK_CHECK_VERSION (3, 0, 0)
 cairo_t *cr;
- GdkGC *gc;
+#if !GTK_CHECK_VERSION (3, 0, 0)
 GdkRectangle extents;
 GdkWindow *window = gtk_widget_get_window (widget);
 #endif
@@ -661,7 +646,7 @@ foo_scroll_area_expose (GtkWidget *widget,
 
 /* Setup input areas */
 clear_exposed_input_region (scroll_area, scroll_area->priv->update_region);
- 
+
 scroll_area->priv->current_input = g_new0 (InputRegion, 1);
 scroll_area->priv->current_input->region = gdk_region_copy (scroll_area->priv->update_region);
 scroll_area->priv->current_input->paths = NULL;
@@ -676,6 +661,8 @@ foo_scroll_area_expose (GtkWidget *widget,
 cr = gdk_cairo_create (scroll_area->priv->pixmap);
 translate_cairo_device (cr, -x_offset, -y_offset);
 clip_to_region (cr, region);
+#else
+ cr = cairo_create (scroll_area->priv->surface);
 #endif
 initialize_background (widget, cr);
 
@@ -690,10 +677,8 @@ foo_scroll_area_expose (GtkWidget *widget,
 g_signal_emit (widget, signals[PAINT], 0, cr, &extents, region);
 #endif
 
-#if !GTK_CHECK_VERSION (3, 0, 0)
 /* Destroy stuff */
 cairo_destroy (cr);
-#endif
 
 #if !GTK_CHECK_VERSION (3, 0, 0)
 scroll_area->priv->expose_region = NULL;
@@ -702,19 +687,17 @@ foo_scroll_area_expose (GtkWidget *widget,
 
 /* Finally draw the backing pixmap */
 #if GTK_CHECK_VERSION (3, 0, 0)
- cairo_set_source_surface (cr, scroll_area->priv->surface, widget_allocation.x, widget_allocation.y);
- cairo_paint (cr);
+ cairo_set_source_surface (widget_cr, scroll_area->priv->surface, widget_allocation.x, widget_allocation.y);
+ cairo_paint (widget_cr);
 #else
- gc = gdk_gc_new (window);
-
- gdk_gc_set_clip_region (gc, expose->region);
-
 gtk_widget_get_allocation (widget, &widget_allocation);
- gdk_draw_drawable (window, gc, scroll_area->priv->pixmap,
- 0, 0, widget_allocation.x, widget_allocation.y,
- widget_allocation.width, widget_allocation.height);
 
- g_object_unref (gc);
+ cr = gdk_cairo_create (window);
+ gdk_cairo_set_source_pixmap (cr, scroll_area->priv->pixmap,
+ widget_allocation.x, widget_allocation.y);
+ gdk_cairo_region (cr, expose->region);
+ cairo_fill (cr);
+ cairo_destroy (cr);
 #endif
 gdk_region_destroy (region);
 
@@ -889,6 +872,7 @@ create_new_pixmap (GtkWidget *widget,
 cairo_surface_t *new;
 #else
 GdkPixmap *new;
+ cairo_t *cr;
 #endif
 
 gtk_widget_get_allocation (widget, &widget_allocation);
@@ -913,15 +897,17 @@ create_new_pixmap (GtkWidget *widget,
 * That might just work, actually. We need to make sure marco uses
 * static gravity for the window before this will be useful.
 */
+
 #if GTK_CHECK_VERSION (3, 0, 0)
 cr = cairo_create (new);
 cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
 cairo_set_source_surface (cr, old, 0, 0);
- cairo_paint (cr);
- cairo_destroy (cr);
 #else
- simple_draw_drawable (new, old, 0, 0, 0, 0, -1, -1);
+ cr = gdk_cairo_create (new);
+ gdk_cairo_set_source_pixmap (cr, old, 0, 0);
 #endif
+ cairo_paint (cr);
+ cairo_destroy (cr);
 
 return new;
 }
@@ -1259,9 +1245,13 @@ foo_scroll_area_scroll (FooScrollArea *area,
 if (gdk_rectangle_intersect (&allocation, &src_area, &move_area))
 {
 GdkRegion *move_region;
+ cairo_t *cr;
 
 #if GTK_CHECK_VERSION (3, 0, 0)
- cairo_t *cr = cairo_create (area->priv->surface);
+ cr = cairo_create (area->priv->surface);
+#else
+ cr = gdk_cairo_create (area->priv->pixmap);
+#endif
 
 /* Cairo doesn't allow self-copies, so we do this little trick instead:
 * 1) Clip so the group size is small.
@@ -1271,7 +1261,11 @@ foo_scroll_area_scroll (FooScrollArea *area,
 cairo_clip (cr);
 cairo_push_group (cr);
 
+#if GTK_CHECK_VERSION (3, 0, 0)
 cairo_set_source_surface (cr, area->priv->surface, dx, dy);
+#else
+ gdk_cairo_set_source_pixmap (cr, area->priv->pixmap, dx, dy);
+#endif
 gdk_cairo_rectangle (cr, &move_area);
 cairo_fill (cr);
 
@@ -1279,12 +1273,7 @@ foo_scroll_area_scroll (FooScrollArea *area,
 cairo_paint (cr);
 
 cairo_destroy (cr);
-#else
- simple_draw_drawable (area->priv->pixmap, area->priv->pixmap,
- move_area.x, move_area.y,
- move_area.x + dx, move_area.y + dy,
- move_area.width, move_area.height);
-#endif
+
 gtk_widget_queue_draw (GTK_WIDGET (area));
 
 move_region = gdk_region_rectangle (&move_area);
diff --git a/capplets/display/xrandr-capplet.c b/capplets/display/xrandr-capplet.c
index 7a2325c5..bc91fd32 100644
--- a/capplets/display/xrandr-capplet.c
+++ b/capplets/display/xrandr-capplet.c
@@ -49,7 +49,7 @@ struct App
 MateRRScreen *screen;
 MateRRConfig *current_configuration;
 MateRRLabeler *labeler;
- MateOutputInfo *current_output;
+ MateRROutputInfo *current_output;
 
 GtkWidget *dialog;
 GtkWidget *current_monitor_event_box;
@@ -63,6 +63,7 @@ struct App
 GtkWidget *panel_checkbox;
 GtkWidget *clone_checkbox;
 GtkWidget *show_icon_checkbox;
+ GtkWidget *primary_button; 
 
 /* We store the event timestamp when the Apply button is clicked */
 GtkWidget *apply_button;
@@ -91,13 +92,13 @@ enum {
 static void rebuild_gui (App *app);
 static void on_clone_changed (GtkWidget *box, gpointer data);
 static void on_rate_changed (GtkComboBox *box, gpointer data);
-static gboolean output_overlaps (MateOutputInfo *output, MateRRConfig *config);
+static gboolean output_overlaps (MateRROutputInfo *output, MateRRConfig *config);
 static void select_current_output_from_dialog_position (App *app);
 static void monitor_on_off_toggled_cb (GtkToggleButton *toggle, gpointer data);
-static void get_geometry (MateOutputInfo *output, int *w, int *h);
+static void get_geometry (MateRROutputInfo *output, int *w, int *h);
 static void apply_configuration_returned_cb (DBusGProxy *proxy, DBusGProxyCall *call_id, void *data);
 static gboolean get_clone_size (MateRRScreen *screen, int *width, int *height);
-static gboolean output_info_supports_mode (App *app, MateOutputInfo *info, int width, int height);
+static gboolean output_info_supports_mode (App *app, MateRROutputInfo *info, int width, int height);
 
 static void
 error_message (App *app, const char *primary_text, const char *secondary_text)
@@ -139,10 +140,10 @@ on_screen_changed (MateRRScreen *scr,
 MateRRConfig *current;
 App *app = data;
 
- current = mate_rr_config_new_current (app->screen);
+ current = mate_rr_config_new_current (app->screen, NULL);
 
 if (app->current_configuration)
- mate_rr_config_free (app->current_configuration);
+ g_object_unref (app->current_configuration);
 
 app->current_configuration = current;
 app->current_output = NULL;
@@ -278,7 +279,7 @@ get_current_modes (App *app)
 {
 MateRROutput *output;
 
- if (app->current_configuration->clone)
+ if (mate_rr_config_get_clone (app->current_configuration))
 {
 return mate_rr_screen_list_clone_modes (app->screen);
 }
@@ -287,8 +288,8 @@ get_current_modes (App *app)
 if (!app->current_output)
 return NULL;
 
- output = mate_rr_screen_get_output_by_name (
- app->screen, app->current_output->name);
+ output = mate_rr_screen_get_output_by_name (app->screen,
+ mate_rr_output_info_get_name (app->current_output));
 
 if (!output)
 return NULL;
@@ -317,20 +318,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 && mate_rr_output_info_is_active (app->current_output));
 
 if (!app->current_output)
 return;
 
- current = app->current_output->rotation;
+ current = mate_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;
+ mate_rr_output_info_set_rotation (app->current_output, info->rotation);
 
 /* NULL-GError --- FIXME: we should say why this rotation is not available! */
 if (mate_rr_config_applicable (app->current_configuration, app->screen, NULL))
@@ -342,7 +343,7 @@ rebuild_rotation_combo (App *app)
 }
 }
 
- app->current_output->rotation = current;
+ mate_rr_output_info_set_rotation (app->current_output, current);
 
 if (!(selection && combo_select (app->rotation_combo, selection)))
 combo_select (app->rotation_combo, _("Normal"));
@@ -357,7 +358,6 @@ make_rate_string (int hz)
 static void
 rebuild_rate_combo (App *app)
 {
- GHashTable *rates;
 MateRRMode **modes;
 int best;
 int i;
@@ -365,27 +365,27 @@ rebuild_rate_combo (App *app)
 clear_combo (app->refresh_combo);
 
 gtk_widget_set_sensitive (
- app->refresh_combo, app->current_output && app->current_output->on);
+ app->refresh_combo, app->current_output && mate_rr_output_info_is_active (app->current_output));
 
 if (!app->current_output
 || !(modes = get_current_modes (app)))
 return;
 
- rates = g_hash_table_new_full (
- g_str_hash, g_str_equal, (GFreeFunc) g_free, NULL);
-
 best = -1;
 for (i = 0; modes[i] != NULL; ++i)
 {
 MateRRMode *mode = modes[i];
 int width, height, rate;
+ int output_width, output_height;
+
+ mate_rr_output_info_get_geometry (app->current_output, NULL, NULL, &output_width, &output_height);
 
 width = mate_rr_mode_get_width (mode);
 height = mate_rr_mode_get_height (mode);
 rate = mate_rr_mode_get_freq (mode);
 
- if (width == app->current_output->width &&
- height == app->current_output->height)
+ if (width == output_width &&
+ height == output_height)
 {
 add_key (app->refresh_combo,
 idle_free (make_rate_string (rate)),
@@ -396,7 +396,7 @@ rebuild_rate_combo (App *app)
 }
 }
 
- if (!combo_select (app->refresh_combo, idle_free (make_rate_string (app->current_output->rate))))
+ if (!combo_select (app->refresh_combo, idle_free (make_rate_string (mate_rr_output_info_get_refresh_rate (app->current_output)))))
 combo_select (app->refresh_combo, idle_free (make_rate_string (best)));
 }
 
@@ -404,30 +404,17 @@ static int
 count_active_outputs (App *app)
 {
 int i, count = 0;
+ MateRROutputInfo **outputs = mate_rr_config_get_outputs (app->current_configuration);
 
- for (i = 0; app->current_configuration->outputs[i] != NULL; ++i)
+ for (i = 0; outputs[i] != NULL; ++i)
 {
- MateOutputInfo *output = app->current_configuration->outputs[i];
- if (output->on)
+ if (mate_rr_output_info_is_active (outputs[i]))
 count++;
 }
 
 return count;
 }
 
-#if 0
-static int
-count_all_outputs (MateRRConfig *config)
-{
- int i;
-
- for (i = 0; config->outputs[i] != NULL; i++)
- ;
-
- return i;
-}
-#endif
-
 /* Computes whether "Mirror Screens" (clone mode) is supported based on these criteria:
 *
 * 1. There is an available size for cloning.
@@ -448,18 +435,17 @@ mirror_screens_is_supported (App *app)
 if (have_clone_size) {
 int i;
 int num_outputs_with_clone_size;
+ MateRROutputInfo **outputs = mate_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++)
 {
- MateOutputInfo *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))
+ if (mate_rr_output_info_is_connected (outputs[i]) && output_info_supports_mode (app, outputs[i], clone_width, clone_height))
 num_outputs_with_clone_size++;
 }
 
@@ -478,7 +464,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 && mate_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);
@@ -493,18 +479,26 @@ static void
 rebuild_current_monitor_label (App *app)
 {
 char *str, *tmp;
+#if GTK_CHECK_VERSION (3, 0, 0)
+ GdkRGBA color;
+#else
 GdkColor color;
+#endif
 gboolean use_color;
 
 if (app->current_output)
 {
- if (app->current_configuration->clone)
+ if (mate_rr_config_get_clone (app->current_configuration))
 tmp = g_strdup (_("Mirror Screens"));
 else
- tmp = g_strdup_printf (_("Monitor: %s"), app->current_output->display_name);
+ tmp = g_strdup_printf (_("Monitor: %s"), mate_rr_output_info_get_display_name (app->current_output));
 
 str = g_strdup_printf ("<b>%s</b>", tmp);
+#if GTK_CHECK_VERSION (3, 0, 0)
+ mate_rr_labeler_get_rgba_for_output (app->labeler, app->current_output, &color);
+#else
 mate_rr_labeler_get_color_for_output (app->labeler, app->current_output, &color);
+#endif
 use_color = TRUE;
 g_free (tmp);
 }
@@ -519,6 +513,17 @@ rebuild_current_monitor_label (App *app)
 
 if (use_color)
 {
+#if GTK_CHECK_VERSION (3, 0, 0)
+ GdkRGBA black = { 0, 0, 0, 1.0 };
+
+ gtk_widget_override_background_color (app->current_monitor_event_box, gtk_widget_get_state_flags (app->current_monitor_event_box), &color);
+
+ /* Make the label explicitly black. We don't want it to follow the
+ * theme's colors, since the label is always shown against a light
+ * pastel background. See bgo#556050
+ */
+ gtk_widget_override_color (app->current_monitor_label, gtk_widget_get_state_flags (app->current_monitor_label), &black);
+#else
 GdkColor black = { 0, 0, 0, 0 };
 
 gtk_widget_modify_bg (app->current_monitor_event_box, gtk_widget_get_state (app->current_monitor_event_box), &color);
@@ -528,7 +533,9 @@ rebuild_current_monitor_label (App *app)
 * pastel background. See bgo#556050
 */
 gtk_widget_modify_fg (app->current_monitor_label, gtk_widget_get_state (app->current_monitor_label), &black);
+#endif
 }
+#if !GTK_CHECK_VERSION (3, 0, 0)
 else
 {
 /* Remove any modifications we did on the label's color */
@@ -537,6 +544,7 @@ rebuild_current_monitor_label (App *app)
 reset_rc_style = gtk_rc_style_new ();
 gtk_widget_modify_style (app->current_monitor_label, reset_rc_style); /* takes ownership of, and destroys, the rc style */
 }
+#endif
 
 gtk_event_box_set_visible_window (GTK_EVENT_BOX (app->current_monitor_event_box), use_color);
 }
@@ -555,14 +563,14 @@ rebuild_on_off_radios (App *app)
 on_active = FALSE;
 off_active = FALSE;
 
- if (!app->current_configuration->clone && app->current_output)
+ if (!mate_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 || !mate_rr_output_info_is_active (app->current_output))
 sensitive = TRUE;
 else
 sensitive = FALSE;
 
- on_active = app->current_output->on;
+ on_active = mate_rr_output_info_is_active (app->current_output);
 off_active = !on_active;
 }
 
@@ -611,19 +619,22 @@ rebuild_resolution_combo (App *app)
 int i;
 MateRRMode **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)
+ || !mate_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);
+
+ mate_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 +650,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))
 {
@@ -665,7 +676,7 @@ rebuild_gui (App *app)
 sensitive = app->current_output ? TRUE : FALSE;
 
 #if 0
- g_debug ("rebuild gui, is on: %d", app->current_output->on);
+ g_debug ("rebuild gui, is on: %d", mate_rr_output_info_is_active (app->current_output));
 #endif
 
 rebuild_mirror_screens (app);
@@ -676,10 +687,12 @@ 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, mate_rr_output_info_is_active (app->current_output));
 #endif
 gtk_widget_set_sensitive (app->panel_checkbox, sensitive);
 
+ gtk_widget_set_sensitive (app->primary_button, app->current_output && !mate_rr_output_info_get_primary(app->current_output));
+
 app->ignore_gui_changes = FALSE;
 }
 
@@ -728,7 +741,7 @@ on_rotation_changed (GtkComboBox *box, gpointer data)
 return;
 
 if (get_mode (app->rotation_combo, NULL, NULL, NULL, &rotation))
- app->current_output->rotation = rotation;
+ mate_rr_output_info_set_rotation (app->current_output, rotation);
 
 foo_scroll_area_invalidate (FOO_SCROLL_AREA (app->area));
 }
@@ -743,7 +756,7 @@ on_rate_changed (GtkComboBox *box, gpointer data)
 return;
 
 if (get_mode (app->refresh_combo, NULL, NULL, &rate, NULL))
- app->current_output->rate = rate;
+ rate = mate_rr_output_info_get_refresh_rate (app->current_output);
 
 foo_scroll_area_invalidate (FOO_SCROLL_AREA (app->area));
 }
@@ -753,11 +766,15 @@ select_resolution_for_current_output (App *app)
 {
 MateRRMode **modes;
 int width, height;
+ int x, y;
+ mate_rr_output_info_get_geometry (app->current_output, &x, &y, NULL, NULL);
+
+ width = mate_rr_output_info_get_preferred_width (app->current_output);
+ height = mate_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;
+ mate_rr_output_info_set_geometry (app->current_output, x, y, width, height);
 return;
 }
 
@@ -767,8 +784,7 @@ select_resolution_for_current_output (App *app)
 
 find_best_mode (modes, &width, &height);
 
- app->current_output->width = width;
- app->current_output->height = height;
+ mate_rr_output_info_set_geometry (app->current_output, x, y, width, height);
 }
 
 static void
@@ -793,7 +809,7 @@ monitor_on_off_toggled_cb (GtkToggleButton *toggle, gpointer data)
 return;
 }
 
- app->current_output->on = is_on;
+ mate_rr_output_info_set_active (app->current_output, is_on);
 
 if (is_on)
 select_resolution_for_current_output (app); /* The refresh rate will be picked in rebuild_rate_combo() */
@@ -803,7 +819,7 @@ monitor_on_off_toggled_cb (GtkToggleButton *toggle, gpointer data)
 }
 
 static void
-realign_outputs_after_resolution_change (App *app, MateOutputInfo *output_that_changed, int old_width, int old_height)
+realign_outputs_after_resolution_change (App *app, MateRROutputInfo *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
@@ -814,38 +830,45 @@ realign_outputs_after_resolution_change (App *app, MateOutputInfo *output_that_c
 int i;
 int old_right_edge, old_bottom_edge;
 int dx, dy;
+ int x, y, width, height;
+ MateRROutputInfo **outputs;
 
 g_assert (app->current_configuration != NULL);
 
- if (output_that_changed->width == old_width && output_that_changed->height == old_height)
+ mate_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++) {
- MateOutputInfo *output;
+ outputs = mate_rr_config_get_outputs (app->current_configuration);
+
+ for (i = 0; outputs[i] != NULL; i++)
+ {
+ int output_x, output_y;
 int output_width, output_height;
 
- output = app->current_configuration->outputs[i];
+ if (outputs[i] == output_that_changed || mate_rr_output_info_is_connected (outputs[i]))
+ continue;
 
- if (output == output_that_changed || !output->connected)
- continue;
+ mate_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 = x + width - output_width;
 
- get_geometry (output, &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_y >= old_bottom_edge)
+ output_y += dy;
+ else if (output_y + output_height == old_bottom_edge)
+ output_y = y + height - output_height;
 
- 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;
+ mate_rr_output_info_set_geometry (outputs[i], output_x, output_y, output_width, output_height);
 }
 }
 
@@ -854,24 +877,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;
+ mate_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;
+ mate_rr_output_info_set_geometry (app->current_output, x, y, width, height);
 
 if (width == 0 || height == 0)
- app->current_output->on = FALSE;
+ mate_rr_output_info_set_active (app->current_output, FALSE);
 else
- app->current_output->on = TRUE;
+ mate_rr_output_info_set_active (app->current_output, TRUE);
 }
 
 realign_outputs_after_resolution_change (app, app->current_output, old_width, old_height);
@@ -887,6 +909,7 @@ lay_out_outputs_horizontally (App *app)
 {
 int i;
 int x;
+ MateRROutputInfo **outputs;
 
 /* Lay out all the monitors horizontally when "mirror screens" is turned
 * off, to avoid having all of them overlapped initially. We put the
@@ -896,30 +919,29 @@ lay_out_outputs_horizontally (App *app)
 x = 0;
 
 /* First pass, all "on" outputs */
+ outputs = mate_rr_config_get_outputs (app->current_configuration);
 
- for (i = 0; app->current_configuration->outputs[i]; ++i)
+ for (i = 0; outputs[i]; ++i)
 {
- MateOutputInfo *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 (mate_rr_output_info_is_connected (outputs[i]) &&mate_rr_output_info_is_active (outputs[i]))
+ {
+ mate_rr_output_info_get_geometry (outputs[i], NULL, NULL, &width, &height);
+ mate_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)
 {
- MateOutputInfo *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 (!(mate_rr_output_info_is_connected (outputs[i]) && mate_rr_output_info_is_active (outputs[i])))
+ {
+ mate_rr_output_info_get_geometry (outputs[i], NULL, NULL, &width, &height);
+ mate_rr_output_info_set_geometry (outputs[i], x, 0, width, height);
+ x += width;
 }
 }
 
@@ -964,16 +986,16 @@ get_clone_size (MateRRScreen *screen, int *width, int *height)
 }
 
 static gboolean
-output_info_supports_mode (App *app, MateOutputInfo *info, int width, int height)
+output_info_supports_mode (App *app, MateRROutputInfo *info, int width, int height)
 {
 MateRROutput *output;
 MateRRMode **modes;
 int i;
 
- if (!info->connected)
+ if (!mate_rr_output_info_is_connected (info))
 return FALSE;
 
- output = mate_rr_screen_get_output_by_name (app->screen, info->name);
+ output = mate_rr_screen_get_output_by_name (app->screen, mate_rr_output_info_get_name (info));
 if (!output)
 return FALSE;
 
@@ -993,19 +1015,19 @@ 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));
+ mate_rr_config_set_clone (app->current_configuration, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (app->clone_checkbox)));
 
- if (app->current_configuration->clone)
+ if (mate_rr_config_get_clone (app->current_configuration))
 {
 int i;
 int width, height;
+ MateRROutputInfo **outputs = mate_rr_config_get_outputs (app->current_configuration);
 
- for (i = 0; app->current_configuration->outputs[i]; ++i)
+ for (i = 0; outputs[i]; ++i)
 {
- if (app->current_configuration->outputs[i]->connected)
+ if (mate_rr_output_info_is_connected(outputs[i]))
 {
- app->current_output = app->current_configuration->outputs[i];
+ app->current_output = outputs[i];
 break;
 }
 }
@@ -1017,11 +1039,12 @@ 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)) {
+ mate_rr_output_info_set_active (outputs[i], TRUE);
+ mate_rr_output_info_get_geometry (outputs[i], &x, &y, NULL, NULL);
+ mate_rr_output_info_set_geometry (outputs[i], x, y, width, height);
 }
 }
 }
@@ -1035,19 +1058,21 @@ on_clone_changed (GtkWidget *box, gpointer data)
 }
 
 static void
-get_geometry (MateOutputInfo *output, int *w, int *h)
+get_geometry (MateRROutputInfo *output, int *w, int *h)
 {
- if (output->on)
+ MateRRRotation rotation;
+
+ if (mate_rr_output_info_is_active (output))
 {
- *h = output->height;
- *w = output->width;
+ mate_rr_output_info_get_geometry (output, NULL, NULL, w, h);
 }
 else
 {
- *h = output->pref_height;
- *w = output->pref_width;
+ *h = mate_rr_output_info_get_preferred_height (output);
+ *w = mate_rr_output_info_get_preferred_width (output);
 }
- if ((output->rotation & MATE_RR_ROTATION_90) || (output->rotation & MATE_RR_ROTATION_270))
+ rotation = mate_rr_output_info_get_rotation (output);
+ if ((rotation & MATE_RR_ROTATION_90) || (rotation & MATE_RR_ROTATION_270))
 {
 int tmp;
 tmp = *h;
@@ -1064,6 +1089,7 @@ list_connected_outputs (App *app, int *total_w, int *total_h)
 {
 int i, dummy;
 GList *result = NULL;
+ MateRROutputInfo **outputs;
 
 if (!total_w)
 total_w = &dummy;
@@ -1072,17 +1098,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)
- {
- MateOutputInfo *output = app->current_configuration->outputs[i];
 
- if (output->connected)
+ outputs = mate_rr_config_get_outputs(app->current_configuration);
+ for (i = 0; outputs[i] != NULL; ++i)
+ {
+ if (mate_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;
@@ -1128,7 +1154,7 @@ compute_scale (App *app)
 
 typedef struct Edge
 {
- MateOutputInfo *output;
+ MateRROutputInfo *output;
 int x1, y1;
 int x2, y2;
 } Edge;
@@ -1141,7 +1167,7 @@ typedef struct Snap
 } Snap;
 
 static void
-add_edge (MateOutputInfo *output, int x1, int y1, int x2, int y2, GArray *edges)
+add_edge (MateRROutputInfo *output, int x1, int y1, int x2, int y2, GArray *edges)
 {
 Edge e;
 
@@ -1155,13 +1181,11 @@ add_edge (MateOutputInfo *output, int x1, int y1, int x2, int y2, GArray *edges)
 }
 
 static void
-list_edges_for_output (MateOutputInfo *output, GArray *edges)
+list_edges_for_output (MateRROutputInfo *output, GArray *edges)
 {
 int x, y, w, h;
 
- x = output->x;
- y = output->y;
- get_geometry (output, &w, &h);
+ mate_rr_output_info_get_geometry (output, &x, &y, &w, &h);
 
 /* Top, Bottom, Left, Right */
 add_edge (output, x, y, x + w, y, edges);
@@ -1174,13 +1198,12 @@ static void
 list_edges (MateRRConfig *config, GArray *edges)
 {
 int i;
+ MateRROutputInfo **outputs = mate_rr_config_get_outputs (config);
 
- for (i = 0; config->outputs[i]; ++i)
+ for (i = 0; outputs[i]; ++i)
 {
- MateOutputInfo *output = config->outputs[i];
-
- if (output->connected)
- list_edges_for_output (output, edges);
+ if (mate_rr_output_info_is_connected (outputs[i]))
+ list_edges_for_output (outputs[i], edges);
 }
 }
 
@@ -1265,7 +1288,7 @@ add_edge_snaps (Edge *snapper, Edge *snappee, GArray *snaps)
 }
 
 static void
-list_snaps (MateOutputInfo *output, GArray *edges, GArray *snaps)
+list_snaps (MateRROutputInfo *output, GArray *edges, GArray *snaps)
 {
 int i;
 
@@ -1321,7 +1344,7 @@ edges_align (Edge *e1, Edge *e2)
 }
 
 static gboolean
-output_is_aligned (MateOutputInfo *output, GArray *edges)
+output_is_aligned (MateRROutputInfo *output, GArray *edges)
 {
 gboolean result = FALSE;
 int i;
@@ -1358,35 +1381,28 @@ done:
 }
 
 static void
-get_output_rect (MateOutputInfo *output, GdkRectangle *rect)
+get_output_rect (MateRROutputInfo *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;
+ mate_rr_output_info_get_geometry (output, &rect->x, &rect->y, &rect->width, &rect->height);
 }
 
 static gboolean
-output_overlaps (MateOutputInfo *output, MateRRConfig *config)
+output_overlaps (MateRROutputInfo *output, MateRRConfig *config)
 {
 int i;
 GdkRectangle output_rect;
+ MateRROutputInfo **outputs;
 
 get_output_rect (output, &output_rect);
 
- for (i = 0; config->outputs[i]; ++i)
+ outputs = mate_rr_config_get_outputs (config);
+ for (i = 0; outputs[i]; ++i)
 {
- MateOutputInfo *other = config->outputs[i];
-
- if (other != output && other->connected)
+ if (outputs[i] != output && mate_rr_output_info_is_connected (outputs[i]))
 {
 GdkRectangle other_rect;
 
- get_output_rect (other, &other_rect);
+ get_output_rect (outputs[i], &other_rect);
 if (gdk_rectangle_intersect (&output_rect, &other_rect, NULL))
 return TRUE;
 }
@@ -1400,17 +1416,17 @@ mate_rr_config_is_aligned (MateRRConfig *config, GArray *edges)
 {
 int i;
 gboolean result = TRUE;
+ MateRROutputInfo **outputs;
 
- for (i = 0; config->outputs[i]; ++i)
+ outputs = mate_rr_config_get_outputs(config);
+ for (i = 0; outputs[i]; ++i)
 {
- MateOutputInfo *output = config->outputs[i];
-
- if (output->connected)
+ if (mate_rr_output_info_is_connected (outputs[i]))
 {
- if (!output_is_aligned (output, edges))
+ if (!output_is_aligned (outputs[i], edges))
 return FALSE;
 
- if (output_overlaps (output, config))
+ if (output_overlaps (outputs[i], config))
 return FALSE;
 }
 }
@@ -1515,14 +1531,14 @@ on_output_event (FooScrollArea *area,
 FooScrollAreaEvent *event,
 gpointer data)
 {
- MateOutputInfo *output = data;
+ MateRROutputInfo *output = data;
 App *app = g_object_get_data (G_OBJECT (area), "app");
 
 /* If the mouse is inside the outputs, set the cursor to "you can move me". See
 * 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 (!mate_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)
@@ -1534,17 +1550,20 @@ on_output_event (FooScrollArea *area,
 rebuild_gui (app);
 set_monitors_tooltip (app, TRUE);
 
- if (!app->current_configuration->clone && get_n_connected (app) > 1)
+ if (!mate_rr_config_get_clone (app->current_configuration) && get_n_connected (app) > 1)
 {
+ int output_x, output_y;
+ mate_rr_output_info_get_geometry (output, &output_x, &output_y, NULL, NULL);
+
 foo_scroll_area_begin_grab (area, on_output_event, data);
 
 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;
+ info->output_x = output_x;
+ info->output_y = output_y;
 
- output->user_data = info;
+ g_object_set_data (G_OBJECT (output), "grab-info", info);
 }
 
 foo_scroll_area_invalidate (area);
@@ -1553,20 +1572,19 @@ on_output_event (FooScrollArea *area,
 {
 if (foo_scroll_area_is_grabbed (area))
 {
- GrabInfo *info = output->user_data;
+ 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;
+ mate_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;
+ mate_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));
@@ -1577,16 +1595,14 @@ on_output_event (FooScrollArea *area,
 
 g_array_sort (snaps, compare_snaps);
 
- output->x = info->output_x;
- output->y = info->output_y;
+ mate_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));
 
- output->x = new_x + snap->dx;
- output->y = new_y + snap->dy;
+ mate_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);
@@ -1598,8 +1614,7 @@ on_output_event (FooScrollArea *area,
 }
 else
 {
- output->x = info->output_x;
- output->y = info->output_y;
+ mate_rr_output_info_set_geometry (output, info->output_x, info->output_y, width, height);
 }
 }
 
@@ -1612,8 +1627,8 @@ on_output_event (FooScrollArea *area,
 foo_scroll_area_end_grab (area);
 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);
@@ -1639,22 +1654,27 @@ on_canvas_event (FooScrollArea *area,
 
 static PangoLayout *
 get_display_name (App *app,
- MateOutputInfo *output)
+ MateRROutputInfo *output)
 {
- const char *text;
-
- if (app->current_configuration->clone) {
- /* Translators: this is the feature where what you see on your laptop's
- * screen is the same as your external monitor. Here, "Mirror" is being
- * used as an adjective, not as a verb. For example, the Spanish
- * translation could be "Pantallas en Espejo", *not* "Espejar Pantallas".
- */
- text = _("Mirror Screens");
- } else
- text = output->display_name;
+ char *text;
+ PangoLayout * layout;
 
- return gtk_widget_create_pango_layout (
- GTK_WIDGET (app->area), text);
+ if (mate_rr_config_get_clone (app->current_configuration)) {
+ /* Translators: this is the feature where what you see on your laptop's
+ * screen is the same as your external monitor. Here, "Mirror" is being
+ * used as an adjective, not as a verb. For example, the Spanish
+ * translation could be "Pantallas en Espejo", *not* "Espejar Pantallas".
+ */
+ text = _("Mirror Screens");
+ } 
+ else {
+ text = g_strdup_printf ("<b>%s</b>\n<small>%s</small>", mate_rr_output_info_get_display_name (output), mate_rr_output_info_get_name (output));
+ }
+ layout = gtk_widget_create_pango_layout (GTK_WIDGET (app->area), text);
+ pango_layout_set_markup (layout, text, -1);
+ g_free (text);
+ pango_layout_set_alignment (layout, PANGO_ALIGN_CENTER);
+ return layout;
 }
 
 static void
@@ -1663,17 +1683,36 @@ paint_background (FooScrollArea *area,
 {
 GdkRectangle viewport;
 GtkWidget *widget;
+#if GTK_CHECK_VERSION (3, 0, 0)
+ GtkStyleContext *widget_style;
+ GdkRGBA *base_color = NULL;
+ GdkRGBA dark_color;
+#else
 GtkStyle *widget_style;
+#endif
 
 widget = GTK_WIDGET (area);
 
 foo_scroll_area_get_viewport (area, &viewport);
+
+#if GTK_CHECK_VERSION (3, 0, 0)
+ widget_style = gtk_widget_get_style_context (widget);
+#else
 widget_style = gtk_widget_get_style (widget);
+#endif
 
+#if GTK_CHECK_VERSION (3, 0, 0)
+ gtk_style_context_get (widget_style, GTK_STATE_FLAG_SELECTED,
+ GTK_STYLE_PROPERTY_BACKGROUND_COLOR, &base_color,
+ NULL);
+ gdk_cairo_set_source_rgba(cr, base_color);
+ gdk_rgba_free (base_color);
+#else
 cairo_set_source_rgb (cr,
 widget_style->base[GTK_STATE_SELECTED].red / 65535.0,
 widget_style->base[GTK_STATE_SELECTED].green / 65535.0,
 widget_style->base[GTK_STATE_SELECTED].blue / 65535.0);
+#endif
 
 cairo_rectangle (cr,
 viewport.x, viewport.y,
@@ -1683,10 +1722,15 @@ paint_background (FooScrollArea *area,
 
 foo_scroll_area_add_input_from_fill (area, cr, on_canvas_event, NULL);
 
+#if GTK_CHECK_VERSION (3, 0, 0)
+ mate_desktop_gtk_style_get_dark_color (widget_style, GTK_STATE_FLAG_SELECTED, &dark_color);
+ gdk_cairo_set_source_rgba (cr, &dark_color);
+#else
 cairo_set_source_rgb (cr,
 widget_style->dark[GTK_STATE_SELECTED].red / 65535.0,
 widget_style->dark[GTK_STATE_SELECTED].green / 65535.0,
 widget_style->dark[GTK_STATE_SELECTED].blue / 65535.0);
+#endif
 
 cairo_stroke (cr);
 }
@@ -1697,13 +1741,19 @@ paint_output (App *app, cairo_t *cr, int i)
 int w, h;
 double scale = compute_scale (app);
 double x, y;
+ int output_x, output_y;
+ MateRRRotation rotation;
 int total_w, total_h;
 GList *connected_outputs = list_connected_outputs (app, &total_w, &total_h);
- MateOutputInfo *output = g_list_nth (connected_outputs, i)->data;
+ MateRROutputInfo *output = g_list_nth_data (connected_outputs, i);
 PangoLayout *layout = get_display_name (app, output);
 PangoRectangle ink_extent, log_extent;
 GdkRectangle viewport;
+#if GTK_CHECK_VERSION (3, 0, 0)
+ GdkRGBA output_color;
+#else
 GdkColor output_color;
+#endif
 double r, g, b;
 double available_w;
 double factor;
@@ -1722,8 +1772,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;
+ mate_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);
@@ -1733,18 +1784,17 @@ paint_output (App *app, cairo_t *cr, int i)
 g_debug ("%f %f %f %f", x, y, w * scale + 0.5, h * scale + 0.5);
 #endif
 
- cairo_save (cr);
-
 cairo_translate (cr,
 x + (w * scale + 0.5) / 2,
 y + (h * scale + 0.5) / 2);
 
 /* rotation is already applied in get_geometry */
 
- if (output->rotation & MATE_RR_REFLECT_X)
+ rotation = mate_rr_output_info_get_rotation (output);
+ if (rotation & MATE_RR_REFLECT_X)
 cairo_scale (cr, -1, 1);
 
- if (output->rotation & MATE_RR_REFLECT_Y)
+ if (rotation & MATE_RR_REFLECT_Y)
 cairo_scale (cr, 1, -1);
 
 cairo_translate (cr,
@@ -1755,12 +1805,19 @@ paint_output (App *app, cairo_t *cr, int i)
 cairo_rectangle (cr, x, y, w * scale + 0.5, h * scale + 0.5);
 cairo_clip_preserve (cr);
 
+#if GTK_CHECK_VERSION (3, 0, 0)
+ mate_rr_labeler_get_rgba_for_output (app->labeler, output, &output_color);
+ r = output_color.red;
+ g = output_color.green;
+ b = output_color.blue;
+#else
 mate_rr_labeler_get_color_for_output (app->labeler, output, &output_color);
 r = output_color.red / 65535.0;
 g = output_color.green / 65535.0;
 b = output_color.blue / 65535.0;
+#endif
 
- if (!output->on)
+ if (!mate_rr_output_info_is_active (output))
 {
 /* If the output is turned off, just darken the selected color */
 r *= 0.2;
@@ -1791,7 +1848,7 @@ paint_output (App *app, cairo_t *cr, int i)
 cairo_stroke (cr);
 cairo_set_line_width (cr, 2);
 
- layout_set_font (layout, "Sans Bold 12");
+ layout_set_font (layout, "Sans 12");
 pango_layout_get_pixel_extents (layout, &ink_extent, &log_extent);
 
 available_w = w * scale + 0.5 - 6; /* Same as the inner rectangle's width, minus 1 pixel of padding on each side */
@@ -1806,7 +1863,7 @@ paint_output (App *app, cairo_t *cr, int i)
 
 cairo_scale (cr, factor, factor);
 
- if (output->on)
+ if (mate_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);
@@ -1818,12 +1875,19 @@ paint_output (App *app, cairo_t *cr, int i)
 g_object_unref (layout);
 }
 
+#if GTK_CHECK_VERSION (3, 0, 0)
+static void
+on_area_paint (FooScrollArea *area,
+ cairo_t *cr,
+ gpointer data)
+#else
 static void
 on_area_paint (FooScrollArea *area,
 cairo_t *cr,
 GdkRectangle *extent,
 GdkRegion *region,
 gpointer data)
+#endif
 {
 App *app = data;
 double scale;
@@ -1846,7 +1910,7 @@ on_area_paint (FooScrollArea *area,
 {
 paint_output (app, cr, g_list_position (connected_outputs, list));
 
- if (app->current_configuration->clone)
+ if (mate_rr_config_get_clone (app->current_configuration))
 break;
 }
 }
@@ -1889,19 +1953,19 @@ compute_virtual_size_for_configuration (MateRRConfig *config, int *ret_width, in
 {
 int i;
 int width, height;
+ int output_x, output_y, output_width, output_height;
+ MateRROutputInfo **outputs;
 
 width = height = 0;
 
- for (i = 0; config->outputs[i] != NULL; i++)
+ outputs = mate_rr_config_get_outputs (config);
+ for (i = 0; outputs[i] != NULL; i++)
 {
- MateOutputInfo *output;
-
- output = config->outputs[i];
-
- if (output->on)
+ if (mate_rr_output_info_is_active (outputs[i]))
 {
- width = MAX (width, output->x + output->width);
- height = MAX (height, output->y + output->height);
+ mate_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);
 }
 }
 
@@ -2000,15 +2064,15 @@ ensure_current_configuration_is_saved (void)
 * that there *will* be a backup file in the end.
 */
 
- rr_screen = mate_rr_screen_new (gdk_screen_get_default (), NULL, NULL, NULL); /* NULL-GError */
+ rr_screen = mate_rr_screen_new (gdk_screen_get_default (), NULL); /* NULL-GError */
 if (!rr_screen)
 return;
 
- rr_config = mate_rr_config_new_current (rr_screen);
+ rr_config = mate_rr_config_new_current (rr_screen, NULL);
 mate_rr_config_save (rr_config, NULL); /* NULL-GError */
 
- mate_rr_config_free (rr_config);
- mate_rr_screen_destroy (rr_screen);
+ g_object_unref (rr_config);
+ g_object_unref (rr_screen);
 }
 
 /* Callback for dbus_g_proxy_begin_call() */
@@ -2102,29 +2166,6 @@ apply (App *app)
 begin_version2_apply_configuration (app, gtk_widget_get_window (app->dialog), app->apply_button_clicked_timestamp);
 }
 
-#if 0
-/* Returns whether the graphics driver doesn't advertise RANDR 1.2 features, and just 1.0 */
-static gboolean
-driver_is_randr_10 (MateRRConfig *config)
-{
- /* In the Xorg code, see xserver/randr/rrinfo.c:RRScanOldConfig(). It gets
- * called when the graphics driver doesn't support RANDR 1.2 yet, just 1.0.
- * In that case, the X server's base code (which supports RANDR 1.2) will
- * simulate having a single output called "default". For drivers that *do*
- * support RANDR 1.2, the separate outputs will be named differently, we
- * hope.
- *
- * This heuristic is courtesy of Dirk Mueller <[email protected]>
- *
- * FIXME: however, we don't even check for XRRQueryVersion() returning 1.2, neither
- * here nor in mate-desktop/libmatedesktop*.c. Do we need to check for that,
- * or is mate_rr_screen_new()'s return value sufficient?
- */
-
- return (count_all_outputs (config) == 1 && strcmp (config->outputs[0]->name, "default") == 0);
-}
-#endif
-
 static void
 on_detect_displays (GtkWidget *widget, gpointer data)
 {
@@ -2140,6 +2181,24 @@ on_detect_displays (GtkWidget *widget, gpointer data)
 }
 }
 
+static void
+set_primary (GtkWidget *widget, gpointer data)
+{
+ App *app = data;
+ int i;
+ MateRROutputInfo **outputs;
+
+ if (!app->current_output)
+ return;
+
+ outputs = mate_rr_config_get_outputs (app->current_configuration);
+ for (i=0; outputs[i]!=NULL; i++) {
+ mate_rr_output_info_set_primary (outputs[i], outputs[i] == app->current_output);
+ }
+
+ gtk_widget_set_sensitive (app->primary_button, !mate_rr_output_info_get_primary(app->current_output));
+}
+
 #define MSD_XRANDR_SCHEMA "org.mate.SettingsDaemon.plugins.xrandr"
 #define SHOW_ICON_KEY "show-notification-icon"
 #define DEFAULT_CONFIGURATION_FILE_KEY "default-configuration-file"
@@ -2154,37 +2213,38 @@ on_show_icon_toggled (GtkWidget *widget, gpointer data)
 gtk_toggle_button_get_active (tb));
 }
 
-static MateOutputInfo *
+static MateRROutputInfo *
 get_nearest_output (MateRRConfig *configuration, int x, int y)
 {
 int i;
 int nearest_index;
 int nearest_dist;
+ MateRROutputInfo **outputs;
 
 nearest_index = -1;
 nearest_dist = G_MAXINT;
 
- for (i = 0; configuration->outputs[i] != NULL; i++)
+ outputs = mate_rr_config_get_outputs (configuration);
+ for (i = 0; outputs[i] != NULL; i++)
 {
- MateOutputInfo *output;
 int dist_x, dist_y;
+ int output_x, output_y, output_width, output_height;
 
- output = configuration->outputs[i];
-
- if (!(output->connected && output->on))
+ if (!(mate_rr_output_info_is_connected(outputs[i]) && mate_rr_output_info_is_active (outputs[i])))
 continue;
 
- if (x < output->x)
- dist_x = output->x - x;
- else if (x >= output->x + output->width)
- dist_x = x - (output->x + output->width) + 1;
+ mate_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;
 else
 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;
 
@@ -2196,7 +2256,7 @@ get_nearest_output (MateRRConfig *configuration, int x, int y)
 }
 
 if (nearest_index != -1)
- return configuration->outputs[nearest_index];
+ return outputs[nearest_index];
 else
 return NULL;
 
@@ -2205,13 +2265,14 @@ get_nearest_output (MateRRConfig *configuration, int x, int y)
 /* Gets the output that contains the largest intersection with the window.
 * Logic stolen from gdk_screen_get_monitor_at_window().
 */
-static MateOutputInfo *
+static MateRROutputInfo *
 get_output_for_window (MateRRConfig *configuration, GdkWindow *window)
 {
 GdkRectangle win_rect;
 int i;
 int largest_area;
 int largest_index;
+ MateRROutputInfo **outputs;
 
 #if GTK_CHECK_VERSION (3, 0, 0)
 gdk_window_get_geometry (window, &win_rect.x, &win_rect.y, &win_rect.width, &win_rect.height);
@@ -2223,19 +2284,14 @@ get_output_for_window (MateRRConfig *configuration, GdkWindow *window)
 largest_area = 0;
 largest_index = -1;
 
- for (i = 0; configuration->outputs[i] != NULL; i++)
+ outputs = mate_rr_config_get_outputs (configuration);
+ for (i = 0; outputs[i] != NULL; i++)
 {
- MateOutputInfo *output;
 GdkRectangle output_rect, intersection;
 
- output = configuration->outputs[i];
+ mate_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 (output->connected && gdk_rectangle_intersect (&win_rect, &output_rect, &intersection))
+ if (mate_rr_output_info_is_connected (outputs[i]) && gdk_rectangle_intersect (&win_rect, &output_rect, &intersection))
 {
 int area;
 
@@ -2249,7 +2305,7 @@ get_output_for_window (MateRRConfig *configuration, GdkWindow *window)
 }
 
 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,
@@ -2422,8 +2478,8 @@ run_application (App *app)
 return;
 }
 
- app->screen = mate_rr_screen_new (gdk_screen_get_default (),
- on_screen_changed, app, &error);
+ app->screen = mate_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);
@@ -2476,6 +2532,10 @@ run_application (App *app)
 g_signal_connect (_gtk_builder_get_widget (builder, "detect_displays_button"),
 "clicked", G_CALLBACK (on_detect_displays), app);
 
+ app->primary_button = _gtk_builder_get_widget (builder, "primary_button");
+
+ g_signal_connect (app->primary_button, "clicked", G_CALLBACK (set_primary), app);
+
 app->show_icon_checkbox = _gtk_builder_get_widget (builder,
 "show_notification_icon");
 
@@ -2553,7 +2613,7 @@ restart:
 }
 
 gtk_widget_destroy (app->dialog);
- mate_rr_screen_destroy (app->screen);
+ g_object_unref (app->screen);
 g_object_unref (app->settings);
 }