diff options
| -rw-r--r-- | daemon/gdm-factory-slave.c | 12 | ||||
| -rw-r--r-- | daemon/gdm-product-slave.c | 24 | ||||
| -rw-r--r-- | daemon/gdm-session-direct.c | 10 | ||||
| -rw-r--r-- | daemon/gdm-session-private.h | 2 | ||||
| -rw-r--r-- | daemon/gdm-session-relay.c | 24 | ||||
| -rw-r--r-- | daemon/gdm-session.c | 16 | ||||
| -rw-r--r-- | daemon/gdm-session.h | 6 | ||||
| -rw-r--r-- | daemon/gdm-simple-slave.c | 14 | ||||
| -rw-r--r-- | daemon/test-session.c | 12 |
9 files changed, 60 insertions, 60 deletions
diff --git a/daemon/gdm-factory-slave.c b/daemon/gdm-factory-slave.c index d09c913b..8ba64aa9 100644 --- a/daemon/gdm-factory-slave.c +++ b/daemon/gdm-factory-slave.c @@ -180,10 +180,10 @@ on_session_secret_info_query (GdmSession *session, } static void -on_session_opened (GdmSession *session, - GdmFactorySlave *slave) +on_session_conversation_started (GdmSession *session, + GdmFactorySlave *slave) { - g_debug ("GdmFactorySlave: session opened"); + g_debug ("GdmFactorySlave: session conversation started"); gdm_greeter_server_ready (slave->priv->greeter_server); } @@ -367,7 +367,7 @@ on_session_relay_connected (GdmSessionRelay *session, { g_debug ("GdmFactorySlave: Relay Connected"); - gdm_session_open (GDM_SESSION (slave->priv->session)); + gdm_session_start_conversation (GDM_SESSION (slave->priv->session)); } static void @@ -694,8 +694,8 @@ gdm_factory_slave_start (GdmSlave *slave) GDM_FACTORY_SLAVE (slave)->priv->session = gdm_session_relay_new (); g_signal_connect (GDM_FACTORY_SLAVE (slave)->priv->session, - "opened", - G_CALLBACK (on_session_opened), + "conversation-started", + G_CALLBACK (on_session_conversation_started), slave); g_signal_connect (GDM_FACTORY_SLAVE (slave)->priv->session, "setup-complete", diff --git a/daemon/gdm-product-slave.c b/daemon/gdm-product-slave.c index 9adcb09d..0423b355 100644 --- a/daemon/gdm-product-slave.c +++ b/daemon/gdm-product-slave.c @@ -246,19 +246,19 @@ relay_session_started (GdmProductSlave *slave, } static void -relay_session_opened (GdmProductSlave *slave) +relay_session_conversation_started (GdmProductSlave *slave) { send_dbus_void_method (slave->priv->session_relay_connection, - "Opened"); + "ConversationStarted"); } static void -on_session_opened (GdmSession *session, - GdmProductSlave *slave) +on_session_conversation_started (GdmSession *session, + GdmProductSlave *slave) { - g_debug ("GdmProductSlave: session opened"); + g_debug ("GdmProductSlave: session conversation started"); - relay_session_opened (slave); + relay_session_conversation_started (slave); } static void @@ -784,10 +784,10 @@ on_relay_user_selected (GdmProductSlave *slave, } static void -on_relay_open (GdmProductSlave *slave, - DBusMessage *message) +on_relay_start_conversation (GdmProductSlave *slave, + DBusMessage *message) { - gdm_session_open (GDM_SESSION (slave->priv->session)); + gdm_session_start_conversation (GDM_SESSION (slave->priv->session)); } static void @@ -833,7 +833,7 @@ create_new_session (GdmProductSlave *slave) g_signal_connect (slave->priv->session, "opened", - G_CALLBACK (on_session_opened), + G_CALLBACK (on_session_conversation_started), slave); g_signal_connect (slave->priv->session, "setup-complete", @@ -991,8 +991,8 @@ relay_dbus_handle_message (DBusConnection *connection, on_relay_user_selected (slave, message); } else if (dbus_message_is_signal (message, RELAY_SERVER_DBUS_INTERFACE, "StartSession")) { on_relay_start_session (slave, message); - } else if (dbus_message_is_signal (message, RELAY_SERVER_DBUS_INTERFACE, "Open")) { - on_relay_open (slave, message); + } else if (dbus_message_is_signal (message, RELAY_SERVER_DBUS_INTERFACE, "StartConversation")) { + on_relay_start_conversation (slave, message); } else if (dbus_message_is_signal (message, RELAY_SERVER_DBUS_INTERFACE, "Cancelled")) { on_relay_cancelled (slave, message); } else { diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c index bb853930..890f435e 100644 --- a/daemon/gdm-session-direct.c +++ b/daemon/gdm-session-direct.c @@ -1492,8 +1492,8 @@ handle_connection (DBusServer *server, &vtable, session); - g_debug ("GdmSessionDirect: Emitting opened signal"); - _gdm_session_opened (GDM_SESSION (session)); + g_debug ("GdmSessionDirect: Emitting conversation-started signal"); + _gdm_session_conversation_started (GDM_SESSION (session)); } } @@ -1656,13 +1656,13 @@ stop_worker (GdmSessionDirect *session) } static void -gdm_session_direct_open (GdmSession *session) +gdm_session_direct_start_conversation (GdmSession *session) { GdmSessionDirect *impl = GDM_SESSION_DIRECT (session); g_return_if_fail (session != NULL); - g_debug ("GdmSessionDirect: Opening session"); + g_debug ("GdmSessionDirect: Starting conversation"); start_worker (impl); } @@ -2466,7 +2466,7 @@ gdm_session_direct_constructor (GType type, static void gdm_session_iface_init (GdmSessionIface *iface) { - iface->open = gdm_session_direct_open; + iface->start_conversation = gdm_session_direct_start_conversation; iface->setup = gdm_session_direct_setup; iface->setup_for_user = gdm_session_direct_setup_for_user; iface->authenticate = gdm_session_direct_authenticate; diff --git a/daemon/gdm-session-private.h b/daemon/gdm-session-private.h index 6a6fcfc8..b196e492 100644 --- a/daemon/gdm-session-private.h +++ b/daemon/gdm-session-private.h @@ -27,7 +27,7 @@ G_BEGIN_DECLS /* state changes */ -void _gdm_session_opened (GdmSession *session); +void _gdm_session_conversation_started (GdmSession *session); void _gdm_session_setup_complete (GdmSession *session); void _gdm_session_setup_failed (GdmSession *session, const char *message); diff --git a/daemon/gdm-session-relay.c b/daemon/gdm-session-relay.c index b57bf893..92254e6a 100644 --- a/daemon/gdm-session-relay.c +++ b/daemon/gdm-session-relay.c @@ -180,10 +180,10 @@ send_dbus_void_signal (GdmSessionRelay *session_relay, } static void -gdm_session_relay_open (GdmSession *session) +gdm_session_relay_start_conversation (GdmSession *session) { GdmSessionRelay *impl = GDM_SESSION_RELAY (session); - send_dbus_void_signal (impl, "Open"); + send_dbus_void_signal (impl, "StartConversation"); } static void @@ -664,22 +664,22 @@ handle_session_stopped (GdmSessionRelay *session_relay, } static DBusHandlerResult -handle_opened (GdmSessionRelay *session_relay, - DBusConnection *connection, - DBusMessage *message) +handle_conversation_started (GdmSessionRelay *session_relay, + DBusConnection *connection, + DBusMessage *message) { DBusMessage *reply; DBusError error; dbus_error_init (&error); - g_debug ("GdmSessionRelay: Opened"); + g_debug ("GdmSessionRelay: Conversation Started"); reply = dbus_message_new_method_return (message); dbus_connection_send (connection, reply, NULL); dbus_message_unref (reply); - _gdm_session_opened (GDM_SESSION (session_relay)); + _gdm_session_conversation_started (GDM_SESSION (session_relay)); return DBUS_HANDLER_RESULT_HANDLED; } @@ -719,8 +719,8 @@ session_handle_child_message (DBusConnection *connection, return handle_session_started (session_relay, connection, message); } else if (dbus_message_is_method_call (message, GDM_SESSION_RELAY_DBUS_INTERFACE, "SessionStopped")) { return handle_session_stopped (session_relay, connection, message); - } else if (dbus_message_is_method_call (message, GDM_SESSION_RELAY_DBUS_INTERFACE, "Opened")) { - return handle_opened (session_relay, connection, message); + } else if (dbus_message_is_method_call (message, GDM_SESSION_RELAY_DBUS_INTERFACE, "ConversationStarted")) { + return handle_conversation_started (session_relay, connection, message); } return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; @@ -749,7 +749,7 @@ do_introspect (DBusConnection *connection, /* interface */ xml = g_string_append (xml, " <interface name=\"org.gnome.DisplayManager.SessionRelay\">\n" - " <method name=\"Opened\">\n" + " <method name=\"ConversationStarted\">\n" " </method>\n" " <method name=\"SetupComplete\">\n" " </method>\n" @@ -810,7 +810,7 @@ do_introspect (DBusConnection *connection, " <signal name=\"RefreshCredentials\">\n" " </signal>\n" - " <signal name=\"Open\">\n" + " <signal name=\"StartConversation\">\n" " </signal>\n" " <signal name=\"Close\">\n" " </signal>\n" @@ -1106,7 +1106,7 @@ static void gdm_session_iface_init (GdmSessionIface *iface) { - iface->open = gdm_session_relay_open; + iface->start_conversation = gdm_session_relay_start_conversation; iface->setup = gdm_session_relay_setup; iface->setup_for_user = gdm_session_relay_setup_for_user; iface->authenticate = gdm_session_relay_authenticate; diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c index feb79385..5ca0e88d 100644 --- a/daemon/gdm-session.c +++ b/daemon/gdm-session.c @@ -28,7 +28,7 @@ #include "gdm-session-private.h" enum { - OPENED = 0, + CONVERSATION_STARTED = 0, SETUP_COMPLETE, SETUP_FAILED, RESET_COMPLETE, @@ -78,11 +78,11 @@ gdm_session_get_type (void) } void -gdm_session_open (GdmSession *session) +gdm_session_start_conversation (GdmSession *session) { g_return_if_fail (GDM_IS_SESSION (session)); - GDM_SESSION_GET_IFACE (session)->open (session); + GDM_SESSION_GET_IFACE (session)->start_conversation (session); } void @@ -203,11 +203,11 @@ gdm_session_class_init (gpointer g_iface) { GType iface_type = G_TYPE_FROM_INTERFACE (g_iface); - signals [OPENED] = - g_signal_new ("opened", + signals [CONVERSATION_STARTED] = + g_signal_new ("conversation-started", iface_type, G_SIGNAL_RUN_FIRST, - G_STRUCT_OFFSET (GdmSessionIface, opened), + G_STRUCT_OFFSET (GdmSessionIface, conversation_started), NULL, NULL, g_cclosure_marshal_VOID__VOID, @@ -608,10 +608,10 @@ _gdm_session_session_died (GdmSession *session, } void -_gdm_session_opened (GdmSession *session) +_gdm_session_conversation_started (GdmSession *session) { g_return_if_fail (GDM_IS_SESSION (session)); - g_signal_emit (session, signals [OPENED], 0); + g_signal_emit (session, signals [CONVERSATION_STARTED], 0); } void diff --git a/daemon/gdm-session.h b/daemon/gdm-session.h index dfb7e273..afe7b831 100644 --- a/daemon/gdm-session.h +++ b/daemon/gdm-session.h @@ -45,7 +45,7 @@ struct _GdmSessionIface GTypeInterface base_iface; /* Methods */ - void (* open) (GdmSession *session); + void (* start_conversation) (GdmSession *session); void (* setup) (GdmSession *session, const char *service_name); void (* setup_for_user) (GdmSession *session, @@ -103,7 +103,7 @@ struct _GdmSessionIface int exit_code); void (* session_died) (GdmSession *session, int signal_number); - void (* opened) (GdmSession *session); + void (* conversation_started) (GdmSession *session); void (* closed) (GdmSession *session); void (* selected_user_changed) (GdmSession *session, const char *text); @@ -118,7 +118,7 @@ struct _GdmSessionIface GType gdm_session_get_type (void) G_GNUC_CONST; -void gdm_session_open (GdmSession *session); +void gdm_session_start_conversation (GdmSession *session); void gdm_session_setup (GdmSession *session, const char *service_name); void gdm_session_setup_for_user (GdmSession *session, diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c index 3bf38352..fdc2c0d1 100644 --- a/daemon/gdm-simple-slave.c +++ b/daemon/gdm-simple-slave.c @@ -179,7 +179,7 @@ reset_session (GdmSimpleSlave *slave) { destroy_session (slave); create_new_session (slave); - gdm_session_open (GDM_SESSION (slave->priv->session)); + gdm_session_start_conversation (GDM_SESSION (slave->priv->session)); } static gboolean @@ -496,15 +496,15 @@ on_session_secret_info_query (GdmSession *session, } static void -on_session_opened (GdmSession *session, - GdmSimpleSlave *slave) +on_session_conversation_started (GdmSession *session, + GdmSimpleSlave *slave) { gboolean res; gboolean enabled; char *username; int delay; - g_debug ("GdmSimpleSlave: session opened"); + g_debug ("GdmSimpleSlave: session conversation started"); if (slave->priv->greeter_server != NULL) { res = gdm_greeter_server_ready (slave->priv->greeter_server); if (! res) { @@ -615,8 +615,8 @@ create_new_session (GdmSimpleSlave *slave) g_free (display_hostname); g_signal_connect (slave->priv->session, - "opened", - G_CALLBACK (on_session_opened), + "conversation-started", + G_CALLBACK (on_session_conversation_started), slave); g_signal_connect (slave->priv->session, "setup-complete", @@ -833,7 +833,7 @@ on_greeter_connected (GdmGreeterServer *greeter_server, g_debug ("GdmSimpleSlave: Greeter connected"); - gdm_session_open (GDM_SESSION (slave->priv->session)); + gdm_session_start_conversation (GDM_SESSION (slave->priv->session)); g_object_get (slave, "display-is-local", &display_is_local, diff --git a/daemon/test-session.c b/daemon/test-session.c index c6a158c9..9a4d7cfa 100644 --- a/daemon/test-session.c +++ b/daemon/test-session.c @@ -33,10 +33,10 @@ static GMainLoop *loop; static void -on_open (GdmSession *session, - const char *username) +on_conversation_started (GdmSession *session, + const char *username) { - g_debug ("Got opened: calling setup..."); + g_debug ("Got conversation started: calling setup..."); gdm_session_setup (session, "gdm"); } @@ -256,11 +256,11 @@ main (int argc, username = argv[1]; } - gdm_session_open (GDM_SESSION (session)); + gdm_session_start_conversation (GDM_SESSION (session)); g_signal_connect (session, - "opened", - G_CALLBACK (on_open), + "conversation-started", + G_CALLBACK (on_conversation_started), username); g_signal_connect (session, "setup-complete", |