[Xfce4-commits] <xfdesktop:master> Ensure a quit signal causes xfdesktop to shutdown

[Eric Koegel]

Updating branch refs/heads/master
         to cfe5a0ad88b84a23a4cd6d18a25635ec84cbaf68 (commit)
       from 3cbad61da8ed5ef919d3e1ce38a483134eca8044 (commit)

commit cfe5a0ad88b84a23a4cd6d18a25635ec84cbaf68
Author: Eric Koegel <eric.koegel at gmail.com>
Date:   Wed Jan 8 20:36:16 2014 +0300

    Ensure a quit signal causes xfdesktop to shutdown

 src/xfdesktop-application.c |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/xfdesktop-application.c b/src/xfdesktop-application.c
index 91d25e6..5756df0 100644
--- a/src/xfdesktop-application.c
+++ b/src/xfdesktop-application.c
@@ -252,12 +252,8 @@ session_die(gpointer user_data)
 
     TRACE("entering");
 
-    /* If we somehow got here after the app has been released we don't need
-     * to do anything */
-    if(user_data == NULL || !XFDESKTOP_IS_APPLICATION(user_data))
-        return;
-
-    app = XFDESKTOP_APPLICATION(user_data);
+    /* Ensure we always have a valid reference so we can quit xfdesktop */
+    app = xfdesktop_application_get();
 
     /* Cancel the wait for wm check if it's still running */
     g_cancellable_cancel(app->cancel);