From f3533e4fc2d31e346d910d165c6ba559cce6c6c1 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 8 Jan 2012 02:16:26 -0500 Subject: [PATCH] Fix the gtk_application_end_session implementation We were passing the wrong flags, causing the meaning of the request_confirmation parameter to be inverted. --- gtk/gtkapplication.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gtk/gtkapplication.c b/gtk/gtkapplication.c index a31cf59ac7..4331314c4e 100644 --- a/gtk/gtkapplication.c +++ b/gtk/gtkapplication.c @@ -1079,6 +1079,7 @@ client_proxy_signal (GDBusProxy *proxy, else if (strcmp (signal_name, "EndSession") == 0) { g_debug ("Received EndSession"); + app->priv->quit_requested = TRUE; gtk_application_quit_response (app, TRUE, NULL); unregister_client (app); g_signal_emit (app, gtk_application_signals[QUIT], 0); @@ -1438,7 +1439,7 @@ gtk_application_end_session (GtkApplication *application, case GTK_APPLICATION_LOGOUT: g_dbus_proxy_call (application->priv->sm_proxy, "Logout", - g_variant_new ("(u)", request_confirmation), + g_variant_new ("(u)", request_confirmation ? 0 : 1), G_DBUS_CALL_FLAGS_NONE, G_MAXINT, NULL, NULL, NULL);