AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

fontdialogbutton: Survive window closing

Browse Source 
If the parent window of the button gets destroyed
while the dialog is open, we cancel the async op,
but we need to be a little more careful about not
stepping on glass.
This commit is contained in:
Matthias Clasen 2022-11-29 19:27:02 -05:00
parent 637ef84d04
commit 45e3e1594f
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gtk/gtkfontdialogbutton.c
View File

@ -393,8 +393,9 @@ gtk_font_dialog_button_class_init (GtkFontDialogButtonClass *class)
static void
update_button_sensitivity (GtkFontDialogButton *self)
{
gtk_widget_set_sensitive (self->button,
self->dialog != NULL && self->cancellable == NULL);
if (self->button)
gtk_widget_set_sensitive (self->button,
self->dialog != NULL && self->cancellable == NULL);
}
static void
@ -402,10 +403,11 @@ family_chosen (GObject *source,
GAsyncResult *result,
gpointer data)
{
GtkFontDialog *dialog = GTK_FONT_DIALOG (source);
GtkFontDialogButton *self = data;
PangoFontFamily *family;
family = gtk_font_dialog_choose_family_finish (self->dialog, result, NULL);
family = gtk_font_dialog_choose_family_finish (dialog, result, NULL);
if (family)
{
PangoFontDescription *desc;
@ -428,10 +430,11 @@ face_chosen (GObject *source,
GAsyncResult *result,
gpointer data)
{
GtkFontDialog *dialog = GTK_FONT_DIALOG (source);
GtkFontDialogButton *self = data;
PangoFontFace *face;
face = gtk_font_dialog_choose_face_finish (self->dialog, result, NULL);
face = gtk_font_dialog_choose_face_finish (dialog, result, NULL);
if (face)
{
PangoFontDescription *desc;
@ -453,10 +456,11 @@ font_chosen (GObject *source,
GAsyncResult *result,
gpointer data)
{
GtkFontDialog *dialog = GTK_FONT_DIALOG (source);
GtkFontDialogButton *self = data;
PangoFontDescription *desc;
desc = gtk_font_dialog_choose_font_finish (self->dialog, result, NULL);
desc = gtk_font_dialog_choose_font_finish (dialog, result, NULL);
if (desc)
{
gtk_font_dialog_button_set_font_desc (self, desc);
@ -472,12 +476,13 @@ font_and_features_chosen (GObject *source,
GAsyncResult *result,
gpointer data)
{
GtkFontDialog *dialog = GTK_FONT_DIALOG (source);
GtkFontDialogButton *self = data;
PangoFontDescription *desc;
char *features;
PangoLanguage *language;
if (gtk_font_dialog_choose_font_and_features_finish (self->dialog, result,
if (gtk_font_dialog_choose_font_and_features_finish (dialog, result,
&desc, &features, &language,
NULL))
{