diff options
author | William Jon McCann <jmccann@redhat.com> | 2008-03-14 20:27:28 +0000 |
---|---|---|
committer | William Jon McCann <mccann@src.gnome.org> | 2008-03-14 20:27:28 +0000 |
commit | 6405c5b65566559bb22c47d5cac79dd44377bc8d (patch) | |
tree | 3290f047549926f0b0b3ab524be6b68a21964dc3 /daemon/gdm-session-direct.c | |
parent | fdeae4e0f9dc7730715978069b369987a9800787 (diff) | |
download | gdm-6405c5b65566559bb22c47d5cac79dd44377bc8d.tar.gz |
Refactor things a little. Rename renew to refresh. Add a pid to the
2008-03-14 William Jon McCann <jmccann@redhat.com>
* daemon/gdm-manager.c: (bus_name_owner_changed):
* daemon/gdm-product-slave.c: (send_dbus_string_method),
(send_dbus_void_method), (send_dbus_int_method),
(relay_session_started), (on_session_started),
(on_relay_refresh_credentials), (relay_dbus_handle_message):
* daemon/gdm-session-direct.c:
(gdm_session_direct_handle_session_started), (do_introspect),
(gdm_session_direct_accredit):
* daemon/gdm-session-private.h:
* daemon/gdm-session-relay.c: (gdm_session_relay_accredit),
(handle_secret_info_query), (handle_info), (handle_problem),
(handle_session_started), (do_introspect),
(gdm_session_iface_init):
* daemon/gdm-session-worker.c:
(gdm_session_worker_update_environment_from_passwd_info),
(_change_user), (_lookup_passwd_info),
(gdm_session_worker_accredit_user), (on_refresh_credentials),
(worker_dbus_handle_message):
* daemon/gdm-session.c: (gdm_session_class_init),
(_gdm_session_session_started):
* daemon/gdm-session.h:
* daemon/gdm-simple-slave.c: (on_session_started),
(gdm_simple_slave_accredit_when_ready), (on_greeter_connected):
* daemon/gdm-slave.c: (gdm_slave_get_primary_session_id_for_user),
(gdm_slave_switch_to_user_session):
* daemon/gdm-slave.h:
Refactor things a little. Rename renew to refresh. Add a pid to the
session started signal.
svn path=/trunk/; revision=6018
Diffstat (limited to 'daemon/gdm-session-direct.c')
-rw-r--r-- | daemon/gdm-session-direct.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c index cef2923e..75dfe100 100644 --- a/daemon/gdm-session-direct.c +++ b/daemon/gdm-session-direct.c @@ -708,6 +708,10 @@ gdm_session_direct_handle_session_started (GdmSessionDirect *session, DBusError error; int pid; + pid = 0; + + g_debug ("GdmSessionDirect: Handling SessionStarted"); + dbus_error_init (&error); if (! dbus_message_get_args (message, &error, DBUS_TYPE_INT32, &pid, @@ -725,7 +729,7 @@ gdm_session_direct_handle_session_started (GdmSessionDirect *session, session->priv->session_pid = pid; session->priv->is_running = TRUE; - _gdm_session_session_started (GDM_SESSION (session)); + _gdm_session_session_started (GDM_SESSION (session), pid); return DBUS_HANDLER_RESULT_HANDLED; } @@ -1136,6 +1140,7 @@ do_introspect (DBusConnection *connection, " </method>\n" " <method name=\"SessionStarted\">\n" " <arg name=\"pid\" direction=\"in\" type=\"i\"/>\n" + " <arg name=\"environment\" direction=\"in\" type=\"as\"/>\n" " </method>\n" " <method name=\"SessionExited\">\n" " <arg name=\"code\" direction=\"in\" type=\"i\"/>\n" @@ -1166,7 +1171,7 @@ do_introspect (DBusConnection *connection, " </signal>\n" " <signal name=\"EstablishCredentials\">\n" " </signal>\n" - " <signal name=\"RenewCredentials\">\n" + " <signal name=\"RefreshCredentials\">\n" " </signal>\n" " <signal name=\"SetEnvironmentVariable\">\n" " <arg name=\"name\" type=\"s\"/>\n" @@ -1704,8 +1709,8 @@ gdm_session_direct_accredit (GdmSession *session, case GDM_SESSION_CRED_ESTABLISH: send_dbus_void_signal (impl, "EstablishCredentials"); break; - case GDM_SESSION_CRED_RENEW: - send_dbus_void_signal (impl, "RenewCredentials"); + case GDM_SESSION_CRED_REFRESH: + send_dbus_void_signal (impl, "RefreshCredentials"); break; default: g_assert_not_reached (); |