[Xfce4-commits] <parole:master> Fix the confirmation on delete event.

[Ali Abdallah]

Updating branch refs/heads/master
         to 3c21fe84290fe3719e691b348822b244f726942d (commit)
       from 323e608cc63dcdce997702146f27c37923f5e915 (commit)

commit 3c21fe84290fe3719e691b348822b244f726942d
Author: Ali Abdallah <aliov at xfce.org>
Date:   Thu Dec 3 12:00:53 2009 +0100

    Fix the confirmation on delete event.

 plugins/tray/tray-provider.c |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/plugins/tray/tray-provider.c b/plugins/tray/tray-provider.c
index 0343e97..aa0b197 100644
--- a/plugins/tray/tray-provider.c
+++ b/plugins/tray/tray-provider.c
@@ -514,16 +514,24 @@ delete_event_cb (GtkWidget *widget, GdkEvent *ev, TrayProvider *tray)
     switch ( gtk_dialog_run (GTK_DIALOG (dialog)) )
     {
 	case GTK_RESPONSE_OK:
-	    gtk_widget_hide_on_delete (widget);
-	    break;
+	    {
+		gtk_widget_hide_on_delete (widget);
+		confirmed = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check));
+		if ( confirmed )
+		    write_entry_bool ("MINIMIZE_TO_TRAY", TRUE);
+		break;
+	    }
 	case GTK_RESPONSE_CLOSE:
-	    ret_val = FALSE;
+	    {
+		confirmed = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check));
+		if ( confirmed )
+		    write_entry_bool ("MINIMIZE_TO_TRAY", FALSE);
+		ret_val = FALSE;
+	    }
 	    break;
 	case GTK_RESPONSE_CANCEL:
-	    ret_val = TRUE;
 	    break;
 	default:
-	    ret_val = TRUE;
 	    break;
     }