Getting colder with our second freeze... it's 3.31.91 release day and string freeze, upload a tarball and lock those strings 🏂

Commit 17f60f90 authored by Nirbheek Chauhan's avatar Nirbheek Chauhan Committed by nobody

Port to latest gtk+:3

* gtk_combo_box_append_text(), gtk_combo_box_get_active_text() were removed
* gtk_quit_add() and GtkFunction were removed
  - gtk_quit_add() shouldn't be needed since uninit is called atexit()
* Require gtk+-2.91.1 or gtk+-2.23.0 for this
parent 34953d2f
......@@ -239,8 +239,6 @@ int main(int argc, char* argv[])
gtk_init_with_args (&argc, &argv, _("Encryption Key Agent (Seahorse)"), (GOptionEntry *) options, GETTEXT_PACKAGE, NULL);
gtk_quit_add (0, (GtkFunction) seahorse_agent_uninit, NULL);
seahorse_agent_prefork ();
if (seahorse_agent_execvars &&
......
......@@ -44,11 +44,11 @@ AC_MSG_RESULT([$with_gtk])
case "$with_gtk" in
2.0)
GTK_API_VERSION=2.0
GTK_REQUIRED=2.18.0
GTK_REQUIRED=2.23.0
;;
3.0)
GTK_API_VERSION=3.0
GTK_REQUIRED=2.90.0
GTK_REQUIRED=2.91.1
;;
esac
......
......@@ -432,8 +432,8 @@ prepare_dialog (FilesCtx *ctx, guint nfolders, guint nfiles, GFileInfo *info, gc
save_type_list = save_type;
for (i = 0; save_type_list[i] != FR_FILE_TYPE_NULL; i++) {
gtk_combo_box_append_text (GTK_COMBO_BOX (combo),
file_type_desc[save_type_list[i]].ext);
gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo),
file_type_desc[save_type_list[i]].ext);
if (strcmp(ext, file_type_desc[save_type_list[i]].ext) == 0)
gtk_combo_box_set_active (GTK_COMBO_BOX (combo), i);
}
......@@ -473,8 +473,7 @@ get_results (SeahorseWidget *swidget)
name = gtk_entry_get_text (GTK_ENTRY (w));
w = GTK_WIDGET (seahorse_widget_get_widget (swidget, "package-extension"));
ext = gtk_combo_box_get_active_text (GTK_COMBO_BOX (w));
ext = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT (w));
/* No paths */
t = strrchr(name, '/');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment