Bump the required GLib and GTK+ versions to latest stable.

We now require GLib >= 2.20 and GTK+ >= 2.16.  Also removed all
GLIB_CHECK_VERSION and GTK_CHECK_VERSION workarounds for older versions.

7 files changed, 2 insertions, 38 deletions

diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
index 6aefeecf9f..1ec93f8df1 100644
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ b/calendar/gui/alarm-notify/alarm-queue.c
@@ -55,10 +55,6 @@
 #include "e-util/e-popup.h"
 #include "e-util/e-error.h"
 
-#if !GTK_CHECK_VERSION(2,16,0)
-#define gtk_status_icon_set_tooltip_text gtk_status_icon_set_tooltip
-#endif
-
 #define d(x)
 
 /* The dialog with alarm nofications */
diff --git a/configure.in b/configure.in
index 39bafb3548..d46a1f1a45 100644
--- a/configure.in
+++ b/configure.in
@@ -21,8 +21,8 @@ EDS_PACKAGE=1.2
 GTKHTML_PACKAGE=3.14
 
 # Required Packages
-m4_define([glib_minimum_version], [2.18.0])
-m4_define([gtk_minimum_version], [2.14.0])
+m4_define([glib_minimum_version], [2.20.0])
+m4_define([gtk_minimum_version], [2.16.0])
 m4_define([eds_minimum_version], [evo_version])
 m4_define([gnome_icon_theme_minimum_version], [2.19.91])
 m4_define([libbonobo_minimum_version], [2.20.3])
diff --git a/mail/e-mail-attachment-bar.c b/mail/e-mail-attachment-bar.c
index d3432ca9cd..92fc8272f7 100644
--- a/mail/e-mail-attachment-bar.c
+++ b/mail/e-mail-attachment-bar.c
@@ -106,9 +106,7 @@ mail_attachment_bar_update_status (EMailAttachmentBar *bar)
 	gchar *display_size;
 	gchar *markup;
 
-#if GTK_CHECK_VERSION(2,16,0)
 	GtkActivatable *activatable;
-#endif
 
 	view = E_ATTACHMENT_VIEW (bar);
 	store = e_attachment_view_get_store (view);
@@ -126,20 +124,12 @@ mail_attachment_bar_update_status (EMailAttachmentBar *bar)
 	gtk_label_set_markup (label, markup);
 	g_free (markup);
 
-#if GTK_CHECK_VERSION(2,16,0)
 	activatable = GTK_ACTIVATABLE (bar->priv->save_all_button);
 	action = gtk_activatable_get_related_action (activatable);
-#else
-	action = e_attachment_view_get_action (view, "save-all");
-#endif
 	gtk_action_set_visible (action, (num_attachments > 1));
 
-#if GTK_CHECK_VERSION(2,16,0)
 	activatable = GTK_ACTIVATABLE (bar->priv->save_one_button);
 	action = gtk_activatable_get_related_action (activatable);
-#else
-	action = e_attachment_view_get_action (view, "save-one");
-#endif
 	gtk_action_set_visible (action, (num_attachments == 1));
 
 	g_free (display_size);
@@ -599,11 +589,7 @@ mail_attachment_bar_init (EMailAttachmentBar *bar)
 	view = E_ATTACHMENT_VIEW (bar->priv->icon_view);
 	action = e_attachment_view_get_action (view, "save-all");
 	gtk_button_set_image (GTK_BUTTON (widget), gtk_image_new ());
-#if GTK_CHECK_VERSION(2,16,0)
 	gtk_activatable_set_related_action (GTK_ACTIVATABLE (widget), action);
-#else
-	gtk_action_connect_proxy (action, widget);  /* XXX Deprecated */
-#endif
 	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
 	bar->priv->save_all_button = g_object_ref (widget);
 	gtk_widget_show (widget);
@@ -613,11 +599,7 @@ mail_attachment_bar_init (EMailAttachmentBar *bar)
 	view = E_ATTACHMENT_VIEW (bar->priv->icon_view);
 	action = e_attachment_view_get_action (view, "save-one");
 	gtk_button_set_image (GTK_BUTTON (widget), gtk_image_new ());
-#if GTK_CHECK_VERSION(2,16,0)
 	gtk_activatable_set_related_action (GTK_ACTIVATABLE (widget), action);
-#else
-	gtk_action_connect_proxy (action, widget);  /* XXX Deprecated */
-#endif
 	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
 	bar->priv->save_one_button = g_object_ref (widget);
 	gtk_widget_show (widget);
diff --git a/plugins/mail-notification/mail-notification.c b/plugins/mail-notification/mail-notification.c
index 89f9daaccb..e7d0f2f898 100644
--- a/plugins/mail-notification/mail-notification.c
+++ b/plugins/mail-notification/mail-notification.c
@@ -54,10 +54,6 @@
 #define GCONF_KEY_ENABLED_STATUS 	GCONF_KEY_ROOT "status-enabled"
 #define GCONF_KEY_ENABLED_SOUND	 	GCONF_KEY_ROOT "sound-enabled"
 
-#if !GTK_CHECK_VERSION(2,16,0)
-#define gtk_status_icon_set_tooltip_text gtk_status_icon_set_tooltip
-#endif
-
 static gboolean enabled = FALSE;
 static GtkWidget *get_cfg_widget (void);
 static GStaticMutex mlock = G_STATIC_MUTEX_INIT;
diff --git a/widgets/misc/e-attachment-paned.c b/widgets/misc/e-attachment-paned.c
index 853ff48cb2..3fed031473 100644
--- a/widgets/misc/e-attachment-paned.c
+++ b/widgets/misc/e-attachment-paned.c
@@ -590,11 +590,7 @@ attachment_paned_init (EAttachmentPaned *paned)
 	view = E_ATTACHMENT_VIEW (paned->priv->icon_view);
 	action = e_attachment_view_get_action (view, "add");
 	gtk_button_set_image (GTK_BUTTON (widget), gtk_image_new ());
-#if GTK_CHECK_VERSION(2,16,0)
 	gtk_activatable_set_related_action (GTK_ACTIVATABLE (widget), action);
-#else
-	gtk_action_connect_proxy (action, widget);  /* XXX Deprecated */
-#endif
 	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
 	gtk_widget_show (widget);
 
diff --git a/widgets/misc/e-attachment-view.c b/widgets/misc/e-attachment-view.c
index 53f719c787..2ad34d6751 100644
--- a/widgets/misc/e-attachment-view.c
+++ b/widgets/misc/e-attachment-view.c
@@ -650,9 +650,7 @@ attachment_view_update_actions (EAttachmentView *view)
 		action = gtk_action_new (
 			action_name, action_label, action_tooltip, NULL);
 
-#if GTK_CHECK_VERSION(2,16,0)
 		gtk_action_set_gicon (action, app_icon);
-#endif
 
 		g_object_set_data_full (
 			G_OBJECT (action),
diff --git a/widgets/misc/e-attachment.c b/widgets/misc/e-attachment.c
index f472a26ff3..537a3470d7 100644
--- a/widgets/misc/e-attachment.c
+++ b/widgets/misc/e-attachment.c
@@ -2534,11 +2534,7 @@ attachment_save_query_info_cb (GFile *destination,
 replace:
 	g_file_replace_async (
 		destination, NULL, FALSE,
-#if GLIB_CHECK_VERSION(2,20,0)
 		G_FILE_CREATE_REPLACE_DESTINATION,
-#else
-		G_FILE_CREATE_NONE,
-#endif
 		G_PRIORITY_DEFAULT, cancellable,
 		(GAsyncReadyCallback) attachment_save_replace_cb,
 		save_context);