ATRIL BACKPORTS: PART 1 OF "move to GTK+3 (>= 3.14), drop GTK+2 code and --with-gtk build option"

We split the commit below into several parts. This is part 1.
  - Clean up cut-n-paste code from GTK2 leftovers
  - Move to GTK+3 requirement in configure.ac >= 3.14

commit ae5f4711a21508a70d7123dbc0efb610af1289a2
Author: monsta <[email protected]>
Date:   Wed Nov 23 18:15:54 2016 +0300

    move to GTK+3 (>= 3.14), drop GTK+2 code and --with-gtk build option

    and require caja >= 1.17.1

Author: Moser Peter

configure.ac

@@ -85,20 +85,18 @@ GLIB_GSETTINGS
 dnl Specify required versions of dependencies
 CAIRO_REQUIRED=1.14.0
 GLIB_REQUIRED=2.36.0
-LIBSECRET_REQUIRED=0.5
-MATEDESKTOP_REQUIRED=1.9.0
 GTK_API_VERSION=3.0
 WEBKIT_API_VERSION=4.0
 GAIL_API_VERSION=-3.0
-GTK_REQUIRED=3.10.0
+GTK_REQUIRED=3.14.0
 WEBKIT_REQUIRED=2.4.3
+LIBSECRET_REQUIRED=0.5
+LIBXML_REQUIRED=2.5.0
 
 AC_SUBST([GLIB_REQUIRED])
 AC_SUBST([GTK_REQUIRED])
 AC_SUBST([GTK_API_VERSION])
 
-LIBXML_REQUIRED=2.5.0
-
 dnl Check dependencies
 
 # LIB_CFLAGS       for helpers and generic widgets. (libdocument, cut-and-paste)
@@ -146,7 +144,6 @@ AC_SUBST([SMCLIENT_LIBS])
 BACKEND_LIBTOOL_FLAGS="-module -avoid-version -no-undefined -export-symbols \$(top_srcdir)/backend/backend.symbols"
 AC_SUBST(BACKEND_LIBTOOL_FLAGS)
 
-
 # ******************
 # GKT+ Unix Printing
 # ******************

cut-n-paste/gimpcellrenderertoggle/gimpcellrenderertoggle.c

@@ -25,17 +25,8 @@
 #include "gimpwidgetsmarshal.h"
 #include "gimpcellrenderertoggle.h"
 
-
 #define DEFAULT_ICON_SIZE  GTK_ICON_SIZE_BUTTON
 
-#if GTK_CHECK_VERSION (3, 0, 0)
-#define GTK_STATE_INSENSITIVE GTK_STATE_FLAG_INSENSITIVE
-#define GTK_STATE_SELECTED GTK_STATE_FLAG_SELECTED
-#define GTK_STATE_ACTIVE GTK_STATE_FLAG_ACTIVE
-#define GTK_STATE_NORMAL 0
-#define gtk_widget_render_icon(A,B,C,D) gtk_widget_render_icon_pixbuf(A,B,C)
-#endif
-
 enum
 {
   CLICKED,
@@ -281,10 +272,6 @@ gimp_cell_renderer_toggle_get_size (GtkCellRenderer *cell,
     }
 }
 
-#if GTK_CHECK_VERSION (3, 0, 0)
-#define gimp_cell_renderer_toggle_get_size gtk_cell_renderer_get_size
-#endif
-
 static void
 gimp_cell_renderer_toggle_render (GtkCellRenderer      *cell,
                                   cairo_t              *cr,
@@ -314,7 +301,7 @@ gimp_cell_renderer_toggle_render (GtkCellRenderer      *cell,
       return;
     }
 
-  gimp_cell_renderer_toggle_get_size (cell, widget, cell_area,
+  gtk_cell_renderer_get_size (cell, widget, cell_area,
                                       &toggle_rect.x,
                                       &toggle_rect.y,
                                       &toggle_rect.width,
@@ -334,21 +321,21 @@ gimp_cell_renderer_toggle_render (GtkCellRenderer      *cell,
 
   if (!gtk_cell_renderer_get_sensitive (cell))
     {
-      state = GTK_STATE_INSENSITIVE;
+      state = GTK_STATE_FLAG_INSENSITIVE;
     }
   else if ((flags & GTK_CELL_RENDERER_SELECTED) == GTK_CELL_RENDERER_SELECTED)
     {
       if (gtk_widget_has_focus (widget))
-        state = GTK_STATE_SELECTED;
+        state = GTK_STATE_FLAG_SELECTED;
       else
-        state = GTK_STATE_ACTIVE;
+        state = GTK_STATE_FLAG_ACTIVE;
     }
   else
     {
       if (gtk_cell_renderer_toggle_get_activatable (GTK_CELL_RENDERER_TOGGLE (cell)))
-        state = GTK_STATE_NORMAL;
+        state = GTK_STATE_FLAG_NORMAL;
       else
-        state = GTK_STATE_INSENSITIVE;
+        state = GTK_STATE_FLAG_INSENSITIVE;
     }
 
   if ((flags & GTK_CELL_RENDERER_PRELIT) &&
@@ -460,12 +447,11 @@ gimp_cell_renderer_toggle_create_pixbuf (GimpCellRendererToggle *toggle,
   if (toggle->pixbuf)
     g_object_unref (toggle->pixbuf);
 
-  toggle->pixbuf = gtk_widget_render_icon (widget,
+  toggle->pixbuf = gtk_widget_render_icon_pixbuf (widget,
                                            toggle->stock_id,
-                                           toggle->stock_size, NULL);
+                                                  toggle->stock_size);
 }
 
-
 /**
  * gimp_cell_renderer_toggle_new:
  * @stock_id: the stock_id of the icon to use for the active state

xreader-document.pc.in

@@ -5,7 +5,7 @@ includedir=@includedir@/xreader/@EV_API_VERSION@
 backenddir=@libdir@/xreader/@EV_BINARY_VERSION@/backends
 
 Name: Xreader Document
-Description: MATE document viewer backend library
+Description: Xreader document viewer backend library
 Version: @VERSION@
 Requires: gio-2.0 >= @GLIB_REQUIRED@ gtk+-@GTK_API_VERSION@ >= @GTK_REQUIRED@
 Libs: -L${libdir} -lxreaderdocument