[gnome-software] Require gtk+ 3.20.0

[Kalev Lember <klember src gnome org>]

commit f4072dcce19825446f2bba18dea9ab9ea11c019d
Author: Kalev Lember <klember redhat com>
Date:   Wed Aug 31 16:06:25 2016 +0200

    Require gtk+ 3.20.0
    
    Commit 6ec2f87 already dropped support for gtk+ 3.18; this commit bumps
    the required version as well and drops leftover ifdefs.

 configure.ac          |    2 +-
 src/gs-summary-tile.c |   10 ----------
 2 files changed, 1 insertions(+), 11 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index b561c6e..9222ed9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -83,7 +83,7 @@ GLIB_GSETTINGS
 dnl ---------------------------------------------------------------------------
 dnl - Check library dependencies
 dnl ---------------------------------------------------------------------------
-PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.18.2 gio-unix-2.0)
+PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.20.0 gio-unix-2.0)
 PKG_CHECK_MODULES(APPSTREAM, appstream-glib >= 0.6.1)
 PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0 >= 2.31.5)
 PKG_CHECK_MODULES(JSON_GLIB, json-glib-1.0 >= 1.1.1)
diff --git a/src/gs-summary-tile.c b/src/gs-summary-tile.c
index 7c22672..59fb120 100644
--- a/src/gs-summary-tile.c
+++ b/src/gs-summary-tile.c
@@ -228,11 +228,7 @@ static void
 gs_app_get_preferred_width (GtkWidget *widget,
                            gint *min, gint *nat)
 {
-#if GTK_CHECK_VERSION(3,20,0)
        gint m;
-#else
-       gint m, n;
-#endif
        GsSummaryTile *app_tile = GS_SUMMARY_TILE (widget);
 
        if (app_tile->preferred_width < 0) {
@@ -241,13 +237,7 @@ gs_app_get_preferred_width (GtkWidget *widget,
                return;
        }
 
-       /* It's because of some bugs in gtkbutton.c 3.18 and before.
-        * We can remove this when we branch for 3.20 *and* require GTK 3.20. */
-#if GTK_CHECK_VERSION(3,20,0)
        GTK_WIDGET_CLASS (gs_summary_tile_parent_class)->get_preferred_width (widget, &m, NULL);
-#else
-       GTK_WIDGET_CLASS (gs_summary_tile_parent_class)->get_preferred_width (widget, &m, &n);
-#endif
 
        if (min != NULL)
                *min = m;