require GTK+ 3.22 and GLib 2.50

14 files changed, 4 insertions, 157 deletions

diff --git a/configure.ac b/configure.ac
index ceba3390..d134198d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -48,10 +48,6 @@ dnl toolbar style for GSettings schemas
 TOOLBAR_STYLE="PLUMA_TOOLBAR_SYSTEM"
 AC_SUBST(TOOLBAR_STYLE)
 
-# GLib min/max required versions
-AC_DEFINE([GLIB_VERSION_MIN_REQUIRED], [GLIB_VERSION_2_36],
-	[Warn on use of APIs deprecated before GLib 2.36])
-
 dnl ===============================================================
 dnl Expanded dirs
 dnl ===============================================================
@@ -146,16 +142,16 @@ fi
 
 AM_CONDITIONAL(ENABLE_ENCHANT, test x"$enable_enchant" = "xyes")
 
-GTK_REQUIRED=3.14.0
+GTK_REQUIRED=3.22.0
 GTKSOURCEVIEW_REQUIRED=3.0.0
 
 PKG_CHECK_MODULES(GMODULE,gmodule-2.0,[GMODULE_ADD="gmodule-2.0"],[GMODULE_ADD=""])
 PKG_CHECK_MODULES(PLUMA, [
 	libxml-2.0 >= 2.5.0
-	glib-2.0 >= 2.36.0
+	glib-2.0 >= 2.50.0
 	$GMODULE_ADD
 	gthread-2.0 >= 2.13.0
-	gio-2.0 >= 2.37.0
+	gio-2.0 >= 2.50.0
 	gtk+-3.0 >= $GTK_REQUIRED
 	gtksourceview-3.0 >= $GTKSOURCEVIEW_REQUIRED
 	libpeas-1.0 >= 1.2.0
diff --git a/plugins/filebrowser/pluma-file-browser-widget.c b/plugins/filebrowser/pluma-file-browser-widget.c
index 4d0ce488..46087bbf 100644
--- a/plugins/filebrowser/pluma-file-browser-widget.c
+++ b/plugins/filebrowser/pluma-file-browser-widget.c
@@ -2473,11 +2473,7 @@ directory_open (PlumaFileBrowserWidget *obj,
 	if (FILE_IS_DIR (flags)) {
 		result = TRUE;
 
-#if GTK_CHECK_VERSION (3, 22, 0)
 		if (!gtk_show_uri_on_window (NULL, uri, GDK_CURRENT_TIME, &error)) {
-#else
-		if (!gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (obj)), uri, GDK_CURRENT_TIME, &error)) {
-#endif
 			g_signal_emit (obj, signals[ERROR], 0,
 				       PLUMA_FILE_BROWSER_ERROR_OPEN_DIRECTORY,
 				       error->message);
diff --git a/plugins/spell/pluma-automatic-spell-checker.c b/plugins/spell/pluma-automatic-spell-checker.c
index 95a83d5f..76d4be96 100644
--- a/plugins/spell/pluma-automatic-spell-checker.c
+++ b/plugins/spell/pluma-automatic-spell-checker.c
@@ -454,11 +454,7 @@ build_suggestion_menu (PlumaAutomaticSpellChecker *spell, const gchar *word)
 			
 			label = gtk_label_new (label_text);
 			gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
-#if GTK_CHECK_VERSION (3, 16, 0)
 			gtk_label_set_xalign (GTK_LABEL (label), 0.0);
-#else
-			gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-#endif
 
 			mi = gtk_menu_item_new ();
 			gtk_container_add (GTK_CONTAINER(mi), label);
diff --git a/pluma/dialogs/pluma-close-confirmation-dialog.c b/pluma/dialogs/pluma-close-confirmation-dialog.c
index 9eca2c2c..8cf67e63 100644
--- a/pluma/dialogs/pluma-close-confirmation-dialog.c
+++ b/pluma/dialogs/pluma-close-confirmation-dialog.c
@@ -506,11 +506,7 @@ build_single_doc_dialog (PlumaCloseConfirmationDialog *dlg)
 	primary_label = gtk_label_new (NULL);
 	gtk_label_set_line_wrap (GTK_LABEL (primary_label), TRUE);
 	gtk_label_set_use_markup (GTK_LABEL (primary_label), TRUE);
-#if GTK_CHECK_VERSION (3, 16, 0)
 	gtk_label_set_xalign (GTK_LABEL (primary_label), 0.0);
-#else
-	gtk_misc_set_alignment (GTK_MISC (primary_label), 0.0, 0.5);
-#endif
 	gtk_label_set_selectable (GTK_LABEL (primary_label), TRUE);
 	gtk_widget_set_can_focus (GTK_WIDGET (primary_label), FALSE);
 	gtk_label_set_max_width_chars (GTK_LABEL (primary_label), 72);
@@ -544,11 +540,7 @@ build_single_doc_dialog (PlumaCloseConfirmationDialog *dlg)
 	secondary_label = gtk_label_new (str);
 	g_free (str);
 	gtk_label_set_line_wrap (GTK_LABEL (secondary_label), TRUE);
-#if GTK_CHECK_VERSION (3, 16, 0)
 	gtk_label_set_xalign (GTK_LABEL (secondary_label), 0.0);
-#else
-	gtk_misc_set_alignment (GTK_MISC (secondary_label), 0.0, 0.5);
-#endif
 	gtk_label_set_selectable (GTK_LABEL (secondary_label), TRUE);
 	gtk_widget_set_can_focus (GTK_WIDGET (secondary_label), FALSE);
 	gtk_label_set_max_width_chars (GTK_LABEL (secondary_label), 72);
@@ -706,11 +698,7 @@ build_multiple_docs_dialog (PlumaCloseConfirmationDialog *dlg)
 	primary_label = gtk_label_new (NULL);
 	gtk_label_set_line_wrap (GTK_LABEL (primary_label), TRUE);
 	gtk_label_set_use_markup (GTK_LABEL (primary_label), TRUE);
-#if GTK_CHECK_VERSION (3, 16, 0)
 	gtk_label_set_xalign (GTK_LABEL (primary_label), 0.0);
-#else
-	gtk_misc_set_alignment (GTK_MISC (primary_label), 0.0, 0.5);
-#endif
 	gtk_label_set_selectable (GTK_LABEL (primary_label), TRUE);
 	gtk_widget_set_can_focus (GTK_WIDGET (primary_label), FALSE);
 	gtk_label_set_max_width_chars (GTK_LABEL (primary_label), 72);
@@ -748,11 +736,7 @@ build_multiple_docs_dialog (PlumaCloseConfirmationDialog *dlg)
 	gtk_box_pack_start (GTK_BOX (vbox2), select_label, FALSE, FALSE, 0);
 	gtk_label_set_line_wrap (GTK_LABEL (select_label), TRUE);
 	gtk_label_set_max_width_chars (GTK_LABEL (select_label), 72);
-#if GTK_CHECK_VERSION (3, 16, 0)
 	gtk_label_set_xalign (GTK_LABEL (select_label), 0.0);
-#else
-	gtk_misc_set_alignment (GTK_MISC (select_label), 0.0, 0.5);
-#endif
 	gtk_label_set_selectable (GTK_LABEL (select_label), TRUE);
 	gtk_widget_set_can_focus (GTK_WIDGET (select_label), FALSE);
 
@@ -776,11 +760,7 @@ build_multiple_docs_dialog (PlumaCloseConfirmationDialog *dlg)
 
 	gtk_box_pack_start (GTK_BOX (vbox2), secondary_label, FALSE, FALSE, 0);
 	gtk_label_set_line_wrap (GTK_LABEL (secondary_label), TRUE);
-#if GTK_CHECK_VERSION (3, 16, 0)
 	gtk_label_set_xalign (GTK_LABEL (secondary_label), 0.0);
-#else
-	gtk_misc_set_alignment (GTK_MISC (secondary_label), 0.0, 0.5);
-#endif
 	gtk_label_set_selectable (GTK_LABEL (secondary_label), TRUE);
 	gtk_widget_set_can_focus (GTK_WIDGET (secondary_label), FALSE);
 	gtk_label_set_max_width_chars (GTK_LABEL (secondary_label), 72);
diff --git a/pluma/pluma-close-button.c b/pluma/pluma-close-button.c
index b3bf036b..16148f99 100644
--- a/pluma/pluma-close-button.c
+++ b/pluma/pluma-close-button.c
@@ -37,13 +37,6 @@ pluma_close_button_init (PlumaCloseButton *button)
 	GError *error = NULL;
 	const gchar button_style[] =
 		"* {\n"
-#if !GTK_CHECK_VERSION (3, 20, 0)
-		"	-GtkButton-default-border : 0;\n"
-		"	-GtkButton-default-outside-border : 0;\n"
-		"	-GtkButton-inner-border: 0;\n"
-		"	-GtkWidget-focus-line-width : 0;\n"
-		"	-GtkWidget-focus-padding : 0;\n"
-#endif
 		"	padding: 0;\n"
 		"}";
 
diff --git a/pluma/pluma-document.c b/pluma/pluma-document.c
index 40cbfd43..9364ef1d 100644
--- a/pluma/pluma-document.c
+++ b/pluma/pluma-document.c
@@ -2419,11 +2419,7 @@ search_region (PlumaDocument *doc,
 	gtk_text_iter_forward_lines (end, doc->priv->num_of_lines_search_text);
 
 	if (gtk_text_iter_has_tag (start, doc->priv->found_tag) &&
-#if GTK_CHECK_VERSION (3, 20, 0)
 	    !gtk_text_iter_starts_tag (start, doc->priv->found_tag))
-#else
-	    !gtk_text_iter_begins_tag (start, doc->priv->found_tag))
-#endif
 		gtk_text_iter_backward_to_tag_toggle (start, doc->priv->found_tag);
 
 	if (gtk_text_iter_has_tag (end, doc->priv->found_tag) &&
diff --git a/pluma/pluma-file-chooser-dialog.c b/pluma/pluma-file-chooser-dialog.c
index 76c11d8a..9e6a855b 100644
--- a/pluma/pluma-file-chooser-dialog.c
+++ b/pluma/pluma-file-chooser-dialog.c
@@ -80,11 +80,7 @@ create_option_menu (PlumaFileChooserDialog *dialog)
 	GtkWidget *menu;
 
 	label = gtk_label_new_with_mnemonic (_("C_haracter Encoding:"));
-#if GTK_CHECK_VERSION (3, 16, 0)
 	gtk_label_set_xalign (GTK_LABEL (label), 0.0);
-#else
-	gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
-#endif
 
 	menu = pluma_encodings_combo_box_new (
 		gtk_file_chooser_get_action (GTK_FILE_CHOOSER (dialog)) == GTK_FILE_CHOOSER_ACTION_SAVE);
@@ -149,11 +145,7 @@ create_newline_combo (PlumaFileChooserDialog *dialog)
 	GtkTreeIter iter;
 
 	label = gtk_label_new_with_mnemonic (_("L_ine Ending:"));
-#if GTK_CHECK_VERSION (3, 16, 0)
 	gtk_label_set_xalign (GTK_LABEL (label), 0.0);
-#else
-	gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
-#endif
 
 	store = gtk_list_store_new (2, G_TYPE_STRING, PLUMA_TYPE_DOCUMENT_NEWLINE_TYPE);
 	combo = gtk_combo_box_new_with_model (GTK_TREE_MODEL (store));
diff --git a/pluma/pluma-help.c b/pluma/pluma-help.c
index 3e5c2749..9a764f8c 100644
--- a/pluma/pluma-help.c
+++ b/pluma/pluma-help.c
@@ -63,17 +63,10 @@ pluma_help_display (GtkWindow   *parent,
 	else
 		link = g_strdup_printf ("help:%s", name);
 
-#if GTK_CHECK_VERSION (3, 22, 0)
 	ret = gtk_show_uri_on_window (parent,
 	                              link,
 	                              GDK_CURRENT_TIME,
 	                              &error);
-#else
-	ret = gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (parent)),
-	                    link,
-	                    GDK_CURRENT_TIME,
-	                    &error);
-#endif
 
 	g_free (link);
 
diff --git a/pluma/pluma-io-error-message-area.c b/pluma/pluma-io-error-message-area.c
index 5d519fb6..3d2451a0 100644
--- a/pluma/pluma-io-error-message-area.c
+++ b/pluma/pluma-io-error-message-area.c
@@ -133,11 +133,7 @@ set_message_area_text_and_icon (GtkWidget   *message_area,
 	gtk_box_pack_start (GTK_BOX (vbox), primary_label, TRUE, TRUE, 0);
 	gtk_label_set_use_markup (GTK_LABEL (primary_label), TRUE);
 	gtk_label_set_line_wrap (GTK_LABEL (primary_label), TRUE);
-#if GTK_CHECK_VERSION (3, 16, 0)
 	gtk_label_set_xalign (GTK_LABEL (primary_label), 0.0);
-#else
-	gtk_misc_set_alignment (GTK_MISC (primary_label), 0.0, 0.5);
-#endif
 	gtk_widget_set_can_focus (primary_label, TRUE);
 	gtk_label_set_selectable (GTK_LABEL (primary_label), TRUE);
 
@@ -152,11 +148,7 @@ set_message_area_text_and_icon (GtkWidget   *message_area,
 		gtk_label_set_use_markup (GTK_LABEL (secondary_label), TRUE);
 		gtk_label_set_line_wrap (GTK_LABEL (secondary_label), TRUE);
 		gtk_label_set_selectable (GTK_LABEL (secondary_label), TRUE);
-#if GTK_CHECK_VERSION (3, 16, 0)
 		gtk_label_set_xalign (GTK_LABEL (secondary_label), 0.0);
-#else
-		gtk_misc_set_alignment (GTK_MISC (secondary_label), 0.0, 0.5);
-#endif
 	}
 
 	gtk_widget_show_all (hbox_content);
@@ -530,11 +522,7 @@ create_conversion_error_message_area (const gchar *primary_text,
 	gtk_box_pack_start (GTK_BOX (vbox), primary_label, TRUE, TRUE, 0);
 	gtk_label_set_use_markup (GTK_LABEL (primary_label), TRUE);
 	gtk_label_set_line_wrap (GTK_LABEL (primary_label), TRUE);
-#if GTK_CHECK_VERSION (3, 16, 0)
 	gtk_label_set_xalign (GTK_LABEL (primary_label), 0.0);
-#else
-	gtk_misc_set_alignment (GTK_MISC (primary_label), 0.0, 0.5);
-#endif
 	gtk_widget_set_can_focus (primary_label, TRUE);
 	gtk_label_set_selectable (GTK_LABEL (primary_label), TRUE);
 
@@ -549,11 +537,7 @@ create_conversion_error_message_area (const gchar *primary_text,
 		gtk_label_set_use_markup (GTK_LABEL (secondary_label), TRUE);
 		gtk_label_set_line_wrap (GTK_LABEL (secondary_label), TRUE);
 		gtk_label_set_selectable (GTK_LABEL (secondary_label), TRUE);
-#if GTK_CHECK_VERSION (3, 16, 0)
 		gtk_label_set_xalign (GTK_LABEL (secondary_label), 0.0);
-#else
-		gtk_misc_set_alignment (GTK_MISC (secondary_label), 0.0, 0.5);
-#endif
 	}
 
 	create_combo_box (message_area, vbox);
@@ -808,11 +792,7 @@ pluma_file_already_open_warning_message_area_new (const gchar *uri)
 	gtk_box_pack_start (GTK_BOX (vbox), primary_label, TRUE, TRUE, 0);
 	gtk_label_set_use_markup (GTK_LABEL (primary_label), TRUE);
 	gtk_label_set_line_wrap (GTK_LABEL (primary_label), TRUE);
-#if GTK_CHECK_VERSION (3, 16, 0)
 	gtk_label_set_xalign (GTK_LABEL (primary_label), 0.0);
-#else
-	gtk_misc_set_alignment (GTK_MISC (primary_label), 0.0, 0.5);
-#endif
 	gtk_widget_set_can_focus (primary_label, TRUE);
 	gtk_label_set_selectable (GTK_LABEL (primary_label), TRUE);
 
@@ -827,11 +807,7 @@ pluma_file_already_open_warning_message_area_new (const gchar *uri)
 	gtk_label_set_use_markup (GTK_LABEL (secondary_label), TRUE);
 	gtk_label_set_line_wrap (GTK_LABEL (secondary_label), TRUE);
 	gtk_label_set_selectable (GTK_LABEL (secondary_label), TRUE);
-#if GTK_CHECK_VERSION (3, 16, 0)
 	gtk_label_set_xalign (GTK_LABEL (secondary_label), 0.0);
-#else
-	gtk_misc_set_alignment (GTK_MISC (secondary_label), 0.0, 0.5);
-#endif
 
 	gtk_widget_show_all (hbox_content);
 	set_contents (message_area, hbox_content);
@@ -912,11 +888,7 @@ pluma_externally_modified_saving_error_message_area_new (
 	gtk_box_pack_start (GTK_BOX (vbox), primary_label, TRUE, TRUE, 0);
 	gtk_label_set_use_markup (GTK_LABEL (primary_label), TRUE);
 	gtk_label_set_line_wrap (GTK_LABEL (primary_label), TRUE);
-#if GTK_CHECK_VERSION (3, 16, 0)
 	gtk_label_set_xalign (GTK_LABEL (primary_label), 0.0);
-#else
-	gtk_misc_set_alignment (GTK_MISC (primary_label), 0.0, 0.5);
-#endif
 	gtk_widget_set_can_focus (primary_label, TRUE);
 	gtk_label_set_selectable (GTK_LABEL (primary_label), TRUE);
 
@@ -930,11 +902,7 @@ pluma_externally_modified_saving_error_message_area_new (
 	gtk_label_set_use_markup (GTK_LABEL (secondary_label), TRUE);
 	gtk_label_set_line_wrap (GTK_LABEL (secondary_label), TRUE);
 	gtk_label_set_selectable (GTK_LABEL (secondary_label), TRUE);
-#if GTK_CHECK_VERSION (3, 16, 0)
 	gtk_label_set_xalign (GTK_LABEL (secondary_label), 0.0);
-#else
-	gtk_misc_set_alignment (GTK_MISC (secondary_label), 0.0, 0.5);
-#endif
 
 	gtk_widget_show_all (hbox_content);
 	set_contents (message_area, hbox_content);
@@ -1020,11 +988,7 @@ pluma_no_backup_saving_error_message_area_new (const gchar  *uri,
 	gtk_box_pack_start (GTK_BOX (vbox), primary_label, TRUE, TRUE, 0);
 	gtk_label_set_use_markup (GTK_LABEL (primary_label), TRUE);
 	gtk_label_set_line_wrap (GTK_LABEL (primary_label), TRUE);
-#if GTK_CHECK_VERSION (3, 16, 0)
 	gtk_label_set_xalign (GTK_LABEL (primary_label), 0.0);
-#else
-	gtk_misc_set_alignment (GTK_MISC (primary_label), 0.0, 0.5);
-#endif
 	gtk_widget_set_can_focus (primary_label, TRUE);
 	gtk_label_set_selectable (GTK_LABEL (primary_label), TRUE);
 
@@ -1040,11 +1004,7 @@ pluma_no_backup_saving_error_message_area_new (const gchar  *uri,
 	gtk_label_set_use_markup (GTK_LABEL (secondary_label), TRUE);
 	gtk_label_set_line_wrap (GTK_LABEL (secondary_label), TRUE);
 	gtk_label_set_selectable (GTK_LABEL (secondary_label), TRUE);
-#if GTK_CHECK_VERSION (3, 16, 0)
 	gtk_label_set_xalign (GTK_LABEL (secondary_label), 0.0);
-#else
-	gtk_misc_set_alignment (GTK_MISC (secondary_label), 0.0, 0.5);
-#endif
 
 	gtk_widget_show_all (hbox_content);
 	set_contents (message_area, hbox_content);
diff --git a/pluma/pluma-panel.c b/pluma/pluma-panel.c
index eb234898..19b312d3 100644
--- a/pluma/pluma-panel.c
+++ b/pluma/pluma-panel.c
@@ -493,11 +493,7 @@ build_vertical_panel (PlumaPanel *panel)
 			    0);	
 
 	panel->priv->title_label = gtk_label_new (_("Empty"));
-#if GTK_CHECK_VERSION (3, 16, 0)
 	gtk_label_set_xalign (GTK_LABEL (panel->priv->title_label), 0.0);
-#else
-	gtk_misc_set_alignment (GTK_MISC (panel->priv->title_label), 0, 0.5);
-#endif
 	gtk_label_set_ellipsize(GTK_LABEL (panel->priv->title_label), PANGO_ELLIPSIZE_END);
 
 	gtk_box_pack_start (GTK_BOX (icon_name_hbox),
@@ -594,12 +590,8 @@ build_tab_label (PlumaPanel  *panel,
 	gtk_box_pack_start (GTK_BOX (label_hbox), icon, FALSE, FALSE, 0);
 
 	/* setup label */
-        label = gtk_label_new (name);
-#if GTK_CHECK_VERSION (3, 16, 0)
+	label = gtk_label_new (name);
 	gtk_label_set_xalign (GTK_LABEL (label), 0.0);
-#else
-	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-#endif
 	gtk_widget_set_margin_start (label, 0);
 	gtk_widget_set_margin_end (label, 0);
 	gtk_widget_set_margin_top (label, 0);
@@ -669,11 +661,7 @@ pluma_panel_add_item (PlumaPanel  *panel,
 	tab_label = build_tab_label (panel, item, data->name, data->icon);
 
 	menu_label = gtk_label_new (name);
-#if GTK_CHECK_VERSION (3, 16, 0)
 	gtk_label_set_xalign (GTK_LABEL (menu_label), 0.0);
-#else
-	gtk_misc_set_alignment (GTK_MISC (menu_label), 0.0, 0.5);
-#endif
 
 	if (!gtk_widget_get_visible (item))
 		gtk_widget_show (item);
diff --git a/pluma/pluma-progress-message-area.c b/pluma/pluma-progress-message-area.c
index 802412cd..a9c18347 100644
--- a/pluma/pluma-progress-message-area.c
+++ b/pluma/pluma-progress-message-area.c
@@ -152,11 +152,7 @@ pluma_progress_message_area_init (PlumaProgressMessageArea *area)
 	gtk_widget_show (area->priv->label);
 	gtk_box_pack_start (GTK_BOX (hbox), area->priv->label, TRUE, TRUE, 0);
 	gtk_label_set_use_markup (GTK_LABEL (area->priv->label), TRUE);
-#if GTK_CHECK_VERSION (3, 16, 0)
 	gtk_label_set_xalign (GTK_LABEL (area->priv->label), 0.0);
-#else
-	gtk_misc_set_alignment (GTK_MISC (area->priv->label), 0.0, 0.5);
-#endif
 	gtk_label_set_ellipsize (GTK_LABEL (area->priv->label), 
 				 PANGO_ELLIPSIZE_END);
 
diff --git a/pluma/pluma-status-combo-box.c b/pluma/pluma-status-combo-box.c
index 8b8d0004..36b9bd9d 100644
--- a/pluma/pluma-status-combo-box.c
+++ b/pluma/pluma-status-combo-box.c
@@ -111,10 +111,6 @@ pluma_status_combo_box_constructed (GObject *object)
 	GError *error = NULL;
 	const gchar style[] =
 		"* {\n"
-#if !GTK_CHECK_VERSION (3, 20, 0)
-		"	-GtkWidget-focus-line-width: 0;\n"
-		"	-GtkWidget-focus-padding: 0;\n"
-#endif
 		"	padding: 0;\n"
 		"}";
 
@@ -297,11 +293,7 @@ pluma_status_combo_box_init (PlumaStatusComboBox *self)
 	gtk_widget_show (self->priv->label);
 	
 	gtk_label_set_single_line_mode (GTK_LABEL (self->priv->label), TRUE);
-#if GTK_CHECK_VERSION (3, 16, 0)
 	gtk_label_set_xalign (GTK_LABEL (self->priv->label), 0.0);
-#else
-	gtk_misc_set_alignment (GTK_MISC (self->priv->label), 0.0, 0.5);
-#endif
 	
 	gtk_box_pack_start (GTK_BOX (self->priv->hbox), self->priv->label, FALSE, TRUE, 0);
 	
diff --git a/pluma/pluma-tab-label.c b/pluma/pluma-tab-label.c
index d3a07674..7f66b233 100644
--- a/pluma/pluma-tab-label.c
+++ b/pluma/pluma-tab-label.c
@@ -292,11 +292,7 @@ pluma_tab_label_init (PlumaTabLabel *tab_label)
 	tab_label->priv->icon = icon;
 
 	label = gtk_label_new ("");
-#if GTK_CHECK_VERSION (3, 16, 0)
 	gtk_label_set_xalign (GTK_LABEL (label), 0.0);
-#else
-	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-#endif
 	gtk_widget_set_margin_start (label, 0);
 	gtk_widget_set_margin_end (label, 0);
 	gtk_widget_set_margin_top (label, 0);
diff --git a/pluma/pluma-window.c b/pluma/pluma-window.c
index 9ae0945c..52891a7c 100644
--- a/pluma/pluma-window.c
+++ b/pluma/pluma-window.c
@@ -2821,25 +2821,16 @@ static void
 fullscreen_controls_show (PlumaWindow *window)
 {
 	GdkScreen *screen;
-#if GTK_CHECK_VERSION (3, 22, 0)
 	GdkDisplay *display;
-#endif
 	GdkRectangle fs_rect;
 	gint w, h;
 
 	screen = gtk_window_get_screen (GTK_WINDOW (window));
-#if GTK_CHECK_VERSION (3, 22, 0)
 	display = gdk_screen_get_display (screen);
 
 	gdk_monitor_get_geometry (gdk_display_get_monitor_at_window (display,
 								     gtk_widget_get_window (GTK_WIDGET (window))),
 				  &fs_rect);
-#else
-	gdk_screen_get_monitor_geometry (screen,
-					 gdk_screen_get_monitor_at_window (screen,
-									   gtk_widget_get_window (GTK_WIDGET (window))),
-					 &fs_rect);
-#endif
 
 	gtk_window_get_size (GTK_WINDOW (window->priv->fullscreen_controls), &w, &h);
 
@@ -2857,25 +2848,16 @@ run_fullscreen_animation (gpointer data)
 {
 	PlumaWindow *window = PLUMA_WINDOW (data);
 	GdkScreen *screen;
-#if GTK_CHECK_VERSION (3, 22, 0)
 	GdkDisplay *display;
-#endif
 	GdkRectangle fs_rect;
 	gint x, y;
 	
 	screen = gtk_window_get_screen (GTK_WINDOW (window));
-#if GTK_CHECK_VERSION (3, 22, 0)
 	display = gdk_screen_get_display (screen);
 
 	gdk_monitor_get_geometry (gdk_display_get_monitor_at_window (display,
 								     gtk_widget_get_window (GTK_WIDGET (window))),
 				  &fs_rect);
-#else
-	gdk_screen_get_monitor_geometry (screen,
-					 gdk_screen_get_monitor_at_window (screen,
-									   gtk_widget_get_window (GTK_WIDGET (window))),
-					 &fs_rect);
-#endif
 					 
 	gtk_window_get_position (GTK_WINDOW (window->priv->fullscreen_controls),
 				 &x, &y);
@@ -2945,23 +2927,14 @@ show_hide_fullscreen_toolbar (PlumaWindow *window,
 	{
 		GdkRectangle fs_rect;
 		GdkScreen *screen;
-#if GTK_CHECK_VERSION (3, 22, 0)
 		GdkDisplay *display;
-#endif
 
 		screen = gtk_window_get_screen (GTK_WINDOW (window));
-#if GTK_CHECK_VERSION (3, 22, 0)
 		display = gdk_screen_get_display (screen);
 
 		gdk_monitor_get_geometry (gdk_display_get_monitor_at_window (display,
 									     gtk_widget_get_window (GTK_WIDGET (window))),
 					  &fs_rect);
-#else
-		gdk_screen_get_monitor_geometry (screen,
-						 gdk_screen_get_monitor_at_window (screen,
-										   gtk_widget_get_window (GTK_WIDGET (window))),
-						 &fs_rect);
-#endif
 
 		if (show)
 			gtk_window_move (GTK_WINDOW (window->priv->fullscreen_controls),