diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-02-12 12:45:51 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-02-12 12:45:51 +0000 |
| commit | 919e06a8319e46b949536df4b4b6900442ca0122 (patch) | |
| tree | c0cd41b60563f3f90047f8d86095c9ccafc72e18 | |
| parent | 9f10f9a5956b554daf4449e93620f7145bb8f941 (diff) | |
| parent | 0d5957b97aad383720a54b78d5d4a00d90885c50 (diff) | |
| download | gtk+-919e06a8319e46b949536df4b4b6900442ca0122.tar.gz | |
Merge branch 'wip/baedert/for-master' into 'master'
Wip/baedert/for master
See merge request GNOME/gtk!3189
| -rw-r--r-- | gtk/gtknativedialog.c | 7 | ||||
| -rw-r--r-- | meson.build | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/gtk/gtknativedialog.c b/gtk/gtknativedialog.c index 73ad13ea3a..71cceb4f8c 100644 --- a/gtk/gtknativedialog.c +++ b/gtk/gtknativedialog.c @@ -68,10 +68,6 @@ struct _GtkNativeDialogPrivate guint visible : 1; guint modal : 1; - - /* Run state */ - int run_response_id; - GMainLoop *run_loop; /* Non-NULL when in run */ }; enum { @@ -347,9 +343,6 @@ gtk_native_dialog_hide (GtkNativeDialog *self) klass->hide (self); - if (priv->run_loop && g_main_loop_is_running (priv->run_loop)) - g_main_loop_quit (priv->run_loop); - g_object_notify_by_pspec (G_OBJECT (self), native_props[PROP_VISIBLE]); } diff --git a/meson.build b/meson.build index 729aa3ea19..8677754121 100644 --- a/meson.build +++ b/meson.build @@ -198,7 +198,7 @@ check_functions = [ '_lock_file', 'flockfile', 'mkstemp', - 'mallinfo', + 'mallinfo2', 'sincos', 'sincosf', ] |