more GTK Deprecation warnings removed

crosswire · Nov 6, 2017 · d1b49ac · d1b49ac
1 parent f25a989
commit d1b49ac
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/src/gnome2/main_menu.c b/src/gnome2/main_menu.c
@@ -114,8 +114,13 @@ on_help_contents_activate(GtkMenuItem *menuitem, gpointer user_data)
 	g_free(help_file);
 #else
 	GError *error = NULL;
+#if GTK_CHECK_VERSION(3, 22, 0)
+	gtk_show_uri_on_window(NULL, "ghelp:xiphos", gtk_get_current_event_time(),
+		     &error);
+#else
 	gtk_show_uri(NULL, "ghelp:xiphos", gtk_get_current_event_time(),
 		     &error);
+#endif
 	if (error != NULL) {
 		XI_warning(("%s", error->message));
 		g_error_free(error);

diff --git a/src/gnome2/menu_popup.c b/src/gnome2/menu_popup.c
@@ -2026,8 +2026,12 @@ void gui_menu_popup(XiphosHtml *html, const gchar *mod_name,
 
 	menu = _create_popup_menu(html, mod_name, d);
 	if (menu)
+#if GTK_CHECK_VERSION(3, 22, 0)
+		gtk_menu_popup_at_pointer((GtkMenu *)menu, NULL);
+#else
 		gtk_menu_popup((GtkMenu *)menu, NULL, NULL, NULL, NULL, 2,
 			       gtk_get_current_event_time());
+#endif
 	else
 		gui_generic_warning(_("No module in this pane."));
 }