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

and require libmatekbd, libmate-desktop, marco, m-s-d >= 1.17

4 files changed, 0 insertions, 32 deletions

diff --git a/capplets/about-me/e-image-chooser.c b/capplets/about-me/e-image-chooser.c
index d87bf0b5..c69bc204 100644
--- a/capplets/about-me/e-image-chooser.c
+++ b/capplets/about-me/e-image-chooser.c
@@ -29,10 +29,6 @@
 
 #include "e-image-chooser.h"
 
-#if !GTK_CHECK_VERSION(3,0,0)
-#define gtk_widget_get_preferred_size(x,y,z) gtk_widget_size_request(x,y)
-#endif
-
 struct _EImageChooserPrivate {
 
 	GtkWidget *image;
@@ -128,11 +124,7 @@ e_image_chooser_class_init (EImageChooserClass *klass)
 			      G_STRUCT_OFFSET (EImageChooserClass, changed),
 			      NULL, NULL,
 			      g_cclosure_marshal_VOID__VOID,
-#if GTK_CHECK_VERSION (3, 0, 0)
 			      G_TYPE_NONE, 0);
-#else
-			      GTK_TYPE_NONE, 0);
-#endif
 
 	object_class->dispose = e_image_chooser_dispose;
 }
diff --git a/capplets/about-me/eel-alert-dialog.c b/capplets/about-me/eel-alert-dialog.c
index 9fd4d52e..cbf28edf 100644
--- a/capplets/about-me/eel-alert-dialog.c
+++ b/capplets/about-me/eel-alert-dialog.c
@@ -159,12 +159,8 @@ eel_alert_dialog_init (EelAlertDialog *dialog)
 	dialog->details->secondary_label = gtk_label_new (NULL);
 	dialog->details->details_label = gtk_label_new (NULL);
 	dialog->details->image = gtk_image_new_from_stock (NULL, GTK_ICON_SIZE_DIALOG);
-#if GTK_CHECK_VERSION (3, 0, 0)
 	gtk_widget_set_halign (dialog->details->image, GTK_ALIGN_CENTER);
 	gtk_widget_set_valign (dialog->details->image, GTK_ALIGN_START);
-#else
-	gtk_misc_set_alignment (GTK_MISC (dialog->details->image), 0.5, 0.0);
-#endif
 
 	gtk_label_set_line_wrap (GTK_LABEL (dialog->details->primary_label), TRUE);
 	gtk_label_set_selectable (GTK_LABEL (dialog->details->primary_label), TRUE);
@@ -191,21 +187,13 @@ eel_alert_dialog_init (EelAlertDialog *dialog)
 	gtk_misc_set_alignment (GTK_MISC (dialog->details->details_label), 0.0, 0.5);
 #endif
 
-#if GTK_CHECK_VERSION (3, 0, 0)
 	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
-#else
-	hbox = gtk_hbox_new (FALSE, 12);
-#endif
 	gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
 
 	gtk_box_pack_start (GTK_BOX (hbox), dialog->details->image,
 	                    FALSE, FALSE, 0);
 
-#if GTK_CHECK_VERSION (3, 0, 0)
 	vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
-#else
-	vbox = gtk_vbox_new (FALSE, 12);
-#endif
 
 	gtk_box_pack_start (GTK_BOX (hbox), vbox,
 	                    FALSE, FALSE, 0);
diff --git a/capplets/about-me/mate-about-me-password.c b/capplets/about-me/mate-about-me-password.c
index 91369fa6..6de5218f 100644
--- a/capplets/about-me/mate-about-me-password.c
+++ b/capplets/about-me/mate-about-me-password.c
@@ -685,11 +685,7 @@ passdlg_set_busy (PasswordDialog *pdialog, gboolean busy)
 	gdk_display_flush (display);
 
 	if (busy) {
-#if GTK_CHECK_VERSION (3, 0, 0)
 		g_object_unref (cursor);
-#else
-		gdk_cursor_unref (cursor);
-#endif
 	}
 
 	/* Disable/Enable UI */
diff --git a/capplets/about-me/mate-about-me.c b/capplets/about-me/mate-about-me.c
index e379467a..1f94f3bb 100644
--- a/capplets/about-me/mate-about-me.c
+++ b/capplets/about-me/mate-about-me.c
@@ -345,11 +345,7 @@ about_me_icon_theme_changed (GtkWindow    *window,
 	if (icon != NULL) {
 		g_free (me->person);
 		me->person = g_strdup (gtk_icon_info_get_filename (icon));
-#if GTK_CHECK_VERSION (3, 8, 0)
 		g_object_unref (icon);
-#else
-		gtk_icon_info_free (icon);
-#endif
 	}
 
 	if (me->have_image)
@@ -424,11 +420,7 @@ about_me_setup_dialog (void)
 	icon = gtk_icon_theme_lookup_icon (me->theme, "stock_person", 80, 0);
 	if (icon != NULL) {
 		me->person = g_strdup (gtk_icon_info_get_filename (icon));
-#if GTK_CHECK_VERSION (3, 8, 0)
 		g_object_unref (icon);
-#else
-		gtk_icon_info_free (icon);
-#endif
 	}
 
 	g_signal_connect_object (me->theme, "changed",