From 4f5fb6e9f9e30ef9c91324458eb691fa0a98d6fe Mon Sep 17 00:00:00 2001 From: Nils Faerber Date: Tue, 6 Jun 2006 14:42:39 +0000 Subject: [PATCH] * made window management work with edit window - modest exits only when there is no open window anymore pmo-trunk-r153 --- src/gtk-glade/modest-ui.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/gtk-glade/modest-ui.c b/src/gtk-glade/modest-ui.c index 6e44c5a..bf4baf4 100644 --- a/src/gtk-glade/modest-ui.c +++ b/src/gtk-glade/modest-ui.c @@ -375,7 +375,11 @@ register_toolbar_callbacks (ModestUI *modest_ui) static void hide_edit_window (GtkWidget *win, GdkEvent *event, gpointer data) { + ModestUIPrivate *priv; + + priv = MODEST_UI_GET_PRIVATE(data); gtk_widget_hide (win); + modest_window_mgr_unregister(priv->modest_window_mgr, G_OBJECT(win)); } @@ -421,9 +425,9 @@ modest_ui_show_edit_window (ModestUI *modest_ui, const gchar* to, gtk_text_buffer_set_text(buf, "", -1); } g_signal_connect (win, "destroy-event", G_CALLBACK(hide_edit_window), - NULL); + modest_ui); g_signal_connect (win, "delete-event", G_CALLBACK(hide_edit_window), - NULL); + modest_ui); gtk_widget_set_usize (GTK_WIDGET(win), height, width); gtk_window_set_title (GTK_WINDOW(win), @@ -452,6 +456,8 @@ modest_ui_window_destroy (GtkWidget *win, GdkEvent *event, gpointer data) if (!modest_window_mgr_unregister (priv->modest_window_mgr, G_OBJECT(win))) g_warning ("modest window mgr: failed to unregister %p", G_OBJECT(win)); + else + gtk_widget_hide(win); } -- 1.7.9.5