diff options
| author | William Jon McCann <jmccann@redhat.com> | 2008-04-19 00:48:10 -0400 |
|---|---|---|
| committer | William Jon McCann <jmccann@redhat.com> | 2008-04-19 00:48:10 -0400 |
| commit | fbb42449670f21cdeb7f0106fc617e276d7e229c (patch) | |
| tree | be8d939a63bf9d3b88679f91420b991689f3d22d /src/ck-manager.c | |
| parent | e30bc7486fe4e872a7b91f1566bc2c880deb63b7 (diff) | |
always try to detect parameters for session
Treat the parameters passed in via OpenSessionWithParameters
as overrides.
Diffstat (limited to 'src/ck-manager.c')
| -rw-r--r-- | src/ck-manager.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/src/ck-manager.c b/src/ck-manager.c index c491e14..df5a86a 100644 --- a/src/ck-manager.c +++ b/src/ck-manager.c @@ -1,6 +1,6 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- * - * Copyright (C) 2006-2007 William Jon McCann <mccann@jhu.edu> + * Copyright (C) 2006-2008 William Jon McCann <mccann@jhu.edu> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -1923,22 +1923,16 @@ create_session_for_sender (CkManager *manager, ck_session_leader_set_service_name (leader, sender); ck_session_leader_set_session_id (leader, ssid); ck_session_leader_set_cookie (leader, cookie); + ck_session_leader_set_override_parameters (leader, parameters); /* need to store the leader info first so the pending request can be revoked */ g_hash_table_insert (manager->priv->leaders, g_strdup (cookie), g_object_ref (leader)); - if (parameters == NULL) { - generate_session_for_leader (manager, - leader, - context); - } else { - verify_and_open_session_for_leader (manager, - leader, - parameters, - context); - } + generate_session_for_leader (manager, + leader, + context); g_free (cookie); g_free (ssid); |