From: Matthias Clasen <mclasen@redhat.com>
Date: Wed, 30 Nov 2022 00:25:40 +0000 (-0500)
Subject: fontdialog: Unset check cancellable
X-Git-Tag: archive/raspbian/4.12.3+ds-1+rpi1~1^2^2^2~22^2~9^2~49^2~9
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b297baed32c75af72c96b266ae39f83e7f56f6c7;p=gtk4.git

fontdialog: Unset check cancellable
---

diff --git a/gtk/gtkfontdialog.c b/gtk/gtkfontdialog.c
index 169b4a6029..566d6a26d5 100644
--- a/gtk/gtkfontdialog.c
+++ b/gtk/gtkfontdialog.c
@@ -596,6 +596,7 @@ create_font_chooser (GtkFontDialog        *self,
 
   window = gtk_font_chooser_dialog_new (title, parent);
   gtk_font_chooser_set_level (GTK_FONT_CHOOSER (window), level);
+  gtk_window_set_modal (GTK_WINDOW (window), TRUE);
   if (self->language)
     gtk_font_chooser_set_language (GTK_FONT_CHOOSER (window),
                                    pango_language_to_string (self->language));
@@ -657,6 +658,7 @@ gtk_font_dialog_choose_family (GtkFontDialog        *self,
   g_clear_pointer (&desc, pango_font_description_free);
 
   task = g_task_new (self, cancellable, callback, user_data);
+  g_task_set_check_cancellable (task, FALSE);
   g_task_set_source_tag (task, gtk_font_dialog_choose_family);
   g_task_set_task_data (task, window, (GDestroyNotify) gtk_window_destroy);
 
@@ -740,6 +742,7 @@ gtk_font_dialog_choose_face (GtkFontDialog       *self,
   g_clear_pointer (&desc, pango_font_description_free);
 
   task = g_task_new (self, cancellable, callback, user_data);
+  g_task_set_check_cancellable (task, FALSE);
   g_task_set_source_tag (task, gtk_font_dialog_choose_face);
   g_task_set_task_data (task, window, (GDestroyNotify) gtk_window_destroy);
 
@@ -817,6 +820,7 @@ gtk_font_dialog_choose_font (GtkFontDialog        *self,
                                 GTK_FONT_CHOOSER_LEVEL_VARIATIONS);
 
   task = g_task_new (self, cancellable, callback, user_data);
+  g_task_set_check_cancellable (task, FALSE);
   g_task_set_source_tag (task, gtk_font_dialog_choose_font);
   g_task_set_task_data (task, window, (GDestroyNotify) gtk_window_destroy);
 
@@ -896,6 +900,7 @@ gtk_font_dialog_choose_font_and_features (GtkFontDialog        *self,
                                 GTK_FONT_CHOOSER_LEVEL_FEATURES);
 
   task = g_task_new (self, cancellable, callback, user_data);
+  g_task_set_check_cancellable (task, FALSE);
   g_task_set_source_tag (task, gtk_font_dialog_choose_font_and_features);
   g_task_set_task_data (task, window, (GDestroyNotify) gtk_window_destroy);