[gnome-control-center] display: Separate interlaced from normal modes

[Rui Matos <rtcm src gnome org>]

commit e9b70c2efae48fb956d58e72b631b070fb2eba2a
Author: Rui Matos <tiagomatos gmail com>
Date:   Tue Apr 21 19:22:09 2015 +0200

    display: Separate interlaced from normal modes
    
    https://bugzilla.gnome.org/show_bug.cgi?id=763833

 configure.ac                      |    2 +-
 panels/display/cc-display-panel.c |    5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 4596d07..cc17a4b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -96,7 +96,7 @@ NETWORK_MANAGER_REQUIRED_VERSION=0.9.8
 NETWORK_MANAGER_APPLET_REQUIRED_VERSION=0.9.7.995
 MODEM_MANAGER_REQUIRED_VERSION=0.7
 LIBNOTIFY_REQUIRED_VERSION=0.7.3
-GNOME_DESKTOP_REQUIRED_VERSION=3.19.93
+GNOME_DESKTOP_REQUIRED_VERSION=3.21.2
 SCHEMAS_REQUIRED_VERSION=3.19.3
 LIBWACOM_REQUIRED_VERSION=0.7
 CLUTTER_REQUIRED_VERSION=1.11.3
diff --git a/panels/display/cc-display-panel.c b/panels/display/cc-display-panel.c
index 2312b17..bb9dedc 100644
--- a/panels/display/cc-display-panel.c
+++ b/panels/display/cc-display-panel.c
@@ -1661,11 +1661,12 @@ make_resolution_string (GnomeRRMode *mode)
   gint width = gnome_rr_mode_get_width (mode);
   gint height = gnome_rr_mode_get_height (mode);
   const char *aspect = make_aspect_string (width, height);
+  const char *interlaced = gnome_rr_mode_get_is_interlaced (mode) ? "i" : "";
 
   if (aspect != NULL)
-    return g_strdup_printf ("%d × %d (%s)", width, height, aspect);
+    return g_strdup_printf ("%d × %d%s (%s)", width, height, interlaced, aspect);
   else
-    return g_strdup_printf ("%d × %d", width, height);
+    return g_strdup_printf ("%d × %d%s", width, height, interlaced);
 }
 
 static GtkWidget *