[Xfce4-commits] <libxfce4ui:master> Also request an interact for save-state-extended.

[Nick Schermer]

Updating branch refs/heads/master
         to 8a6f910703c6ba9b40c74feb78f875ed616e1442 (commit)
       from b358e071511fdc15966dacc08be477455b3782fe (commit)

commit 8a6f910703c6ba9b40c74feb78f875ed616e1442
Author: Nick Schermer <nick at xfce.org>
Date:   Fri Nov 26 15:29:41 2010 +0100

    Also request an interact for save-state-extended.
    
    This signal was never called if the application does not
    have a quit-request signal. Not mentioned by anyone, since
    only the window manager uses the save-state-extended signal.

 libxfce4ui/xfce-sm-client.c |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/libxfce4ui/xfce-sm-client.c b/libxfce4ui/xfce-sm-client.c
index 2ac3254..13f40ed 100644
--- a/libxfce4ui/xfce-sm-client.c
+++ b/libxfce4ui/xfce-sm-client.c
@@ -879,9 +879,12 @@ xfce_sm_client_handle_save_yourself(XfceSMClient *sm_client,
                                     gboolean do_save_state)
 {
     if(do_quit_requested
-       && g_signal_has_handler_pending(G_OBJECT(sm_client),
-                                       signals[SIG_QUIT_REQUESTED],
-                                       0, FALSE))
+       && (g_signal_has_handler_pending(G_OBJECT(sm_client),
+                                        signals[SIG_QUIT_REQUESTED],
+                                        0, FALSE)
+           || g_signal_has_handler_pending(G_OBJECT(sm_client),
+                                           signals[SIG_SAVE_STATE_EXTENDED],
+                                           0, FALSE)))
     {
         Status status;
 
@@ -1223,7 +1226,7 @@ xsmp_interact(SmcConn smc_conn,
                                                0, FALSE))
     {
         Status status;
-
+g_message ("%s requested a phase2", g_get_prgname ());
         status = SmcRequestSaveYourselfPhase2(sm_client->session_connection,
                                               xsmp_save_phase_2,
                                               (SmPointer)sm_client);