[Xfce4-commits] [xfce/xfce4-settings] 01/01: display: Ensure the dialog gets properly destroyed

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

o   c   h   o   s   i       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository xfce/xfce4-settings.

commit 0373a8a0696fe118be85dde73e1791b8157b8aff
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date:   Sun Apr 21 22:39:08 2019 +0200

    display: Ensure the dialog gets properly destroyed
---
 dialogs/display-settings/main.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index ebfabc3..a47feb1 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -1532,7 +1532,7 @@ display_settings_dialog_response (GtkDialog  *dialog,
         }
         g_free (new_active_profile);
         g_free (active_profile);
-        gtk_main_quit ();
+        gtk_widget_destroy (GTK_WIDGET (dialog));
     }
 }
 
@@ -3508,8 +3508,6 @@ display_settings_show_main_dialog (GdkDisplay *display)
         g_signal_connect (randr_gui_area, "viewport_changed",
                   G_CALLBACK (on_viewport_changed), app);
 
-        g_signal_connect (G_OBJECT(dialog), "destroy", gtk_main_quit, NULL);
-
         gui_container = GTK_WIDGET (gtk_builder_get_object (builder, "randr-dnd"));
         gtk_container_add (GTK_CONTAINER (gui_container), GTK_WIDGET (randr_gui_area));
         gtk_widget_show_all (gui_container);
@@ -3520,8 +3518,9 @@ display_settings_show_main_dialog (GdkDisplay *display)
         if (G_UNLIKELY (opt_socket_id == 0))
         {
             g_signal_connect (G_OBJECT (dialog), "response",
-                G_CALLBACK (display_settings_dialog_response), builder);
-
+                              G_CALLBACK (display_settings_dialog_response), builder);
+            g_signal_connect (G_OBJECT (dialog), "destroy",
+                              G_CALLBACK (gtk_main_quit), builder);
             /* Show the dialog */
             gtk_window_present (GTK_WINDOW (dialog));
         }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.