diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2013-09-27 22:53:23 +0100 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2013-09-27 22:53:23 +0100 |
| commit | 8e8868a0527e9d29b06706c6550c03730eaf0bd8 (patch) | |
| tree | 24611869d20cc0b298620b2f396b65dbef679665 | |
| parent | 87fe0c3a988e78575852911fd20a0dca507d42e2 (diff) | |
Let GTK emit the GtkWidget::delete-event
Emitting the ::delete-event signal ourselves is not supported, and will
inevitably lead to undefined behaviour.
| -rw-r--r-- | endless/eoswindow.c | 41 |
1 files changed, 33 insertions, 8 deletions
diff --git a/endless/eoswindow.c b/endless/eoswindow.c index 1e963f4..2c2491e 100644 --- a/endless/eoswindow.c +++ b/endless/eoswindow.c @@ -540,7 +540,6 @@ eos_window_class_init (EosWindowClass *klass) widget_class->unmap = eos_window_unmap; widget_class->show = eos_window_show; container_class->forall = eos_window_forall; - widget_class->delete_event = eos_window_default_delete; /** * EosWindow:application: @@ -569,6 +568,36 @@ eos_window_class_init (EosWindowClass *klass) g_object_class_install_properties (object_class, NPROPS, eos_window_props); } +#if GTK_CHECK_VERSION (3, 10, 0) +#define our_window_close(w) gtk_window_close (GTK_WINDOW (w)) +#else +static gboolean +queue_close (gpointer user_data) +{ + GtkWidget *window = user_data; + + GdkEvent *event = gdk_event_new (GDK_DELETE); + + event->any.window = gtk_widget_get_window (window); + event->any.send_event = TRUE; + + gtk_main_do_event (event); + + gdk_event_free (event); + + return G_SOURCE_REMOVE; +} + +static void +our_window_close (GtkWidget *window) +{ + if (!gtk_widget_get_realized (window)) + return; + + gdk_threads_add_idle (queue_close, window); +} +#endif /* GTK_CHECK_VERSION (3, 10, 0) */ + static void on_minimize_clicked_cb (GtkWidget* top_bar, gpointer user_data) @@ -583,13 +612,9 @@ static void on_close_clicked_cb (GtkWidget* top_bar, gpointer user_data) { - if (user_data != NULL) - { - // We don't actually care about the return value, the default "delete-event" handler - // will take care of closing windows for us - gboolean dummy = FALSE; - g_signal_emit_by_name (G_OBJECT (user_data), "delete-event", NULL, &dummy); - } + GtkWidget *window = gtk_widget_get_toplevel (top_bar); + + our_window_close (window); } /* Make sure that the edge finishing does not catch input events */ |