[Geany-Devel] [PATCH geany-plugins] insertnum: Fix GTK+3 support

[Quentin Glidic]

From: Quentin Glidic <sardemff7+git at sardemff7.net>

Signed-off-by: Quentin Glidic <sardemff7+git at sardemff7.net>
---
 build/geanyinsertnum.m4        |  1 -
 geanyinsertnum/src/insertnum.c | 14 +++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/build/geanyinsertnum.m4 b/build/geanyinsertnum.m4
index 08c2c6c..392dfb8 100644
--- a/build/geanyinsertnum.m4
+++ b/build/geanyinsertnum.m4
@@ -1,7 +1,6 @@
 AC_DEFUN([GP_CHECK_GEANYINSERTNUM],
 [
     GP_ARG_DISABLE([GeanyInsertNum], [auto])
-    GP_CHECK_PLUGIN_GTK2_ONLY([GeanyInsertNum])
     GP_COMMIT_PLUGIN_STATUS([GeanyInsertNum])
     AC_CONFIG_FILES([
         geanyinsertnum/Makefile
diff --git a/geanyinsertnum/src/insertnum.c b/geanyinsertnum/src/insertnum.c
index 4fa6e45..18ab8cc 100644
--- a/geanyinsertnum/src/insertnum.c
+++ b/geanyinsertnum/src/insertnum.c
@@ -351,14 +351,14 @@ static void on_insert_numbers_activate(G_GNUC_UNUSED GtkMenuItem *menuitem, G_GN
 
 	label = gtk_label_new_with_mnemonic(_("_Base:"));
 	gtk_table_attach_defaults(table, label, 0, 1, 1, 2);
-	combo = GTK_COMBO_BOX(gtk_combo_box_entry_new_text());
+	combo = GTK_COMBO_BOX(gtk_combo_box_text_new_with_entry());
 	d.base = gtk_bin_get_child(GTK_BIN(combo));
 	set_entry(d.base, 2, label, "2..36");
 	g_signal_connect(d.base, "insert-text", G_CALLBACK(on_base_insert_text), NULL);
-	gtk_combo_box_append_text(combo, "2");
-	gtk_combo_box_append_text(combo, "8");
-	gtk_combo_box_append_text(combo, "10");
-	gtk_combo_box_append_text(combo, "16");
+	gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo), "2");
+	gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo), "8");
+	gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo), "10");
+	gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo), "16");
 	gtk_table_attach(table, GTK_WIDGET(combo), 1, 3, 1, 2, GTK_EXPAND | GTK_FILL, 0, 0, 0);
 	label = gtk_label_new(_("Letters:"));
 	ui_widget_set_tooltip_text(label, case_tip);
@@ -388,8 +388,8 @@ static void on_insert_numbers_activate(G_GNUC_UNUSED GtkMenuItem *menuitem, G_GN
 
 	button = gtk_button_new_from_stock(GTK_STOCK_OK);
 	g_signal_connect(button, "clicked", G_CALLBACK(on_insert_numbers_ok_clicked), &d);
-	gtk_box_pack_end(GTK_BOX(GTK_DIALOG(d.dialog)->action_area), button, TRUE, TRUE, 0);
-	GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
+	gtk_box_pack_end(GTK_BOX(gtk_dialog_get_action_area(GTK_DIALOG(d.dialog))), button, TRUE, TRUE, 0);
+	gtk_widget_set_can_default(button, TRUE);
 	gtk_widget_grab_default(button);
 
 	gtk_spin_button_set_value(GTK_SPIN_BUTTON(d.start), start_value);
-- 
1.8.2