From fd7dede316ba7ee10dbab46673c20a89d41927a9 Mon Sep 17 00:00:00 2001
From: Pierre Pronchery <khorben@defora.org>
Date: Sun, 18 Oct 2015 23:55:29 +0200
Subject: [PATCH] Avoid a few more warnings with Gtk+ 3.0

---
 src/compare.c  | 7 +++++++
 src/progress.c | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/src/compare.c b/src/compare.c
index 6872ba2..d46fca7 100644
--- a/src/compare.c
+++ b/src/compare.c
@@ -115,7 +115,14 @@ static int _compare(char const * string1, char const * string2)
 	bbox = gtk_hbutton_box_new();
 #endif
 	gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
+#if GTK_CHECK_VERSION(3, 10, 0)
+	widget = gtk_button_new_with_label(_("Close"));
+	gtk_button_set_image(GTK_BUTTON(widget),
+			gtk_image_new_from_icon_name(GTK_STOCK_CLOSE,
+				GTK_ICON_SIZE_BUTTON));
+#else
 	widget = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
+#endif
 	g_signal_connect_swapped(widget, "clicked", G_CALLBACK(
 				_compare_on_close), window);
 	gtk_container_add(GTK_CONTAINER(bbox), widget);
diff --git a/src/progress.c b/src/progress.c
index f48d791..321b9eb 100644
--- a/src/progress.c
+++ b/src/progress.c
@@ -278,7 +278,14 @@ static int _progress(Prefs * prefs, char * argv[])
 #else
 	hbox = gtk_hbox_new(FALSE, 0);
 #endif
+#if GTK_CHECK_VERSION(3, 10, 0)
+	widget = gtk_button_new_with_label(_("Cancel"));
+	gtk_button_set_image(GTK_BUTTON(widget),
+			gtk_image_new_from_icon_name(GTK_STOCK_CANCEL,
+				GTK_ICON_SIZE_BUTTON));
+#else
 	widget = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
+#endif
 	g_signal_connect(G_OBJECT(widget), "clicked", G_CALLBACK(
 				_progress_cancel), NULL);
 	gtk_box_pack_end(GTK_BOX(hbox), widget, FALSE, TRUE, 0);