summaryrefslogtreecommitdiff
path: root/xfce4-session/xfsm-properties.c
diff options
context:
space:
mode:
authorBrian Tarricone <brian@tarricone.org>2008-10-03 22:51:22 +0000
committerBrian Tarricone <brian@tarricone.org>2008-10-03 22:51:22 +0000
commitc4f978186f4c3972c313907648fc5b5b6ec56a4e (patch)
tree0a67dbfb820de35c978214a5b483ad5430c57058 /xfce4-session/xfsm-properties.c
parent543f507292680e39d6db40afe56c9821f197cb1c (diff)
downloadxfce4-session-c4f978186f4c3972c313907648fc5b5b6ec56a4e.tar.gz
* xfce4-session/*.[ch]: Turn XfsmManager into a GObject, and
remove most of the app-global variables. This is a first step toward fixing bug 798, as well as making xfce4-session ready for a D-Bus interface. (Old svn revision: 28025)
Diffstat (limited to 'xfce4-session/xfsm-properties.c')
-rw-r--r--xfce4-session/xfsm-properties.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/xfce4-session/xfsm-properties.c b/xfce4-session/xfsm-properties.c
index a9bf92aa..a888e73e 100644
--- a/xfce4-session/xfsm-properties.c
+++ b/xfce4-session/xfsm-properties.c
@@ -658,6 +658,8 @@ xfsm_properties_free (XfsmProperties *properties)
{
g_return_if_fail (properties != NULL);
+ if (properties->startup_timeout_id != 0)
+ g_source_remove (properties->startup_timeout_id);
if (properties->client_id != NULL)
g_free (properties->client_id);
if (properties->hostname != NULL)