18940N/Acommit 95956899d14fc0e5ee7c7a561c69293f2d951fae
18940N/AAuthor: Halton Huo <halton.huo@sun.com>
18940N/ADate: Fri Jul 2 16:17:35 2010 +0800
18940N/A Merge multi-seat branch with 098075c7f48ba506bf224a5f71c6cd07f903fd89
20788N/A+VOID:STRING,STRING,STRING,STRING,STRING
20788N/A+VOID:STRING,STRING,STRING,STRING
17291N/A+VOID:STRING,STRING,STRING,POINTER,STRING,POINTER
20788N/A@@ -30,6 +30,8 @@ noinst_LTLIBRARIES = \
20788N/A@@ -52,6 +54,13 @@ gdm_crash_logger_LDADD = $(GTHREAD_LIBS)
20788N/A+ @GLIB_GENMARSHAL@ $< --prefix=gdm_marshal --body >> $@
20788N/A+ @GLIB_GENMARSHAL@ $< --prefix=gdm_marshal --header > $@
20788N/A@@ -144,6 +155,7 @@ CLEANFILES = \
20839N/A@@ -1124,95 +1124,6 @@ AC_CHECK_LIB(devinfo, di_devperm_login,
17753N/A PAM_LIBS="$PAM_LIBS -ldevinfo" ])
17753N/A dnl ---------------------------------------------------------------------------
17753N/A-dnl - Check for X Server location
17753N/A-dnl ---------------------------------------------------------------------------
17753N/A-# symlink to each other, and configure should use the more stable
17753N/A-# location (the real directory) if possible.
17753N/A-# use Xsun or Xorg, so this is used on Solaris.
17753N/A-# should use the more stable location (the real directory) if possible.
17753N/A- # Xserver. We add this to the path below.
17753N/A- # what to do, what to do, this is wrong, but this just sets the
17753N/A- # defaults, perhaps this user is cross compiling or some such
17753N/A-dnl ---------------------------------------------------------------------------
17753N/A-dnl - Check for Xnest / Xephyr support
17753N/A-dnl ---------------------------------------------------------------------------
17753N/A-# Use Xephyr if it is available. It works better than Xnest since Xephyr
17753N/A-# supports the Xserver extensions, even if on a remote machine.
17753N/A-X_XNEST_UNSCALED_FONTPATH="true"
17753N/A- X_XNEST_CONFIG_OPTIONS="-audit 0"
17753N/A- # If on Solaris, Xnest is only shipped with the Xsun Xserver, so
17753N/A- X_XNEST_CONFIG_OPTIONS="-audit 0 -name Xnest -pn"
17753N/A- X_XNEST_UNSCALED_FONTPATH="false"
17753N/A- X_XNEST_CONFIG_OPTIONS="-audit 0 -name Xnest"
17753N/A-dnl ---------------------------------------------------------------------------
17753N/A dnl ---------------------------------------------------------------------------
18160N/A+dnl ---------------------------------------------------------------------------
18160N/A+dnl ---------------------------------------------------------------------------
18160N/A+ AS_HELP_STRING([--with-script-path=<dir>],
18160N/A+if ! test -z "$with_script_path"; then
20839N/A@@ -1391,19 +1317,6 @@ AC_DEFINE_UNQUOTED(XSESSION_SHELL,"$XSES
18160N/A AC_DEFINE_UNQUOTED(SOUND_PROGRAM,"$SOUND_PROGRAM",[])
18160N/A-AC_DEFINE_UNQUOTED(X_SERVER,"$X_SERVER",[])
18160N/A-AC_DEFINE_UNQUOTED(X_SERVER_PATH,"$X_SERVER_PATH",[])
18160N/A-AC_SUBST(X_XNEST_CONFIG_OPTIONS)
18160N/A-AC_SUBST(X_XNEST_UNSCALED_FONTPATH)
18160N/A-AC_DEFINE_UNQUOTED(X_XNEST_CMD,"$X_XNEST_CMD",[])
18160N/A-AC_DEFINE_UNQUOTED(X_XNEST_CONFIG_OPTIONS,"$X_XNEST_CONFIG_OPTIONS",[])
18160N/A-AC_DEFINE_UNQUOTED(X_XNEST_UNSCALED_FONTPATH,"$X_XNEST_UNSCALED_FONTPATH",[])
20839N/A@@ -299,6 +299,8 @@ gdm_binary_SOURCES = \
16983N/A@@ -65,6 +65,7 @@ struct _CkConnector
17662N/A@@ -76,8 +77,11 @@ static struct {
16880N/A { "display-device", DBUS_TYPE_STRING },
16880N/A { "x11-display-device", DBUS_TYPE_STRING },
16880N/A { "x11-display", DBUS_TYPE_STRING },
16880N/A+ { "seat-id", DBUS_TYPE_STRING },
16983N/A+ { "session", DBUS_TYPE_STRING },
16880N/A { "remote-host-name", DBUS_TYPE_STRING },
16880N/A { "session-type", DBUS_TYPE_STRING },
17291N/A+ { "display-type", DBUS_TYPE_STRING },
16880N/A { "is-local", DBUS_TYPE_BOOLEAN },
16880N/A { "unix-user", DBUS_TYPE_INT32 },
17662N/A@@ -181,6 +185,10 @@ _ck_connector_free (CkConnector *connector)
16983N/A+ if (connector->session_id != NULL) {
17662N/A@@ -241,6 +249,7 @@ ck_connector_new (void)
16983N/A connector->session_created = FALSE;
17662N/A@@ -266,6 +275,7 @@ ck_connector_open_session (CkConnector *connector,
16983N/A _ck_return_val_if_fail (connector != NULL, FALSE);
16983N/A _ck_return_val_if_fail ((error) == NULL || !dbus_error_is_set ((error)), FALSE);
17662N/A@@ -334,10 +344,68 @@ ck_connector_open_session (CkConnector *connector,
16983N/A+ dbus_message_append_args (message, DBUS_TYPE_STRING, &connector->cookie,
16983N/A+ dbus_error_init (&local_error);
16983N/A+ reply = dbus_connection_send_with_reply_and_block (connector->connection,
16983N/A+ if (dbus_error_is_set (&local_error)) {
16983N/A+ dbus_error_free (&local_error);
16983N/A+ dbus_error_init (&local_error);
16983N/A+ if (! dbus_message_get_args (reply,
16983N/A+ DBUS_TYPE_OBJECT_PATH, &session_id,
16983N/A+ if (dbus_error_is_set (&local_error)) {
16983N/A+ dbus_error_free (&local_error);
16983N/A+ connector->session_id = strdup (session_id);
16983N/A+ if (connector->session_id == NULL) {
16983N/A connector->session_created = TRUE;
17662N/A@@ -362,6 +430,7 @@ ck_connector_open_session_with_parameters_valist (CkConnector *connector,
17226N/A _ck_return_val_if_fail (connector != NULL, FALSE);
17662N/A@@ -470,6 +539,57 @@ ck_connector_open_session_with_parameters_valist (CkConnector *connector,
17226N/A+ dbus_message_append_args (message, DBUS_TYPE_STRING, &connector->cookie,
17226N/A+ dbus_error_init (&local_error);
17226N/A+ reply = dbus_connection_send_with_reply_and_block (connector->connection,
17226N/A+ if (dbus_error_is_set (&local_error)) {
17226N/A+ dbus_error_free (&local_error);
17226N/A+ dbus_error_init (&local_error);
17226N/A+ if (! dbus_message_get_args (reply,
17226N/A+ DBUS_TYPE_OBJECT_PATH, &session_id,
17226N/A+ if (dbus_error_is_set (&local_error)) {
17226N/A+ dbus_error_free (&local_error);
17226N/A+ connector->session_id = strdup (session_id);
17226N/A+ if (connector->session_id == NULL) {
17226N/A connector->session_created = TRUE;
17662N/A@@ -590,6 +710,73 @@ ck_connector_get_cookie (CkConnector *connector)
16983N/A+ * Gets the id for the current open session.
16983N/A+ * Returns #NULL if no session is open.
16983N/A+ * @returns a constant string with the session id.
16983N/A+ck_connector_get_session_id (CkConnector *connector)
16983N/A+ _ck_return_val_if_fail (connector != NULL, NULL);
16983N/A+ if (! connector->session_created) {
17226N/A+ck_connector_set_remove_on_close (CkConnector *connector,
17226N/A+ const char *ssid = ck_connector_get_session_id (connector);
17226N/A+ _ck_return_val_if_fail (connector != NULL, FALSE);
17226N/A+ _ck_return_val_if_fail ((error) == NULL || !dbus_error_is_set ((error)), FALSE);
17226N/A+ _ck_return_val_if_fail (ssid != NULL, FALSE);
17226N/A+ if (!connector->session_created || connector->cookie == NULL) {
17226N/A+ "Unable to close session: %s",
17226N/A+ if (! dbus_message_append_args (message,
17226N/A+ DBUS_TYPE_BOOLEAN, &remove_on_close,
17226N/A+ ret = dbus_connection_send (connector->connection,
16983N/A * Issues the CloseSession method call on the ConsoleKit manager
17226N/A@@ -56,6 +57,10 @@ dbus_bool_t ck_connector_open_session (CkConnector *ckc,
16983N/A const char *ck_connector_get_cookie (CkConnector *ckc);
16983N/A+const char *ck_connector_get_session_id (CkConnector *ckc);
17226N/A+dbus_bool_t ck_connector_set_remove_on_close (CkConnector *ckc,
16983N/A dbus_bool_t ck_connector_close_session (CkConnector *ckc,
20816N/A static guint32 display_serial = 1;
20816N/A@@ -51,11 +52,14 @@ static guint32 display_serial = 1;
20816N/A@@ -66,6 +70,8 @@ struct GdmDisplayPrivate
16880N/A GdmDisplayAccessFile *access_file;
16983N/A+ gboolean block_console_session_requests;
16983N/A+ PROP_BLOCK_CONSOLE_SESSION_REQUESTS,
16983N/A static void gdm_display_class_init (GdmDisplayClass *klass);
20816N/A@@ -489,6 +500,20 @@ gdm_display_get_seat_id (GdmDisplay *dis
16983N/A+gdm_display_get_session_id (GdmDisplay *display,
16983N/A+ g_return_val_if_fail (GDM_IS_DISPLAY (display), FALSE);
16983N/A+ *session_id = g_strdup (display->priv->session_id);
16983N/A finish_idle (GdmDisplay *display)
20828N/A@@ -513,6 +538,14 @@ slave_exited (GdmSlaveProxy *proxy
20816N/A g_debug ("GdmDisplay: Slave exited: %d", code);
20828N/A+ if (GDM_IS_DYNAMIC_DISPLAY (display)) {
20828N/A+ gdm_dynamic_display_respawn (GDM_DYNAMIC_DISPLAY (display), TRUE);
20828N/A+ gdm_dynamic_display_respawn (GDM_DYNAMIC_DISPLAY (display), FALSE);
20828N/A@@ -550,10 +583,12 @@ gdm_display_real_prepare (GdmDisplay *di
16880N/A g_assert (display->priv->slave_proxy == NULL);
16880N/A- if (!gdm_display_create_authority (display)) {
16880N/A- g_warning ("Unable to set up access control for display %d",
16880N/A- display->priv->x11_display_number);
16880N/A+ if (display->priv->use_auth) {
16880N/A+ if (!gdm_display_create_authority (display)) {
16880N/A+ g_warning ("Unable to set up access control for display %d",
16880N/A+ display->priv->x11_display_number);
16880N/A _gdm_display_set_status (display, GDM_DISPLAY_PREPARED);
20828N/A@@ -742,6 +777,20 @@ gdm_display_get_id (GdmDisplay *
16880N/A+gdm_display_get_x11_command (GdmDisplay *display,
16880N/A+ g_return_val_if_fail (GDM_IS_DISPLAY (display), FALSE);
16880N/A+ *command = g_strdup (display->priv->x11_command);
16880N/A gdm_display_get_x11_display_name (GdmDisplay *display,
20828N/A@@ -756,6 +805,20 @@ gdm_display_get_x11_display_name (GdmDis
17291N/A+gdm_display_get_x11_display_type (GdmDisplay *display,
17291N/A+ g_return_val_if_fail (GDM_IS_DISPLAY (display), FALSE);
17291N/A+ *type = g_strdup (display->priv->x11_display_type);
17291N/A gdm_display_is_local (GdmDisplay *display,
20828N/A@@ -769,6 +832,20 @@ gdm_display_is_local (GdmDisplay *displa
16880N/A+gdm_display_use_auth (GdmDisplay *display,
16880N/A+ g_return_val_if_fail (GDM_IS_DISPLAY (display), FALSE);
16880N/A+ *use_auth = display->priv->use_auth;
16880N/A _gdm_display_set_id (GdmDisplay *display,
20828N/A@@ -778,6 +855,14 @@ _gdm_display_set_id (GdmDisplay *dis
16880N/A+_gdm_display_set_x11_command (GdmDisplay *display,
16880N/A+ g_free (display->priv->x11_command);
16880N/A+ display->priv->x11_command = g_strdup (x11_command);
16880N/A _gdm_display_set_seat_id (GdmDisplay *display,
20828N/A@@ -786,6 +871,24 @@ _gdm_display_set_seat_id (GdmDisplay
16983N/A+_gdm_display_set_session_id (GdmDisplay *display,
16983N/A+ g_free (display->priv->session_id);
16983N/A+ display->priv->session_id = g_strdup (session_id);
16983N/A+gdm_display_set_session_id (GdmDisplay *display,
16983N/A+ _gdm_display_set_session_id (display, session_id);
16983N/A+ g_object_notify (G_OBJECT (display), "session-id");
16983N/A _gdm_display_set_remote_hostname (GdmDisplay *display,
20828N/A@@ -809,6 +912,14 @@ _gdm_display_set_x11_display_name (GdmDi
17291N/A+_gdm_display_set_x11_display_type (GdmDisplay *display,
17291N/A+ g_free (display->priv->x11_display_type);
17291N/A+ display->priv->x11_display_type = g_strdup (display_type);
17291N/A _gdm_display_set_x11_cookie (GdmDisplay *display,
20828N/A@@ -824,6 +935,13 @@ _gdm_display_set_is_local (GdmDisplay
16880N/A+_gdm_display_set_use_auth (GdmDisplay *display,
16880N/A+ display->priv->use_auth = use_auth;
16880N/A _gdm_display_set_slave_command (GdmDisplay *display,
20828N/A@@ -832,6 +950,13 @@ _gdm_display_set_slave_command (GdmDispl
16983N/A+_gdm_display_set_block_console_session_requests (GdmDisplay *display,
16983N/A+ gboolean block_console_session_requests)
16983N/A+ display->priv->block_console_session_requests = block_console_session_requests;
16983N/A gdm_display_set_property (GObject *object,
20828N/A@@ -845,12 +970,18 @@ gdm_display_set_property (GObject
16880N/A _gdm_display_set_id (self, g_value_get_string (value));
16880N/A+ _gdm_display_set_x11_command (self, g_value_get_string (value));
16880N/A _gdm_display_set_status (self, g_value_get_int (value));
16983N/A _gdm_display_set_seat_id (self, g_value_get_string (value));
16983N/A+ _gdm_display_set_session_id (self, g_value_get_string (value));
16983N/A _gdm_display_set_remote_hostname (self, g_value_get_string (value));
20828N/A@@ -860,15 +991,24 @@ gdm_display_set_property (GObject
17291N/A _gdm_display_set_x11_display_name (self, g_value_get_string (value));
17291N/A+ _gdm_display_set_x11_display_type (self, g_value_get_string (value));
17291N/A _gdm_display_set_x11_cookie (self, g_value_get_string (value));
16880N/A _gdm_display_set_is_local (self, g_value_get_boolean (value));
16880N/A+ _gdm_display_set_use_auth (self, g_value_get_boolean (value));
16880N/A _gdm_display_set_slave_command (self, g_value_get_string (value));
16983N/A+ case PROP_BLOCK_CONSOLE_SESSION_REQUESTS:
16983N/A+ _gdm_display_set_block_console_session_requests (self, g_value_get_boolean (value));
16983N/A G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
20828N/A@@ -889,12 +1029,18 @@ gdm_display_get_property (GObject
16880N/A g_value_set_string (value, self->priv->id);
16880N/A+ g_value_set_string (value, self->priv->x11_command);
16880N/A g_value_set_int (value, self->priv->status);
16983N/A g_value_set_string (value, self->priv->seat_id);
16983N/A+ g_value_set_string (value, self->priv->session_id);
16983N/A g_value_set_string (value, self->priv->remote_hostname);
20828N/A@@ -904,6 +1050,9 @@ gdm_display_get_property (GObject
17291N/A g_value_set_string (value, self->priv->x11_display_name);
17291N/A+ g_value_set_string (value, self->priv->x11_display_type);
17291N/A g_value_set_string (value, self->priv->x11_cookie);
20828N/A@@ -914,9 +1063,15 @@ gdm_display_get_property (GObject
16880N/A g_value_set_boolean (value, self->priv->is_local);
16880N/A+ g_value_set_boolean (value, self->priv->use_auth);
16880N/A g_value_set_string (value, self->priv->slave_command);
16983N/A+ case PROP_BLOCK_CONSOLE_SESSION_REQUESTS:
16983N/A+ g_value_set_boolean (value, self->priv->block_console_session_requests);
16983N/A G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
20828N/A@@ -1033,6 +1188,13 @@ gdm_display_class_init (GdmDisplayClass
16880N/A G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
16880N/A g_object_class_install_property (object_class,
16880N/A+ g_param_spec_string ("x11-command",
16880N/A+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
16880N/A+ g_object_class_install_property (object_class,
16880N/A g_param_spec_string ("remote-hostname",
20828N/A@@ -1056,6 +1218,13 @@ gdm_display_class_init (GdmDisplayClass
17291N/A G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
17291N/A g_object_class_install_property (object_class,
17291N/A+ g_param_spec_string ("x11-display-type",
17291N/A+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
17291N/A+ g_object_class_install_property (object_class,
17291N/A g_param_spec_string ("seat-id",
20828N/A@@ -1063,6 +1232,13 @@ gdm_display_class_init (GdmDisplayClass
16983N/A G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
16983N/A g_object_class_install_property (object_class,
16983N/A+ g_param_spec_string ("session-id",
16983N/A+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
16983N/A+ g_object_class_install_property (object_class,
16983N/A g_param_spec_string ("x11-cookie",
20828N/A@@ -1076,7 +1252,6 @@ gdm_display_class_init (GdmDisplayClass
16880N/A g_object_class_install_property (object_class,
16880N/A g_param_spec_boolean ("is-local",
20828N/A@@ -1084,7 +1259,13 @@ gdm_display_class_init (GdmDisplayClass
16880N/A G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
16880N/A+ g_object_class_install_property (object_class,
16880N/A+ g_param_spec_boolean ("use-auth",
16880N/A+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
16880N/A g_object_class_install_property (object_class,
16880N/A g_param_spec_string ("slave-command",
20828N/A@@ -1093,6 +1274,13 @@ gdm_display_class_init (GdmDisplayClass
16983N/A G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
16983N/A g_object_class_install_property (object_class,
16983N/A+ PROP_BLOCK_CONSOLE_SESSION_REQUESTS,
16983N/A+ g_param_spec_boolean ("block-console-session-requests",
16983N/A+ "Block Console Session Requests",
16983N/A+ "Block session requests from ConsoleKit",
16983N/A+ g_object_class_install_property (object_class,
20828N/A@@ -1131,9 +1319,12 @@ gdm_display_finalize (GObject *object)
16880N/A g_debug ("GdmDisplay: Finalizing display: %s", display->priv->id);
16880N/A+ g_free (display->priv->x11_command);
16880N/A g_free (display->priv->seat_id);
16983N/A+ g_free (display->priv->session_id);
16880N/A g_free (display->priv->remote_hostname);
16880N/A g_free (display->priv->x11_display_name);
17291N/A+ g_free (display->priv->x11_display_type);
16983N/A g_free (display->priv->x11_cookie);
17291N/A g_free (display->priv->slave_command);
20828N/A@@ -1151,3 +1342,25 @@ gdm_display_finalize (GObject *object)
16983N/A G_OBJECT_CLASS (gdm_display_parent_class)->finalize (object);
16983N/A+gdm_display_block_console_session_requests (GdmDisplay *display,
16983N/A+ if (!display->priv->block_console_session_requests) {
16983N/A+ _gdm_display_set_block_console_session_requests (display, TRUE);
16983N/A+ g_object_notify (G_OBJECT (display), "block-console-session-requests");
16983N/A+gdm_display_unblock_console_session_requests (GdmDisplay *display,
16983N/A+ if (display->priv->block_console_session_requests) {
16983N/A+ _gdm_display_set_block_console_session_requests (display, FALSE);
16983N/A+ g_object_notify (G_OBJECT (display), "block-console-session-requests");
16880N/A@@ -102,6 +102,9 @@ gboolean gdm_display_unmanage (GdmDisplay *disp
16880N/A gboolean gdm_display_get_id (GdmDisplay *display,
16880N/A+gboolean gdm_display_get_x11_command (GdmDisplay *display,
16880N/A gboolean gdm_display_get_remote_hostname (GdmDisplay *display,
17662N/A@@ -111,12 +114,21 @@ gboolean gdm_display_get_x11_display_number (GdmDisplay *disp
17291N/A gboolean gdm_display_get_x11_display_name (GdmDisplay *display,
17291N/A+gboolean gdm_display_get_x11_display_type (GdmDisplay *display,
16983N/A gboolean gdm_display_get_seat_id (GdmDisplay *display,
16983N/A+gboolean gdm_display_get_session_id (GdmDisplay *display,
16880N/A gboolean gdm_display_is_local (GdmDisplay *display,
16880N/A+gboolean gdm_display_use_auth (GdmDisplay *display,
16880N/A gboolean gdm_display_get_timed_login_details (GdmDisplay *display,
17662N/A@@ -130,6 +142,9 @@ gboolean gdm_display_get_x11_cookie (GdmDisplay *disp
16983N/A gboolean gdm_display_get_x11_authority_file (GdmDisplay *display,
16983N/A+gboolean gdm_display_set_session_id (GdmDisplay *display,
16983N/A gboolean gdm_display_add_user_authorization (GdmDisplay *display,
17662N/A@@ -140,6 +155,11 @@ gboolean gdm_display_remove_user_authorization (GdmDisplay *disp
16983N/A gboolean gdm_display_set_slave_bus_name (GdmDisplay *display,
16983N/A+gboolean gdm_display_block_console_session_requests (GdmDisplay *display,
16983N/A+gboolean gdm_display_unblock_console_session_requests (GdmDisplay *display,
16880N/A <arg name="id" direction="out" type="o"/>
16880N/A+ <arg name="command" direction="out" type="s"/>
16880N/A <method name="GetX11DisplayName">
16880N/A <arg name="name" direction="out" type="s"/>
17291N/A+ <method name="GetX11DisplayType">
17291N/A+ <arg name="type" direction="out" type="s"/>
16880N/A <method name="GetX11DisplayNumber">
16880N/A- <arg name="name" direction="out" type="i"/>
16880N/A+ <arg name="number" direction="out" type="i"/>
16880N/A <arg name="x11_cookie" direction="out" type="ay"/>
16880N/A <arg name="filename" direction="out" type="s"/>
16880N/A- <arg name="filename" direction="out" type="s"/>
16880N/A+ <arg name="seat_id" direction="out" type="s"/>
16983N/A+ <arg name="session_id" direction="out" type="s"/>
16983N/A+ <method name="BlockConsoleSessionRequests">
16983N/A+ <method name="UnblockConsoleSessionRequests">
16880N/A <method name="GetRemoteHostname">
16880N/A <arg name="hostname" direction="out" type="s"/>
16880N/A <arg name="local" direction="out" type="b"/>
17662N/A+ <arg name="use_auth" direction="out" type="b"/>
16880N/A <method name="AddUserAuthorization">
16880N/A <arg name="username" direction="in" type="s"/>
16880N/A <arg name="filename" direction="out" type="s"/>
16983N/A <method name="RemoveUserAuthorization">
16983N/A <arg name="username" direction="in" type="s"/>
16983N/A+ <arg name="session_id" direction="in" type="s"/>
16983N/A <method name="SetSlaveBusName">
16983N/A <arg name="name" direction="in" type="s"/>
16880N/A+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
16880N/A+ * Copyright (C) 2009 Sun Microsystems, Inc.
16880N/A+ * This program is free software; you can redistribute it
and/or modify
16880N/A+ * it under the terms of the GNU General Public License as published by
16880N/A+ * the Free Software Foundation; either version 2 of the License, or
16880N/A+ * (at your option) any later version.
16880N/A+ * This program is distributed in the hope that it will be useful,
16880N/A+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
16880N/A+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16880N/A+ * GNU General Public License for more details.
16880N/A+ * You should have received a copy of the GNU General Public License
16880N/A+ * along with this program; if not, write to the Free Software
16880N/A+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
16880N/A+#define GDM_DYNAMIC_DISPLAY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_DYNAMIC_DISPLAY, GdmDynamicDisplayPrivate))
16880N/A+struct _GdmDynamicDisplayPrivate
16880N/A+static void gdm_dynamic_display_class_init (GdmDynamicDisplayClass *klass);
16880N/A+static void gdm_dynamic_display_init (GdmDynamicDisplay *display);
16880N/A+static void gdm_dynamic_display_finalize (GObject *object);
16880N/A+G_DEFINE_TYPE (GdmDynamicDisplay, gdm_dynamic_display, GDM_TYPE_DISPLAY)
20828N/A+gdm_dynamic_display_respawn (GdmDynamicDisplay *display, gboolean respawn)
20828N/A+ display->priv->do_respawn = respawn;
20828N/A+ if (display->priv->do_respawn == TRUE)
20816N/A+ g_debug ("GdmDynamicDisplay: Set respawn to TRUE.");
20816N/A+ g_debug ("GdmDynamicDisplay: Set respawn to FALSE.");
20828N/A+gdm_dynamic_display_removed (GdmDynamicDisplay *display)
20828N/A+ display->priv->removed = TRUE;
16880N/A+gdm_dynamic_display_create_authority (GdmDisplay *display)
16880N/A+ g_return_val_if_fail (GDM_IS_DISPLAY (display), FALSE);
16880N/A+ GDM_DISPLAY_CLASS (gdm_dynamic_display_parent_class)->create_authority (display);
16880N/A+gdm_dynamic_display_add_user_authorization (GdmDisplay *display,
16880N/A+ return GDM_DISPLAY_CLASS (gdm_dynamic_display_parent_class)->add_user_authorization (display, username, filename, error);
16880N/A+gdm_dynamic_display_remove_user_authorization (GdmDisplay *display,
16880N/A+ return GDM_DISPLAY_CLASS (gdm_dynamic_display_parent_class)->remove_user_authorization (display, username, error);
16880N/A+gdm_dynamic_display_manage (GdmDisplay *display)
16880N/A+ g_return_val_if_fail (GDM_IS_DISPLAY (display), FALSE);
20319N/A+ g_debug ("GdmDynamicDisplay: Manage dynamic display");
16880N/A+ GDM_DISPLAY_CLASS (gdm_dynamic_display_parent_class)->manage (display);
16880N/A+gdm_dynamic_display_finish (GdmDisplay *display)
20816N/A+ g_return_val_if_fail (GDM_IS_DISPLAY (display), FALSE);
20816N/A+ g_debug ("GdmDynamicDisplay: Finish dynamic display");
20816N/A+ /* Don't call parent's finish since we don't ever
20816N/A+ want to be put in the FINISHED state */
20816N/A+ /* restart dynamic displays */
20816N/A+ gdm_display_unmanage (display);
20816N/A+ status = gdm_display_get_status (display);
20828N/A+ if (GDM_DYNAMIC_DISPLAY (display)->priv->do_respawn == TRUE &&
20828N/A+ GDM_DYNAMIC_DISPLAY(display)->priv->removed == FALSE) {
20828N/A+ if (status != GDM_DISPLAY_FAILED) {
20828N/A+ g_debug ("Display failed, not respawning...");
20828N/A+ g_debug ("Not respawning...");
20828N/A+ GDM_DYNAMIC_DISPLAY (display)->priv->do_respawn = FALSE;
16880N/A+gdm_dynamic_display_unmanage (GdmDisplay *display)
16880N/A+ g_return_val_if_fail (GDM_IS_DISPLAY (display), FALSE);
20319N/A+ g_debug ("GdmDynamicDisplay: Unmanage dynamic display");
16880N/A+ GDM_DISPLAY_CLASS (gdm_dynamic_display_parent_class)->unmanage (display);
16880N/A+gdm_dynamic_display_set_property (GObject *object,
16880N/A+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
16880N/A+gdm_dynamic_display_get_property (GObject *object,
16880N/A+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
16880N/A+gdm_dynamic_display_class_init (GdmDynamicDisplayClass *klass)
16880N/A+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
16880N/A+ GdmDisplayClass *display_class = GDM_DISPLAY_CLASS (klass);
16880N/A+ object_class->get_property = gdm_dynamic_display_get_property;
16880N/A+ object_class->set_property = gdm_dynamic_display_set_property;
16880N/A+ object_class->finalize = gdm_dynamic_display_finalize;
16880N/A+ display_class->create_authority = gdm_dynamic_display_create_authority;
16880N/A+ display_class->add_user_authorization = gdm_dynamic_display_add_user_authorization;
16880N/A+ display_class->remove_user_authorization = gdm_dynamic_display_remove_user_authorization;
16880N/A+ display_class->manage = gdm_dynamic_display_manage;
16880N/A+ display_class->finish = gdm_dynamic_display_finish;
16880N/A+ display_class->unmanage = gdm_dynamic_display_unmanage;
16880N/A+ g_type_class_add_private (klass, sizeof (GdmDynamicDisplayPrivate));
16880N/A+gdm_dynamic_display_init (GdmDynamicDisplay *display)
16880N/A+ display->priv = GDM_DYNAMIC_DISPLAY_GET_PRIVATE (display);
20828N/A+ display->priv->removed = FALSE;
20828N/A+ display->priv->do_respawn = FALSE;
16880N/A+gdm_dynamic_display_finalize (GObject *object)
16880N/A+ g_return_if_fail (object != NULL);
16880N/A+ g_return_if_fail (GDM_IS_DYNAMIC_DISPLAY (object));
20319N/A+ g_debug ("GdmDynamicDisplay: Finalize dynamic display");
16880N/A+ display = GDM_DYNAMIC_DISPLAY (object);
16880N/A+ g_return_if_fail (display->priv != NULL);
16880N/A+ G_OBJECT_CLASS (gdm_dynamic_display_parent_class)->finalize (object);
16880N/A+gdm_dynamic_display_new (int display_number)
16880N/A+ x11_display = g_strdup_printf (":%d", display_number);
16880N/A+ object = g_object_new (GDM_TYPE_DYNAMIC_DISPLAY,
16880N/A+ "x11-display-number", display_number,
16880N/A+ "x11-display-name", x11_display,
16880N/A+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
16880N/A+ * Copyright (C) 2009 Sun Microsystems, Inc.
16880N/A+ * This program is free software; you can redistribute it
and/or modify
16880N/A+ * it under the terms of the GNU General Public License as published by
16880N/A+ * the Free Software Foundation; either version 2 of the License, or
16880N/A+ * (at your option) any later version.
16880N/A+ * This program is distributed in the hope that it will be useful,
16880N/A+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
16880N/A+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16880N/A+ * GNU General Public License for more details.
16880N/A+ * You should have received a copy of the GNU General Public License
16880N/A+ * along with this program; if not, write to the Free Software
16880N/A+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
16880N/A+#ifndef __GDM_DYNAMIC_DISPLAY_H
16880N/A+#define __GDM_DYNAMIC_DISPLAY_H
16880N/A+#define GDM_TYPE_DYNAMIC_DISPLAY (gdm_dynamic_display_get_type ())
16880N/A+#define GDM_DYNAMIC_DISPLAY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GDM_TYPE_DYNAMIC_DISPLAY, GdmDynamicDisplay))
16880N/A+#define GDM_DYNAMIC_DISPLAY_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GDM_TYPE_DYNAMIC_DISPLAY, GdmDynamicDisplayClass))
16880N/A+#define GDM_IS_DYNAMIC_DISPLAY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GDM_TYPE_DYNAMIC_DISPLAY))
16880N/A+#define GDM_IS_DYNAMIC_DISPLAY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GDM_TYPE_DYNAMIC_DISPLAY))
16880N/A+#define GDM_DYNAMIC_DISPLAY_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GDM_TYPE_DYNAMIC_DISPLAY, GdmDynamicDisplayClass))
16880N/A+typedef struct _GdmDynamicDisplayPrivate GdmDynamicDisplayPrivate;
16880N/A+ GdmDynamicDisplayPrivate *priv;
16880N/A+GType gdm_dynamic_display_get_type (void);
16880N/A+GdmDisplay * gdm_dynamic_display_new (int display_number);
20828N/A+void gdm_dynamic_display_respawn (GdmDynamicDisplay *display, gboolean respawn);
20828N/A+void gdm_dynamic_display_removed (GdmDynamicDisplay *display);
16880N/A+#endif /* __GDM_DYNAMIC_DISPLAY_H */
20788N/A@@ -502,6 +502,7 @@ run_greeter (GdmFactorySlave *slave)
20788N/A@@ -513,6 +514,7 @@ run_greeter (GdmFactorySlave *slave)
20788N/A@@ -522,6 +524,7 @@ run_greeter (GdmFactorySlave *slave)
18747N/A+ "display-session-id", &session_id,
16880N/A "display-hostname", &display_hostname,
16880N/A "display-x11-authority-file", &auth_file,
20788N/A@@ -579,6 +582,7 @@ run_greeter (GdmFactorySlave *slave)
16880N/A g_debug ("GdmFactorySlave: Creating greeter on %s %s", display_name, display_device);
16880N/A slave->priv->greeter = gdm_greeter_session_new (display_name,
20788N/A@@ -674,14 +678,12 @@ on_server_died (GdmServer *server,
16880N/A gdm_factory_slave_run (GdmFactorySlave *slave)
16880N/A "display-is-local", &display_is_local,
16880N/A- "display-name", &display_name,
16880N/A- "display-x11-authority-file", &auth_file,
16880N/A /* if this is local display start a server if one doesn't
20788N/A@@ -689,7 +691,7 @@ gdm_factory_slave_run (GdmFactorySlave *
16880N/A- slave->priv->server = gdm_server_new (display_name, auth_file);
16880N/A+ slave->priv->server = gdm_server_new (display_id);
16880N/A g_signal_connect (slave->priv->server,
20788N/A@@ -721,8 +723,7 @@ gdm_factory_slave_run (GdmFactorySlave *
16880N/A g_timeout_add (500, (GSourceFunc)idle_connect_to_display, slave);
20788N/A@@ -141,6 +141,7 @@ gdm_greeter_session_finalize (GObject *o
16880N/A gdm_greeter_session_new (const char *display_name,
20788N/A@@ -155,6 +156,7 @@ gdm_greeter_session_new (const char *dis
16880N/A "x11-display-name", display_name,
20788N/A "x11-display-seat-id", seat_id,
16983N/A+ "x11-display-session-id", session_id,
16880N/A "x11-display-device", display_device,
16880N/A "x11-display-hostname", display_hostname,
16880N/A "x11-display-is-local", display_is_local,
20788N/A@@ -51,6 +51,7 @@ typedef struct
16880N/A GType gdm_greeter_session_get_type (void);
16880N/A GdmGreeterSession * gdm_greeter_session_new (const char *display_name,
16880N/A #define GDM_LOCAL_DISPLAY_FACTORY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_LOCAL_DISPLAY_FACTORY, GdmLocalDisplayFactoryPrivate))
16880N/A+#define IS_STR_SET(x) (x != NULL && x[0] != '\0')
16983N/A+#define GDM_DBUS_TYPE_G_STRING_STRING_HASHTABLE (dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_STRING))
16880N/A struct GdmLocalDisplayFactoryPrivate
16983N/A+ GHashTable *managed_seat_proxies;
16880N/A /* FIXME: this needs to be per seat? */
20839N/A@@ -65,7 +83,14 @@ static void gdm_local_display_factor
16983N/A static void gdm_local_display_factory_init (GdmLocalDisplayFactory *factory);
16880N/A static void gdm_local_display_factory_finalize (GObject *object);
16983N/A-static GdmDisplay *create_display (GdmLocalDisplayFactory *factory);
16880N/A+static gboolean create_static_displays (GdmLocalDisplayFactory *factory);
16880N/A+static void on_display_status_changed (GdmDisplay *display,
16880N/A+ GdmLocalDisplayFactory *factory);
16983N/A+static void on_block_console_session_requests_changed (GdmDisplay *display,
16983N/A+ GdmLocalDisplayFactory *factory);
20244N/A+static gboolean connect_to_ck (GdmLocalDisplayFactory *factory);
16880N/A static gpointer local_display_factory_object = NULL;
20839N/A@@ -179,6 +204,100 @@ store_display (GdmLocalDisplayFactory *f
16880N/A g_hash_table_insert (factory->priv->displays, GUINT_TO_POINTER (num), NULL);
16880N/A+store_remove_display (GdmLocalDisplayFactory *factory,
16880N/A+ store = gdm_display_factory_get_display_store (GDM_DISPLAY_FACTORY (factory));
16880N/A+ gdm_display_store_remove (store, display);
20319N/A+ g_debug ("GdmLocalDisplayFactory: Remove display %d from store", num);
16880N/A+ /* remove from our reserved spot */
16880N/A+ g_hash_table_remove (factory->priv->displays, GUINT_TO_POINTER (num));
18507N/A+lookup_by_session (const char *id,
18507N/A+ if (!GDM_IS_DISPLAY (display)) {
18507N/A+ gdm_display_get_session_id (display, &key2, NULL);
18507N/A+ if (strcmp (key1, key2) == 0) {
18507N/A+lookup_by_x11_display (const char *id,
18507N/A+ if (! GDM_IS_DISPLAY (display)) {
18507N/A+ gdm_display_get_x11_display_name (display, &key2, NULL);
18507N/A+ if (strcmp (key1, key2) == 0) {
18994N/A+lookup_by_x11_display_num (const char *id,
18994N/A+ guint32 key1 = GPOINTER_TO_UINT (user_data);
18994N/A+ if (! GDM_IS_DISPLAY (display)) {
18994N/A+ gdm_display_get_x11_display_number (display, &key2, NULL);
18507N/A+factory_find_display (GdmLocalDisplayFactory *factory,
18507N/A+ GdmDisplayStoreFunc predicate,
18507N/A+ store = gdm_display_factory_get_display_store (GDM_DISPLAY_FACTORY (factory));
18507N/A+ return gdm_display_store_find (store, predicate, user_data);
20839N/A@@ -275,14 +394,113 @@ gdm_local_display_factory_create_product
16983N/A+display_has_pending_sessions (GdmLocalDisplayFactory *factory,
16983N/A+ return g_object_get_data (G_OBJECT (display),
16983N/A+ "gdm-local-display-factory-console-session-requests") != NULL;
20828N/A-on_static_display_status_changed (GdmDisplay *display,
20828N/A- GdmLocalDisplayFactory *factory)
16983N/A+manage_next_pending_session_on_display (GdmLocalDisplayFactory *factory,
20319N/A+ g_debug ("GdmLocalDisplayFactory: Manage next pending session on display");
16983N/A+ pending_sessions = g_object_get_data (G_OBJECT (display),
16983N/A+ "gdm-local-display-factory-console-session-requests");
16983N/A+ next_session = g_list_last (pending_sessions);
16983N/A+ pending_sessions = g_list_delete_link (pending_sessions, next_session);
16983N/A+ g_object_set_data (G_OBJECT (display),
16983N/A+ "gdm-local-display-factory-console-session-requests",
16983N/A+ g_object_set (display, "session-id", ssid, NULL);
16983N/A+discard_pending_session_on_display (GdmLocalDisplayFactory *factory,
16983N/A+ pending_sessions = g_object_get_data (G_OBJECT (display),
16983N/A+ "gdm-local-display-factory-console-session-requests");
16983N/A+ node = g_list_last (pending_sessions);
16983N/A+ if (strcmp (node_ssid, ssid) == 0) {
16983N/A+ pending_sessions = g_list_delete_link (pending_sessions, node);
16983N/A+ g_object_set_data (G_OBJECT (display),
16983N/A+ "gdm-local-display-factory-console-session-requests",
16983N/A+on_block_console_session_requests_changed (GdmDisplay *display,
16983N/A+ GdmLocalDisplayFactory *factory)
16983N/A+ g_object_get (G_OBJECT (display),
16983N/A+ "block-console-session-requests",
16983N/A+ gdm_display_get_x11_display_number (display, &number, NULL);
16983N/A+ g_debug ("GdmLocalDisplayFactory: display :%d is blocked", number);
16983N/A+ if (status == GDM_DISPLAY_UNMANAGED) {
16983N/A+ manage_next_pending_session_on_display (factory, display);
16880N/A+on_display_status_changed (GdmDisplay *display,
16880N/A+ GdmLocalDisplayFactory *factory)
20319N/A+ g_debug ("GdmLocalDisplayFactory: Display Status Changed");
16983N/A gdm_display_get_x11_display_number (display, &num, NULL);
20839N/A@@ -292,16 +510,17 @@ on_static_display_status_changed (GdmDis
16983N/A status = gdm_display_get_status (display);
16983N/A+ g_object_get (G_OBJECT (display),
16983N/A+ "block-console-session-requests",
16983N/A g_debug ("GdmLocalDisplayFactory: static display status changed: %d", status);
18507N/A- /* remove the display number from factory->priv->displays
18507N/A- g_hash_table_remove (factory->priv->displays, GUINT_TO_POINTER (num));
18507N/A- gdm_display_store_remove (store, display);
18507N/A+ /* Do not remove the display number from factory->priv->displays
18507N/A+ here because it should be remove under signal "SessionRemoved"
16983N/A factory->priv->num_failures = 0;
16983N/A /* leave the display number in factory->priv->displays
20839N/A@@ -313,11 +532,13 @@ on_static_display_status_changed (GdmDis
16983N/A g_warning ("GdmLocalDisplayFactory: maximum number of X display failures reached: check X server log for errors");
18940N/A /* FIXME: should monitor hardware changes to
18940N/A+ if (display_has_pending_sessions (factory, display) && !display_is_blocked) {
16983N/A+ store_display (factory, num, display);
16983N/A+ manage_next_pending_session_on_display (factory, display);
20839N/A@@ -329,38 +550,535 @@ on_static_display_status_changed (GdmDis
16983N/A-create_display (GdmLocalDisplayFactory *factory)
16983N/A+seat_open_session_request (DBusGProxy *seat_proxy,
17291N/A+ const char *display_template_name,
16983N/A+ GHashTable *display_variables,
16983N/A+ GdmLocalDisplayFactory *factory)
16983N/A+ g_return_if_fail (GDM_IS_LOCAL_DISPLAY_FACTORY (factory));
20319N/A+ g_debug ("GdmLocalDisplayFactory: Open Session Request");
18507N/A+ display = factory_find_display (factory, lookup_by_session, (gpointer)ssid);
16983N/A+ g_object_get (G_OBJECT (display),
16983N/A+ "block-console-session-requests",
20319N/A- num = take_next_display_number (factory);
16983N/A+ if (strcmp (display_type, "X11") != 0) {
16983N/A+ g_warning ("Unknown display type '%s' requested", display_type);
20788N/A- display = gdm_static_factory_display_new (num);
20788N/A- display = gdm_static_display_new (num);
16983N/A+ xserver_command = g_hash_table_lookup (parameters, "Exec");
20788N/A- /* FIXME: don't hardcode seat1? */
20788N/A- g_object_set (display, "seat-id", CK_SEAT1_PATH, NULL);
16880N/A+ if (! g_shell_parse_argv (xserver_command, &argc, &argv, &error)) {
16880N/A+ g_warning ("Could not parse command %s: %s", xserver_command, error->message);
20788N/A- G_CALLBACK (on_static_display_status_changed),
20059N/A+ g_debug("GdmLocalDisplayFactory: X11 server cmd pre-mangle: %s",
16880N/A+ /* replase $display in case of not specified */
16880N/A+ if (g_str_equal (argv[i], "$display")) {
16880N/A+ display_number = take_next_display_number (factory);
20788N/A- store_display (factory, num, display);
16880N/A+ /* get display_number in case of specified */
16880N/A+ if (g_str_has_prefix (argv[i], ":")) {
16880N/A+ display_number = atoi (argv[i]+1);
20059N/A+ if (! g_strcmp0 (argv[i], "-indirect")) {
20788N/A- if (! gdm_display_manage (display)) {
20788N/A- gdm_display_unmanage (display);
20059N/A+ * -auth is added by gdm_server_resolve_command_line()
20059N/A+ if (! g_strcmp0 (argv[i], "-auth") &&
20059N/A+ ! g_strcmp0 (argv[i+1], "$auth")) {
20059N/A+ if (!g_strcmp0 (argv[i], "$vt")) {
20059N/A+ comm = g_strjoinv (" ", argv);
20059N/A+ g_debug ("GdmLocalDisplayFactory: X11 server cmd post-mangle: %s",
16983N/A+ /* TODO: Start a xdmcp chooser as request */
16983N/A+ /* display = gdm_xdmcp_chooser_display_new (display_number); */
16983N/A+ display = gdm_dynamic_display_new (display_number);
16983N/A+ g_warning ("Unable to create display: %d", display_number);
16983N/A+ g_object_set (display, "session-id", ssid, NULL);
16983N/A+ sid = dbus_g_proxy_get_path (seat_proxy);
16983N/A+ g_object_set (display, "seat-id", sid, NULL);
16983N/A+ g_object_set (display, "x11-command", comm, NULL);
17291N/A+ if (IS_STR_SET (display_template_name))
17291N/A+ g_object_set (display, "x11-display-type", display_template_name, NULL);
16983N/A+ g_object_set (display, "use-auth", use_auth, NULL);
16983N/A+ G_CALLBACK (on_display_status_changed),
16983N/A+ "notify::block-console-session-requests",
16983N/A+ G_CALLBACK (on_block_console_session_requests_changed),
16983N/A+ store_display (factory, display_number, display);
16983N/A+ if (! gdm_display_manage (display)) {
16983N/A+ gdm_display_unmanage (display);
16983N/A+ /* FIXME: Make sure the display returned is compatible
20066N/A+ g_debug ("Got console request to add display for session that "
20066N/A+ "already has a display, and display is already in "
16983N/A+ pending_sessions = g_object_get_data (G_OBJECT (display),
16983N/A+ "gdm-local-display-factory-console-session-requests");
16983N/A+ pending_sessions = g_list_prepend (pending_sessions, g_strdup (ssid));
16983N/A+ g_object_set_data (G_OBJECT (display),
16983N/A+ "gdm-local-display-factory-console-session-requests",
16983N/A+seat_close_session_request (DBusGProxy *seat_proxy,
16983N/A+ GdmLocalDisplayFactory *factory)
20319N/A+ g_debug ("GdmLocalDisplayFactory: Close session request");
16880N/A+ g_return_if_fail (GDM_IS_LOCAL_DISPLAY_FACTORY (factory));
18507N/A+ display = factory_find_display (factory, lookup_by_session, (gpointer)ssid);
16983N/A+ g_debug ("GdmLocalDisplayFactory: display for session '%s' doesn't exists", ssid);
16983N/A+ g_object_get (G_OBJECT (display), "session-id", &display_ssid, NULL);
16983N/A+ if (display_ssid == NULL || strcmp (ssid, display_ssid) != 0) {
16983N/A+ discard_pending_session_on_display (factory, display, ssid);
16880N/A+ if (! gdm_display_unmanage (display)) {
16983N/A+ gdm_display_get_x11_display_number (display, &display_number, NULL);
16880N/A+ store_remove_display (factory, display_number, display);
20828N/A+seat_session_no_respawn (DBusGProxy *seat_proxy,
20828N/A+ GdmLocalDisplayFactory *factory)
20828N/A+ g_debug ("GdmLocalDisplayFactory: No Respawn");
20828N/A+ g_return_if_fail (GDM_IS_LOCAL_DISPLAY_FACTORY (factory));
20828N/A+ display = factory_find_display (factory, lookup_by_session, (gpointer)ssid);
20828N/A+ g_debug ("GdmLocalDisplayFactory: display for session '%s' doesn't exists", ssid);
20828N/A+ if (GDM_IS_DYNAMIC_DISPLAY (display)) {
20828N/A+ gdm_dynamic_display_removed (GDM_DYNAMIC_DISPLAY (display));
18507N/A+get_session_x11_display (GdmLocalDisplayFactory *factory,
18507N/A+ proxy = dbus_g_proxy_new_for_name (factory->priv->connection,
18507N/A+ res = dbus_g_proxy_call (proxy,
18507N/A+seat_session_added (DBusGProxy *seat_proxy,
18507N/A+ GdmLocalDisplayFactory *factory)
20319N/A+ g_debug ("GdmLocalDisplayFactory: Adding Seat Session");
18507N/A+ res = get_session_x11_display (factory, ssid, &x11_display);
18507N/A+ g_warning ("Failed to get X11 display number for %s", ssid);
18507N/A+ display = factory_find_display (factory, lookup_by_x11_display,
18507N/A+ gdm_display_set_session_id (display, ssid, NULL);
18507N/A+ g_debug ("Update session id for display %s to %s",
18507N/A+seat_session_removed (DBusGProxy *seat_proxy,
18507N/A+ GdmLocalDisplayFactory *factory)
20319N/A+ g_debug ("GdmLocalDisplayFactory: Removed Seat Session");
18507N/A+ display = factory_find_display (factory, lookup_by_session,
18507N/A+ gdm_display_get_x11_display_number (display, &num, NULL);
18507N/A+ store_remove_display (factory, num, display);
16983N/A+seat_remove_request (DBusGProxy *seat_proxy,
16983N/A+ GdmLocalDisplayFactory *factory)
20319N/A+ g_debug ("GdmLocalDisplayFactory: Seat Remove Request");
16983N/A+ sid_to_remove = dbus_g_proxy_get_path (seat_proxy);
16983N/A+ g_queue_init (&ssids_to_remove);
18507N/A+ g_hash_table_iter_init (&iter, factory->priv->displays);
16983N/A+ while (g_hash_table_iter_next (&iter, &key, &value)) {
18994N/A+ x11_display_num = GPOINTER_TO_UINT (key);
18994N/A+ display = factory_find_display (factory,
18994N/A+ GUINT_TO_POINTER (x11_display_num));
16983N/A+ gdm_display_get_seat_id (display, &sid, NULL);
16983N/A+ if (strcmp (sid, sid_to_remove) == 0) {
16983N/A+ gdm_display_get_session_id (display, &ssid, NULL);
16983N/A+ g_queue_push_tail (&ssids_to_remove, ssid);
16983N/A+ while (!g_queue_is_empty (&ssids_to_remove)) {
16983N/A+ ssid = g_queue_pop_head (&ssids_to_remove);
16983N/A+ seat_close_session_request (seat_proxy, ssid, factory);
16983N/A+ g_hash_table_remove (factory->priv->managed_seat_proxies, sid_to_remove);
16983N/A+ dbus_g_proxy_call_no_reply (seat_proxy,
20244N/A+ if (factory->priv->proxy_ck == NULL) {
16983N/A+ dbus_g_proxy_call_no_reply (factory->priv->proxy_ck,
16983N/A+ DBUS_TYPE_G_OBJECT_PATH, sid_to_remove,
16880N/A+manage_static_sessions_per_seat (GdmLocalDisplayFactory *factory,
20319N/A+ g_debug ("GdmLocalDisplayFactory: Manage Static Sessions Per Seat");
16880N/A+ proxy = dbus_g_proxy_new_for_name (factory->priv->connection,
16880N/A+ g_warning ("Failed to connect to the ConsoleKit seat object");
17291N/A+ dbus_g_object_register_marshaller (gdm_marshal_VOID__STRING_STRING_STRING_POINTER_STRING_POINTER,
16983N/A+ GDM_DBUS_TYPE_G_STRING_STRING_HASHTABLE,
16983N/A+ GDM_DBUS_TYPE_G_STRING_STRING_HASHTABLE,
16880N/A+ dbus_g_proxy_add_signal (proxy,
16983N/A+ GDM_DBUS_TYPE_G_STRING_STRING_HASHTABLE,
16983N/A+ GDM_DBUS_TYPE_G_STRING_STRING_HASHTABLE,
16880N/A+ dbus_g_proxy_add_signal (proxy,
16983N/A+ dbus_g_proxy_add_signal (proxy,
20828N/A+ dbus_g_proxy_add_signal (proxy,
18507N/A+ dbus_g_proxy_add_signal (proxy,
18507N/A+ dbus_g_proxy_add_signal (proxy,
16880N/A+ dbus_g_proxy_connect_signal (proxy,
16983N/A+ G_CALLBACK (seat_open_session_request),
16880N/A+ dbus_g_proxy_connect_signal (proxy,
16983N/A+ G_CALLBACK (seat_close_session_request),
18507N/A+ dbus_g_proxy_connect_signal (proxy,
20828N/A+ G_CALLBACK (seat_session_no_respawn),
20828N/A+ dbus_g_proxy_connect_signal (proxy,
18507N/A+ G_CALLBACK (seat_session_added),
18507N/A+ dbus_g_proxy_connect_signal (proxy,
18507N/A+ G_CALLBACK (seat_session_removed),
16983N/A+ dbus_g_proxy_connect_signal (proxy,
16983N/A+ G_CALLBACK (seat_remove_request),
16880N/A+ dbus_g_proxy_call_no_reply (proxy,
16983N/A+ g_hash_table_insert (factory->priv->managed_seat_proxies,
16983N/A+ g_strdup (dbus_g_proxy_get_path (proxy)),
16880N/A+seat_added (DBusGProxy *mgr_proxy,
16880N/A+ GdmLocalDisplayFactory *factory)
20319N/A+ g_debug ("GdmLocalDisplayFactory: Seat Added");
16983N/A+ if (strcmp (type, "Default") == 0) {
16983N/A+ manage_static_sessions_per_seat (factory, sid);
16880N/A+create_static_displays (GdmLocalDisplayFactory *factory)
20319N/A+ g_debug ("GdmLocalDisplayFactory: Create Static Display");
20244N/A+ if (factory->priv->proxy_ck == NULL) {
16880N/A+ res = dbus_g_proxy_call (factory->priv->proxy_ck,
16880N/A+ dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_G_OBJECT_PATH),
16880N/A+ g_warning ("Failed to get list of unmanaged seats: %s", error->message);
16880N/A+ for (i = 0; i < seats->len; i++) {
16880N/A+ sid = g_ptr_array_index (seats, i);
16880N/A+ manage_static_sessions_per_seat (factory, sid);
20839N/A@@ -375,7 +1093,7 @@ gdm_local_display_factory_start (GdmDisp
18940N/A /* FIXME: use seat configuration */
18940N/A- display = create_display (factory);
18940N/A+ display = create_static_displays (factory);
20839N/A@@ -439,6 +1157,68 @@ register_factory (GdmLocalDisplayFactory
20244N/A+bus_proxy_destroyed_cb (DBusGProxy *bus_proxy,
20244N/A+ GdmLocalDisplayFactoryPrivate *priv)
20244N/A+ g_debug ("Local Display Factory - Disconnected from D-Bus");
20244N/A+ /* probably shutting down or something */
16880N/A+connect_to_ck (GdmLocalDisplayFactory *factory)
16880N/A+ GdmLocalDisplayFactoryPrivate *priv;
20319N/A+ g_debug ("GdmLocalDisplayFactory: Connect To ConsoleKit");
16880N/A+ priv->proxy_ck = dbus_g_proxy_new_for_name (priv->connection,
16880N/A+ g_warning ("Couldn't create proxy for ConsoleKit Manager");
16983N/A+ dbus_g_object_register_marshaller (gdm_marshal_VOID__STRING_STRING,
16880N/A+ dbus_g_proxy_add_signal (priv->proxy_ck,
16880N/A+ dbus_g_proxy_connect_signal (priv->proxy_ck,
20244N/A+ g_signal_connect (priv->proxy_ck,
20244N/A+ G_CALLBACK (bus_proxy_destroyed_cb),
18217N/A+disconnect_from_ck (GdmLocalDisplayFactory *factory)
18217N/A+ if (factory->priv->proxy_ck == NULL) {
18217N/A+ g_object_unref (factory->priv->proxy_ck);
18212N/A gdm_local_display_factory_constructor (GType type,
20839N/A@@ -456,6 +1236,8 @@ gdm_local_display_factory_constructor (G
18212N/A g_warning ("Unable to register local display factory with system bus");
20839N/A@@ -484,6 +1266,11 @@ gdm_local_display_factory_init (GdmLocal
16983N/A factory->priv = GDM_LOCAL_DISPLAY_FACTORY_GET_PRIVATE (factory);
16983N/A factory->priv->displays = g_hash_table_new (NULL, NULL);
20244N/A+ factory->priv->proxy_ck = NULL;
16983N/A+ factory->priv->managed_seat_proxies = g_hash_table_new_full (g_str_hash, g_str_equal,
16983N/A+ (GDestroyNotify) g_object_unref);
20839N/A@@ -499,6 +1286,9 @@ gdm_local_display_factory_finalize (GObj
16983N/A g_return_if_fail (factory->priv != NULL);
16880N/A g_hash_table_destroy (factory->priv->displays);
16983N/A+ g_hash_table_destroy (factory->priv->managed_seat_proxies);
16880N/A G_OBJECT_CLASS (gdm_local_display_factory_parent_class)->finalize (object);
16880N/A@@ -415,14 +415,12 @@ on_server_died (GdmServer *server,
16880N/A gdm_product_slave_create_server (GdmProductSlave *slave)
16880N/A "display-is-local", &display_is_local,
16880N/A- "display-name", &display_name,
16880N/A- "display-x11-authority-file", &auth_file,
16880N/A /* if this is local display start a server if one doesn't
16880N/A@@ -430,7 +428,7 @@ gdm_product_slave_create_server (GdmProductSlave *slave)
16880N/A- slave->priv->server = gdm_server_new (display_name, auth_file);
16880N/A+ slave->priv->server = gdm_server_new (display_id);
16880N/A g_signal_connect (slave->priv->server,
16880N/A@@ -462,8 +460,7 @@ gdm_product_slave_create_server (GdmProductSlave *slave)
16880N/A g_timeout_add (500, (GSourceFunc)idle_connect_to_display, slave);
18940N/A@@ -54,6 +56,9 @@ extern char **environ;
16880N/A #define GDM_SERVER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_SERVER, GdmServerPrivate))
16880N/A /* These are the servstat values, also used as server
16880N/A #define SERVER_TIMEOUT 2 /* Server didn't start */
18940N/A@@ -69,12 +74,12 @@ struct GdmServerPrivate
20059N/A@@ -267,6 +272,11 @@ gdm_server_resolve_command_line (GdmServ
20059N/A gboolean query_in_arglist = FALSE;
20059N/A+ g_warning ("X11 server command line is missing");
20059N/A g_shell_parse_argv (server->priv->command, &argc, &argv, NULL);
20059N/A for (len = 0; argv != NULL && argv[len] != NULL; len++) {
20059N/A@@ -307,11 +317,6 @@ gdm_server_resolve_command_line (GdmServ
16880N/A- if (server->priv->disable_tcp && ! query_in_arglist) {
16880N/A- argv[len++] = g_strdup ("-nolisten");
16880N/A- argv[len++] = g_strdup ("tcp");
16880N/A if (vtarg != NULL && ! gotvtarg) {
16880N/A argv[len++] = g_strdup (vtarg);
20059N/A@@ -612,16 +617,20 @@ gdm_server_spawn (GdmServer *server,
20059N/A /* Figure out the server command */
20059N/A- gdm_server_resolve_command_line (server,
20059N/A+ if (! gdm_server_resolve_command_line (server,
20059N/A+ g_warning ("unable to process X11 server command line");
20059N/A if (server->priv->session_args) {
20059N/A server_add_xserver_args (server, &argc, &argv);
20059N/A@@ -634,6 +643,29 @@ gdm_server_spawn (GdmServer *server,
17797N/A+ /* Sometimes quit X slowly, adding this to avoid restart session
17797N/A+ if ((tmp = strstr (server->priv->display_name, ":")) != NULL) {
17797N/A+ display_num = g_ascii_strtod (tmp, &p);
17797N/A+ socket_file = g_strdup_printf ("/tmp/.X11-unix/X%d",
17797N/A+ if (!g_file_test (socket_file, G_FILE_TEST_EXISTS))
17797N/A env = get_server_environment (server);
17797N/A freeme = g_strjoinv (" ", argv);
20059N/A@@ -743,13 +775,12 @@ gdm_server_stop (GdmServer *server)
16880N/A-_gdm_server_set_display_name (GdmServer *server,
16880N/A+_gdm_server_set_display_id (GdmServer *server,
16880N/A- g_free (server->priv->display_name);
16880N/A- server->priv->display_name = g_strdup (name);
16880N/A+ g_free (server->priv->display_id);
16880N/A+ server->priv->display_id = g_strdup (id);
20059N/A@@ -769,13 +800,6 @@ _gdm_server_set_user_name (GdmServer *s
17753N/A-_gdm_server_set_disable_tcp (GdmServer *server,
17753N/A- server->priv->disable_tcp = disabled;
17753N/A gdm_server_set_property (GObject *object,
20059N/A@@ -786,8 +810,8 @@ gdm_server_set_property (GObject *o
16880N/A- _gdm_server_set_display_name (self, g_value_get_string (value));
16880N/A+ _gdm_server_set_display_id (self, g_value_get_string (value));
16880N/A _gdm_server_set_auth_file (self, g_value_get_string (value));
20059N/A@@ -795,9 +819,6 @@ gdm_server_set_property (GObject *o
17753N/A _gdm_server_set_user_name (self, g_value_get_string (value));
17753N/A- _gdm_server_set_disable_tcp (self, g_value_get_boolean (value));
17753N/A G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
20059N/A@@ -815,8 +836,8 @@ gdm_server_get_property (GObject *obj
16880N/A- g_value_set_string (value, self->priv->display_name);
16880N/A+ g_value_set_string (value, self->priv->display_id);
20059N/A@@ -828,9 +849,6 @@ gdm_server_get_property (GObject *obj
17753N/A g_value_set_string (value, self->priv->user_name);
17753N/A- g_value_set_boolean (value, self->priv->disable_tcp);
17753N/A G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
20059N/A@@ -896,10 +914,10 @@ gdm_server_class_init (GdmServerClass *k
16880N/A g_object_class_install_property (object_class,
16880N/A- g_param_spec_string ("display-name",
16880N/A+ g_param_spec_string ("display-id",
16880N/A G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
16880N/A g_object_class_install_property (object_class,
20059N/A@@ -924,13 +942,6 @@ gdm_server_class_init (GdmServerClass *k
17753N/A G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
17753N/A- g_object_class_install_property (object_class,
17753N/A- g_param_spec_boolean ("disable-tcp",
17753N/A- G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
20059N/A@@ -941,7 +952,7 @@ gdm_server_init (GdmServer *server)
17753N/A server->priv = GDM_SERVER_GET_PRIVATE (server);
20788N/A- server->priv->command = g_strdup (X_SERVER " -br -verbose -logverbose 7");
17753N/A server->priv->log_dir = g_strdup (LOGDIR);
20319N/A@@ -978,15 +989,123 @@ gdm_server_finalize (GObject *object)
16880N/A-gdm_server_new (const char *display_name,
16880N/A+gdm_server_new (const char *display_id)
20319N/A+ g_debug ("GdmServer: New Server");
16880N/A object = g_object_new (GDM_TYPE_SERVER,
16880N/A+ g_assert (server->priv->display_id != NULL);
16880N/A+ connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);
16880N/A+ g_critical ("error getting system bus: %s", error->message);
16880N/A+ g_debug ("GdmServer: Creating proxy for %s", server->priv->display_id);
16880N/A+ proxy = dbus_g_proxy_new_for_name_owner (connection,
16880N/A+ g_warning ("Failed to create display proxy %s: %s", server->priv->display_id, error->message);
16880N/A+ g_warning ("Unable to create display proxy");
16880N/A+ /* cache some values up front */
16880N/A+ res = dbus_g_proxy_call (proxy,
16880N/A+ G_TYPE_STRING, &server->priv->display_name,
16880N/A+ g_warning ("Failed to get value: %s", error->message);
16880N/A+ g_warning ("Failed to get value");
16880N/A+ /* If display_name is not set, quit */
16880N/A+ if (! server->priv->display_name || (strlen (server->priv->display_name) == 0)) {
16880N/A+ g_warning ("Wrong value of method GetX11DisplayName for %s",server->priv->display_id);
16880N/A+ res = dbus_g_proxy_call (proxy,
16880N/A+ G_TYPE_STRING, &server->priv->command,
16880N/A+ g_warning ("Failed to get value: %s", error->message);
16880N/A+ g_warning ("Failed to get value");
16880N/A+ res = dbus_g_proxy_call (proxy,
16880N/A+ G_TYPE_STRING, &server->priv->auth_file,
16880N/A+ g_warning ("Failed to get value: %s", error->message);
16880N/A+ g_warning ("Failed to get value");
16880N/A+ /* If auth_file is not set, set it NULL */
16880N/A+ if (server->priv->auth_file && (strlen (server->priv->auth_file) == 0)) {
16880N/A+ g_free (server->priv->auth_file);
16880N/A+ server->priv->auth_file = NULL;
16880N/A@@ -53,8 +53,7 @@ typedef struct
16880N/A GType gdm_server_get_type (void);
16880N/A-GdmServer * gdm_server_new (const char *display_id,
16880N/A+GdmServer * gdm_server_new (const char *display_id);
16880N/A gboolean gdm_server_start (GdmServer *server);
16880N/A gboolean gdm_server_stop (GdmServer *server);
16880N/A char * gdm_server_get_display_device (GdmServer *server);
20788N/A@@ -101,6 +103,9 @@ struct _GdmSessionDirectPrivate
16983N/A char *display_x11_authority_file;
16983N/A+ char *display_console_session;
20788N/A@@ -108,6 +113,7 @@ struct _GdmSessionDirectPrivate
16983N/A PROP_DISPLAY_X11_AUTHORITY_FILE,
17398N/A static void gdm_session_iface_init (GdmSessionIface *iface);
20788N/A@@ -826,6 +835,34 @@ gdm_session_direct_handle_username_chang
16983N/A return DBUS_HANDLER_RESULT_HANDLED;
16983N/A+gdm_session_direct_handle_display_console_session_updated (GdmSessionDirect *session,
20788N/A+ GdmSessionConversation *conversation,
16983N/A+ if (! dbus_message_get_args (message, &error,
16983N/A+ reply = dbus_message_new_method_return (message);
20788N/A+ dbus_connection_send (conversation->worker_connection, reply, NULL);
16983N/A+ g_debug ("GdmSessionDirect: changing ck session id to '%s'",
16983N/A+ return DBUS_HANDLER_RESULT_HANDLED;
20788N/A cancel_pending_query (GdmSessionConversation *conversation)
20788N/A@@ -1279,6 +1316,8 @@ session_worker_message (DBusConnection *
20788N/A return gdm_session_direct_handle_accreditation_failed (session, conversation, message);
16983N/A } else if (dbus_message_is_method_call (message, GDM_SESSION_DBUS_INTERFACE, "UsernameChanged")) {
20788N/A return gdm_session_direct_handle_username_changed (session, conversation, message);
16983N/A+ } else if (dbus_message_is_method_call (message, GDM_SESSION_DBUS_INTERFACE, "DisplayConsoleSessionUpdated")) {
20788N/A+ return gdm_session_direct_handle_display_console_session_updated (session, conversation, message);
18400N/A } else if (dbus_message_is_method_call (message, GDM_SESSION_DBUS_INTERFACE, "SessionOpened")) {
20788N/A return gdm_session_direct_handle_session_opened (session, conversation, message);
18400N/A } else if (dbus_message_is_method_call (message, GDM_SESSION_DBUS_INTERFACE, "OpenFailed")) {
20788N/A@@ -1385,6 +1424,8 @@ do_introspect (DBusConnection *connectio
17291N/A " <arg name=\"service_name\" type=\"s\"/>\n"
17291N/A " <arg name=\"x11_display_name\" type=\"s\"/>\n"
17291N/A+ " <arg name=\"x11_display_type\" type=\"s\"/>\n"
17398N/A+ " <arg name=\"x11_display_seat_id\" type=\"s\"/>\n"
17291N/A " <arg name=\"display_device\" type=\"s\"/>\n"
17291N/A " <arg name=\"hostname\" type=\"s\"/>\n"
17291N/A " <arg name=\"x11_authority_file\" type=\"s\"/>\n"
20788N/A@@ -1392,6 +1433,8 @@ do_introspect (DBusConnection *connectio
17291N/A " <signal name=\"SetupForUser\">\n"
17291N/A " <arg name=\"service_name\" type=\"s\"/>\n"
17291N/A " <arg name=\"x11_display_name\" type=\"s\"/>\n"
17291N/A+ " <arg name=\"x11_display_type\" type=\"s\"/>\n"
17398N/A+ " <arg name=\"x11_seat_id\" type=\"s\"/>\n"
17291N/A " <arg name=\"display_device\" type=\"s\"/>\n"
17291N/A " <arg name=\"hostname\" type=\"s\"/>\n"
17291N/A " <arg name=\"x11_authority_file\" type=\"s\"/>\n"
20788N/A@@ -1922,6 +1965,8 @@ send_setup (GdmSessionDirect *session,
17291N/A const char *display_x11_authority_file;
20788N/A@@ -1934,6 +1979,16 @@ send_setup (GdmSessionDirect *session,
17291N/A+ if (session->priv->display_type != NULL) {
17291N/A+ display_type = session->priv->display_type;
17398N/A+ if (session->priv->display_seat_id!= NULL) {
17398N/A+ display_seat_id = session->priv->display_seat_id;
17291N/A if (session->priv->display_hostname != NULL) {
17291N/A display_hostname = session->priv->display_hostname;
20788N/A@@ -1959,6 +2014,8 @@ send_setup (GdmSessionDirect *session,
17291N/A dbus_message_iter_init_append (message, &iter);
17291N/A dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &service_name);
17291N/A dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &display_name);
17291N/A+ dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &display_type);
17398N/A+ dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &display_seat_id);
17291N/A dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &display_device);
17291N/A dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &display_hostname);
17291N/A dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &display_x11_authority_file);
20788N/A@@ -1978,6 +2035,8 @@ send_setup_for_user (GdmSessionDirect *s
17291N/A const char *display_x11_authority_file;
20788N/A@@ -1991,6 +2050,16 @@ send_setup_for_user (GdmSessionDirect *s
17291N/A+ if (session->priv->display_type != NULL) {
17291N/A+ display_type = session->priv->display_type;
17398N/A+ if (session->priv->display_seat_id != NULL) {
17398N/A+ display_seat_id = session->priv->display_seat_id;
17291N/A if (session->priv->display_hostname != NULL) {
17291N/A display_hostname = session->priv->display_hostname;
20788N/A@@ -2021,6 +2090,8 @@ send_setup_for_user (GdmSessionDirect *s
17291N/A dbus_message_iter_init_append (message, &iter);
17291N/A dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &service_name);
17291N/A dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &display_name);
17291N/A+ dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &display_type);
17398N/A+ dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &display_seat_id);
17291N/A dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &display_device);
17291N/A dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &display_hostname);
17291N/A dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &display_x11_authority_file);
20788N/A@@ -2600,6 +2671,30 @@ _gdm_session_direct_set_display_x11_auth
17291N/A+_gdm_session_direct_set_display_type (GdmSessionDirect *session,
17291N/A+ g_free (session->priv->display_type);
17291N/A+ session->priv->display_type = g_strdup (type);
17398N/A+_gdm_session_direct_set_display_seat_id (GdmSessionDirect *session,
17398N/A+ g_free (session->priv->display_seat_id);
17398N/A+ session->priv->display_seat_id = g_strdup (sid);
16983N/A+_gdm_session_direct_set_display_console_session (GdmSessionDirect *session,
16983N/A+ g_free (session->priv->display_console_session);
16983N/A+ session->priv->display_console_session = g_strdup (console_session);
16983N/A _gdm_session_direct_set_display_is_local (GdmSessionDirect *session,
20788N/A@@ -2635,9 +2730,18 @@ gdm_session_direct_set_property (GObject
16983N/A case PROP_DISPLAY_X11_AUTHORITY_FILE:
16983N/A _gdm_session_direct_set_display_x11_authority_file (self, g_value_get_string (value));
16983N/A+ case PROP_DISPLAY_CONSOLE_SESSION:
16983N/A+ _gdm_session_direct_set_display_console_session (self, g_value_get_string (value));
16983N/A _gdm_session_direct_set_display_is_local (self, g_value_get_boolean (value));
17398N/A+ _gdm_session_direct_set_display_type (self, g_value_get_string (value));
17398N/A+ _gdm_session_direct_set_display_seat_id (self, g_value_get_string (value));
17398N/A G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
20788N/A@@ -2673,9 +2777,18 @@ gdm_session_direct_get_property (GObject
16983N/A case PROP_DISPLAY_X11_AUTHORITY_FILE:
16983N/A g_value_set_string (value, self->priv->display_x11_authority_file);
16983N/A+ case PROP_DISPLAY_CONSOLE_SESSION:
16983N/A+ g_value_set_string (value, self->priv->display_console_session);
16983N/A g_value_set_boolean (value, self->priv->display_is_local);
17398N/A+ g_value_set_string (value, self->priv->display_type);
17398N/A+ g_value_set_string (value, self->priv->display_seat_id);
17398N/A G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
20788N/A@@ -2711,6 +2824,12 @@ gdm_session_direct_dispose (GObject *obj
17398N/A g_free (session->priv->server_address);
17398N/A session->priv->server_address = NULL;
17291N/A+ g_free (session->priv->display_type);
17291N/A+ session->priv->display_type = NULL;
17398N/A+ g_free (session->priv->display_seat_id);
17398N/A+ session->priv->display_seat_id = NULL;
17398N/A if (session->priv->server != NULL) {
17398N/A dbus_server_disconnect (session->priv->server);
17398N/A dbus_server_unref (session->priv->server);
20788N/A@@ -2722,6 +2841,11 @@ gdm_session_direct_dispose (GObject *obj
17398N/A session->priv->environment = NULL;
17398N/A+ if (session->priv->display_proxy != NULL) {
17398N/A+ g_object_unref (session->priv->display_proxy);
17398N/A G_OBJECT_CLASS (gdm_session_direct_parent_class)->dispose (object);
20788N/A@@ -2872,6 +2996,14 @@ gdm_session_direct_class_init (GdmSessio
16983N/A G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
16983N/A+ g_object_class_install_property (object_class,
16983N/A+ g_param_spec_string ("display-console-session",
16983N/A+ "The ConsoleKit Session Id for the display",
16983N/A+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
16983N/A g_object_class_install_property (object_class,
20788N/A@@ -2887,11 +3019,140 @@ gdm_session_direct_class_init (GdmSessio
17398N/A G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
17398N/A+ g_object_class_install_property (object_class,
17398N/A+ g_param_spec_string ("display-type",
17398N/A+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
17398N/A+ g_object_class_install_property (object_class,
17398N/A+ g_param_spec_string ("seat-id",
17398N/A+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
17398N/A dbus_g_object_type_install_info (GDM_TYPE_SESSION_DIRECT, &dbus_glib_gdm_session_direct_object_info);
17398N/A+display_proxy_destroyed_cb (DBusGProxy *display_proxy,
17398N/A+ g_debug ("GdmSessionDirect: Disconnected from display");
17398N/A+ session->priv->display_proxy = NULL;
17398N/A+init_display_data (GdmSessionDirect *session)
17398N/A+ g_assert (session->priv->display_proxy == NULL);
17398N/A+ session->priv->connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);
17398N/A+ if (session->priv->connection == NULL) {
17398N/A+ g_critical ("error getting system bus: %s", error->message);
17398N/A+ session->priv->display_proxy = dbus_g_proxy_new_for_name_owner (
17398N/A+ g_signal_connect (session->priv->display_proxy,
17398N/A+ G_CALLBACK (display_proxy_destroyed_cb),
17398N/A+ if (session->priv->display_proxy == NULL) {
17398N/A+ g_warning ("Failed to create display proxy %s: %s", session->priv->display_id, error->message);
17398N/A+ g_warning ("Unable to create display proxy");
17398N/A+ /* Make sure display ID works */
17398N/A+ res = dbus_g_proxy_call (session->priv->display_proxy,
17398N/A+ g_warning ("Failed to get display id %s: %s", session->priv->display_id, error->message);
17398N/A+ g_warning ("Failed to get display id %s", session->priv->display_id);
17398N/A+ if (strcmp (id, session->priv->display_id) != 0) {
17398N/A+ g_critical ("Display ID doesn't match");
17398N/A+ res = dbus_g_proxy_call (session->priv->display_proxy,
17398N/A+ G_TYPE_STRING, &session->priv->display_type,
17398N/A+ g_warning ("Failed to get value: %s", error->message);
17398N/A+ g_warning ("Failed to get value");
17398N/A+ res = dbus_g_proxy_call (session->priv->display_proxy,
17398N/A+ G_TYPE_STRING, &session->priv->display_seat_id,
17398N/A+ g_warning ("Failed to get value: %s", error->message);
17398N/A+ g_warning ("Failed to get value");
17291N/A gdm_session_direct_new (const char *display_id,
20788N/A@@ -2911,6 +3172,8 @@ gdm_session_direct_new (const char *disp
17398N/A "display-is-local", display_is_local,
20839N/A@@ -115,6 +115,8 @@ struct GdmSessionWorkerPrivate
20839N/A@@ -174,6 +176,8 @@ open_ck_session (GdmSessionWorker *work
20839N/A@@ -185,6 +189,16 @@ open_ck_session (GdmSessionWorker *work
17291N/A+ if (worker->priv->x11_display_type != NULL) {
17291N/A+ display_type = worker->priv->x11_display_type;
17398N/A+ if (worker->priv->seat_id != NULL) {
17398N/A+ seat_id = worker->priv->seat_id;
17291N/A if (worker->priv->hostname != NULL) {
17291N/A display_hostname = worker->priv->hostname;
20839N/A@@ -221,6 +235,8 @@ open_ck_session (GdmSessionWorker *work
17291N/A res = ck_connector_open_session_with_parameters (worker->priv->ckc,
17291N/A+ "display-type", &display_type,
17291N/A "x11-display-device", &display_device,
20839N/A@@ -1553,6 +1569,7 @@ static void
16983N/A register_ck_session (GdmSessionWorker *worker)
20839N/A@@ -1565,6 +1582,11 @@ register_ck_session (GdmSessionWorker *w
16983N/A+ session_id = ck_connector_get_session_id (worker->priv->ckc);
16983N/A+ send_dbus_string_method (worker->priv->connection,
16983N/A+ "DisplayConsoleSessionUpdated",
20839N/A@@ -1584,19 +1606,26 @@ session_worker_child_watch (GPid
17226N/A int code = WEXITSTATUS (status);
17226N/A+ ck_connector_set_remove_on_close (worker->priv->ckc,
17226N/A send_dbus_int_method (worker->priv->connection,
17226N/A } else if (WIFSIGNALED (status)) {
17226N/A+ ck_connector_set_remove_on_close (worker->priv->ckc,
17226N/A send_dbus_int_method (worker->priv->connection,
17226N/A if (worker->priv->ckc != NULL) {
17226N/A- ck_connector_close_session (worker->priv->ckc, NULL);
17226N/A ck_connector_unref (worker->priv->ckc);
20839N/A@@ -2352,6 +2381,8 @@ on_setup (GdmSessionWorker *worker,
17291N/A const char *x11_authority_file;
20839N/A@@ -2367,6 +2398,8 @@ on_setup (GdmSessionWorker *worker,
17291N/A DBUS_TYPE_STRING, &x11_display_name,
17291N/A+ DBUS_TYPE_STRING, &x11_display_type,
17291N/A DBUS_TYPE_STRING, &x11_authority_file,
20839N/A@@ -2374,6 +2407,8 @@ on_setup (GdmSessionWorker *worker,
17291N/A worker->priv->service = g_strdup (service);
17291N/A worker->priv->x11_display_name = g_strdup (x11_display_name);
17291N/A+ worker->priv->x11_display_type = g_strdup (x11_display_type);
17398N/A+ worker->priv->seat_id = g_strdup (seat_id);
17291N/A worker->priv->x11_authority_file = g_strdup (x11_authority_file);
17291N/A worker->priv->display_device = g_strdup (console);
17291N/A worker->priv->hostname = g_strdup (hostname);
20839N/A@@ -2394,6 +2429,8 @@ on_setup_for_user (GdmSessionWorker *wor
18940N/A const char *x11_authority_file;
20839N/A@@ -2410,6 +2447,8 @@ on_setup_for_user (GdmSessionWorker *wor
18940N/A DBUS_TYPE_STRING, &x11_display_name,
18940N/A+ DBUS_TYPE_STRING, &x11_display_type,
18940N/A DBUS_TYPE_STRING, &x11_authority_file,
20839N/A@@ -2418,6 +2457,8 @@ on_setup_for_user (GdmSessionWorker *wor
18940N/A worker->priv->service = g_strdup (service);
18940N/A worker->priv->x11_display_name = g_strdup (x11_display_name);
18940N/A+ worker->priv->x11_display_type = g_strdup (x11_display_type);
18940N/A+ worker->priv->seat_id = g_strdup (seat_id);
18940N/A worker->priv->x11_authority_file = g_strdup (x11_authority_file);
18940N/A worker->priv->display_device = g_strdup (console);
18940N/A worker->priv->hostname = g_strdup (hostname);
20839N/A@@ -2615,6 +2656,10 @@ worker_dbus_filter_function (DBusConnect
20809N/A g_debug ("GdmSessionWorker: Got disconnected from the server");
20809N/A+ ck_connector_set_remove_on_close (worker->priv->ckc,
20809N/A dbus_connection_unref (connection);
20809N/A worker->priv->connection = NULL;
20788N/A@@ -472,6 +472,10 @@ start_session_timeout (GdmSimpleSlave *s
16983N/A+ /* Defer requests to use this display from ConsoleKit
16983N/A+ gdm_slave_block_console_session_requests_on_display (GDM_SLAVE (slave));
20788N/A@@ -487,6 +491,7 @@ start_session_timeout (GdmSimpleSlave *s
20788N/A gdm_session_start_session (GDM_SESSION (slave->priv->session),
20788N/A slave->priv->start_session_service_name);
16983N/A+ gdm_slave_unblock_console_session_requests_on_display (GDM_SLAVE (slave));
16983N/A slave->priv->start_session_id = 0;
20788N/A g_free (slave->priv->start_session_service_name);
20788N/A@@ -729,6 +734,16 @@ start_autologin_conversation_if_necessar
16983N/A+on_console_session_changed (GdmSession *session,
16983N/A+ g_debug ("GdmSimpleSlave: Default session name changed: %s", text);
16983N/A+ gdm_slave_set_console_session_id (GDM_SLAVE (slave), text);
16983N/A create_new_session (GdmSimpleSlave *slave)
20788N/A@@ -763,6 +778,7 @@ create_new_session (GdmSimpleSlave *slav
17398N/A+ g_free (display_x11_authority_file);
17398N/A g_signal_connect (slave->priv->session,
20788N/A@@ -873,6 +889,11 @@ create_new_session (GdmSimpleSlave *slav
16983N/A G_CALLBACK (on_default_session_name_changed),
16983N/A+ g_signal_connect (slave->priv->session,
16983N/A+ "notify::display-console-session",
16983N/A+ G_CALLBACK (on_console_session_changed),
20788N/A start_autologin_conversation_if_necessary (slave);
20816N/A@@ -992,7 +1013,7 @@ on_greeter_session_exited (GdmGreeterSes
20816N/A g_debug ("GdmSimpleSlave: Greeter exited: %d", code);
20816N/A- gdm_slave_stopped (GDM_SLAVE (slave));
20816N/A+ gdm_slave_failed (GDM_SLAVE (slave));
20788N/A@@ -1192,6 +1213,7 @@ start_greeter (GdmSimpleSlave *slave)
20788N/A@@ -1204,6 +1226,7 @@ start_greeter (GdmSimpleSlave *slave)
20788N/A@@ -1213,6 +1236,7 @@ start_greeter (GdmSimpleSlave *slave)
16880N/A "display-is-local", &display_is_local,
16983N/A+ "display-session-id", &session_id,
16880N/A "display-hostname", &display_hostname,
16880N/A "display-x11-authority-file", &auth_file,
20788N/A@@ -1297,6 +1321,7 @@ start_greeter (GdmSimpleSlave *slave)
16880N/A g_debug ("GdmSimpleSlave: Creating greeter on %s %s %s", display_name, display_device, display_hostname);
16880N/A slave->priv->greeter = gdm_greeter_session_new (display_name,
20816N/A@@ -1385,7 +1410,11 @@ on_server_exited (GdmServer *server
20816N/A g_debug ("GdmSimpleSlave: server exited with code %d\n", exit_code);
20816N/A- gdm_slave_stopped (GDM_SLAVE (slave));
20816N/A+ gdm_slave_failed (GDM_SLAVE (slave));
20816N/A+ gdm_slave_stopped (GDM_SLAVE (slave));
20816N/A@@ -1403,31 +1432,20 @@ on_server_died (GdmServer *server,
16880N/A gdm_simple_slave_run (GdmSimpleSlave *slave)
16880N/A "display-is-local", &display_is_local,
16880N/A- "display-name", &display_name,
16880N/A- "display-x11-authority-file", &auth_file,
16880N/A /* if this is local display start a server if one doesn't
16880N/A- slave->priv->server = gdm_server_new (display_name, auth_file);
17753N/A- if (gdm_settings_client_get_boolean (GDM_KEY_DISALLOW_TCP,
17753N/A- g_object_set (slave->priv->server,
16880N/A+ slave->priv->server = gdm_server_new (display_id);
17753N/A g_signal_connect (slave->priv->server,
20816N/A@@ -1460,8 +1478,7 @@ gdm_simple_slave_run (GdmSimpleSlave *sl
16880N/A g_timeout_add (500, (GSourceFunc)idle_connect_to_display, slave);
20816N/A@@ -83,11 +83,13 @@ struct GdmSlavePrivate
16880N/A char *display_x11_authority_file;
16983N/A char *parent_display_x11_authority_file;
16880N/A PROP_DISPLAY_X11_AUTHORITY_FILE
20816N/A@@ -749,6 +754,24 @@ gdm_slave_real_start (GdmSlave *slave)
17291N/A res = dbus_g_proxy_call (slave->priv->display_proxy,
17291N/A+ G_TYPE_STRING, &slave->priv->display_type,
17291N/A+ g_warning ("Failed to get value: %s", error->message);
17291N/A+ g_warning ("Failed to get value");
17291N/A+ res = dbus_g_proxy_call (slave->priv->display_proxy,
20816N/A@@ -838,6 +861,24 @@ gdm_slave_real_start (GdmSlave *slave)
16983N/A+ res = dbus_g_proxy_call (slave->priv->display_proxy,
16983N/A+ G_TYPE_STRING, &slave->priv->display_session_id,
16983N/A+ g_warning ("Failed to get value: %s", error->message);
16983N/A+ g_warning ("Failed to get value");
20816N/A@@ -893,6 +934,42 @@ gdm_slave_stopped (GdmSlave *slave)
16983N/A g_signal_emit (slave, signals [STOPPED], 0);
20816N/A+gdm_slave_failed (GdmSlave *slave)
20816N/A+ g_return_if_fail (GDM_IS_SLAVE (slave));
20816N/A+ g_signal_emit (slave, signals [FAILED], 0);
16983N/A+gdm_slave_set_console_session_id (GdmSlave *slave,
16983N/A+ g_debug ("GdmSlave: Informing display of new session id");
16983N/A+ res = dbus_g_proxy_call (slave->priv->display_proxy,
16983N/A+ G_TYPE_INVALID, G_TYPE_INVALID);
16983N/A+ g_warning ("Failed to set console session id: %s", error->message);
16983N/A+ g_warning ("Failed to set console session id");
16983N/A+ g_debug ("GdmSlave: Set console session id");
16983N/A gdm_slave_add_user_authorization (GdmSlave *slave,
20816N/A@@ -1476,6 +1553,59 @@ gdm_slave_switch_to_user_session (GdmSla
16983N/A+gdm_slave_block_console_session_requests_on_display (GdmSlave *slave)
16983N/A+ g_debug ("GdmSlave: Asking display to ignore ConsoleKit");
16983N/A+ res = dbus_g_proxy_call (slave->priv->display_proxy,
16983N/A+ "BlockConsoleSessionRequests",
16983N/A+ G_TYPE_INVALID, G_TYPE_INVALID);
16983N/A+ g_warning ("Failed to get display to ignore ConsoleKit: %s", error->message);
16983N/A+ g_warning ("Failed to get display to ignore ConsoleKit");
16983N/A+ g_debug ("GdmSlave: Display is now ignoring ConsoleKit");
16983N/A+gdm_slave_unblock_console_session_requests_on_display (GdmSlave *slave)
16983N/A+ g_debug ("GdmSlave: Informing display to stop ignoring ConsoleKit");
16983N/A+ res = dbus_g_proxy_call (slave->priv->display_proxy,
16983N/A+ "UnblockConsoleSessionRequests",
16983N/A+ G_TYPE_INVALID, G_TYPE_INVALID);
16983N/A+ g_warning ("Failed to get display to stop ignoring ConsoleKit: %s", error->message);
16983N/A+ g_warning ("Failed to get display to stop ignoring ConsoleKit");
16983N/A+ g_debug ("GdmSlave: Display is no longer ignoring ConsoleKit");
16983N/A _gdm_slave_set_display_id (GdmSlave *slave,
20816N/A@@ -1492,6 +1622,15 @@ _gdm_slave_set_display_name (GdmSlave
17291N/A slave->priv->display_name = g_strdup (name);
17291N/A+_gdm_slave_set_display_type (GdmSlave *slave,
17291N/A+ g_free (slave->priv->display_type);
17291N/A+ slave->priv->display_type = g_strdup (type);
17291N/A _gdm_slave_set_display_number (GdmSlave *slave,
20816N/A@@ -1524,6 +1663,14 @@ _gdm_slave_set_display_seat_id (GdmSlave
16983N/A+_gdm_slave_set_display_session_id (GdmSlave *slave,
16983N/A+ g_free (slave->priv->display_session_id);
16983N/A+ slave->priv->display_session_id = g_strdup (id);
16983N/A _gdm_slave_set_display_is_local (GdmSlave *slave,
20816N/A@@ -1547,6 +1694,9 @@ gdm_slave_set_property (GObject *ob
17291N/A _gdm_slave_set_display_name (self, g_value_get_string (value));
17291N/A+ _gdm_slave_set_display_type (self, g_value_get_string (value));
17291N/A _gdm_slave_set_display_number (self, g_value_get_int (value));
20816N/A@@ -1556,6 +1706,9 @@ gdm_slave_set_property (GObject *ob
16983N/A _gdm_slave_set_display_seat_id (self, g_value_get_string (value));
16983N/A+ _gdm_slave_set_display_session_id (self, g_value_get_string (value));
16983N/A case PROP_DISPLAY_X11_AUTHORITY_FILE:
16983N/A _gdm_slave_set_display_x11_authority_file (self, g_value_get_string (value));
20816N/A@@ -1585,6 +1738,9 @@ gdm_slave_get_property (GObject *obje
17291N/A g_value_set_string (value, self->priv->display_name);
17291N/A+ g_value_set_string (value, self->priv->display_type);
17291N/A g_value_set_int (value, self->priv->display_number);
20816N/A@@ -1594,6 +1750,9 @@ gdm_slave_get_property (GObject *obje
16983N/A g_value_set_string (value, self->priv->display_seat_id);
16983N/A+ g_value_set_string (value, self->priv->display_session_id);
16983N/A case PROP_DISPLAY_X11_AUTHORITY_FILE:
16983N/A g_value_set_string (value, self->priv->display_x11_authority_file);
20816N/A@@ -1688,6 +1847,13 @@ gdm_slave_class_init (GdmSlaveClass *kla
17291N/A G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
17291N/A g_object_class_install_property (object_class,
17291N/A+ g_param_spec_string ("display-type",
17291N/A+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
17291N/A+ g_object_class_install_property (object_class,
17291N/A g_param_spec_int ("display-number",
20816N/A@@ -1711,6 +1877,13 @@ gdm_slave_class_init (GdmSlaveClass *kla
16983N/A G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
16983N/A g_object_class_install_property (object_class,
16983N/A+ g_param_spec_string ("display-session-id",
16983N/A+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
16983N/A+ g_object_class_install_property (object_class,
16983N/A PROP_DISPLAY_X11_AUTHORITY_FILE,
16983N/A g_param_spec_string ("display-x11-authority-file",
20816N/A@@ -1736,6 +1909,17 @@ gdm_slave_class_init (GdmSlaveClass *kla
20816N/A+ G_TYPE_FROM_CLASS (object_class),
20816N/A+ G_STRUCT_OFFSET (GdmSlaveClass, failed),
20816N/A+ g_cclosure_marshal_VOID__VOID,
20816N/A dbus_g_object_type_install_info (GDM_TYPE_SLAVE, &dbus_glib_gdm_slave_object_info);
20816N/A@@ -1765,6 +1949,7 @@ gdm_slave_finalize (GObject *object)
17291N/A g_free (slave->priv->display_id);
17291N/A g_free (slave->priv->display_name);
17291N/A+ g_free (slave->priv->display_type);
17291N/A g_free (slave->priv->display_hostname);
17291N/A g_free (slave->priv->display_seat_id);
17291N/A g_free (slave->priv->display_x11_authority_file);
20816N/A@@ -51,6 +51,7 @@ typedef struct
20816N/A void (*stopped) (GdmSlave *slave);
20816N/A+ void (*failed) (GdmSlave *slave);
20816N/A GType gdm_slave_get_type (void);
20816N/A@@ -72,6 +73,9 @@ gboolean gdm_slave_add_user_a
16983N/A gboolean gdm_slave_switch_to_user_session (GdmSlave *slave,
16983N/A+void gdm_slave_block_console_session_requests_on_display (GdmSlave *slave);
16983N/A+void gdm_slave_unblock_console_session_requests_on_display (GdmSlave *slave);
16983N/A gboolean gdm_slave_connect_to_x11_display (GdmSlave *slave);
20788N/A void gdm_slave_set_initial_cursor_position (GdmSlave *slave);
20816N/A@@ -81,6 +85,8 @@ gboolean gdm_slave_run_script
16983N/A void gdm_slave_stopped (GdmSlave *slave);
16983N/A+void gdm_slave_set_console_session_id (GdmSlave *slave,
20788N/A@@ -67,6 +67,7 @@ struct GdmWelcomeSessionPrivate
20839N/A@@ -137,6 +139,8 @@ open_welcome_session (GdmWelcomeSession
20839N/A const char *x11_display_device;
20839N/A@@ -172,6 +176,18 @@ open_welcome_session (GdmWelcomeSession
20839N/A+ if (welcome_session->priv->x11_display_seat_id != NULL) {
20839N/A+ seat_id = welcome_session->priv->x11_display_seat_id;
20839N/A+ if (welcome_session->priv->x11_display_session_id != NULL) {
20839N/A+ session_id = welcome_session->priv->x11_display_session_id;
20839N/A g_debug ("GdmWelcomeSession: Opening ConsoleKit session for user:%d x11-display:'%s' x11-display-device:'%s' remote-host-name:'%s' is-local:%d",
20839N/A welcome_session->priv->x11_display_name,
20839N/A@@ -185,6 +201,8 @@ open_welcome_session (GdmWelcomeSession
20839N/A "x11-display", &welcome_session->priv->x11_display_name,
20839N/A "x11-display-device", &x11_display_device,
20839N/A "is-local", &welcome_session->priv->x11_display_is_local,
20839N/A@@ -1060,6 +1078,14 @@ _gdm_welcome_session_set_x11_display_sea
16983N/A+_gdm_welcome_session_set_x11_display_session_id (GdmWelcomeSession *welcome_session,
16983N/A+ g_free (welcome_session->priv->x11_display_session_id);
16983N/A+ welcome_session->priv->x11_display_session_id = g_strdup (ssid);
16880N/A _gdm_welcome_session_set_x11_display_hostname (GdmWelcomeSession *welcome_session,
20839N/A@@ -1082,7 +1108,6 @@ _gdm_welcome_session_set_x11_display_is_
20839N/A welcome_session->priv->x11_display_is_local = is_local;
20839N/A _gdm_welcome_session_set_x11_authority_file (GdmWelcomeSession *welcome_session,
20839N/A@@ -1171,6 +1196,9 @@ gdm_welcome_session_set_property (GObjec
20788N/A _gdm_welcome_session_set_x11_display_seat_id (self, g_value_get_string (value));
16983N/A+ case PROP_X11_DISPLAY_SESSION_ID:
16983N/A+ _gdm_welcome_session_set_x11_display_session_id (self, g_value_get_string (value));
16880N/A case PROP_X11_DISPLAY_HOSTNAME:
16880N/A _gdm_welcome_session_set_x11_display_hostname (self, g_value_get_string (value));
20839N/A@@ -1233,6 +1261,9 @@ gdm_welcome_session_get_property (GObjec
20788N/A g_value_set_string (value, self->priv->x11_display_seat_id);
16983N/A+ case PROP_X11_DISPLAY_SESSION_ID:
16983N/A+ g_value_set_string (value, self->priv->x11_display_session_id);
16880N/A case PROP_X11_DISPLAY_HOSTNAME:
16880N/A g_value_set_string (value, self->priv->x11_display_hostname);
20839N/A@@ -1318,6 +1349,29 @@ gdm_welcome_session_class_init (GdmWelco
16880N/A G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
20788N/A+ g_object_class_install_property (object_class,
20788N/A+ g_param_spec_string ("x11-display-session-id",
20788N/A+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
20788N/A+ g_object_class_install_property (object_class,
16880N/A+ g_param_spec_string ("x11-display-seat-id",
16880N/A+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
16880N/A+ g_object_class_install_property (object_class,
16983N/A+ g_param_spec_string ("x11-display-session-id",
16983N/A+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
20788N/A g_object_class_install_property (object_class,
16880N/A g_param_spec_string ("x11-display-hostname",
20839N/A@@ -1488,6 +1542,7 @@ gdm_welcome_session_finalize (GObject *o
17724N/A g_free (welcome_session->priv->runtime_dir);
16880N/A g_free (welcome_session->priv->x11_display_name);
20788N/A g_free (welcome_session->priv->x11_display_seat_id);
18940N/A+ g_free (welcome_session->priv->x11_display_session_id);
16880N/A g_free (welcome_session->priv->x11_display_device);
16880N/A g_free (welcome_session->priv->x11_display_hostname);
16880N/A g_free (welcome_session->priv->x11_authority_file);
16880N/A@@ -224,7 +224,7 @@ gdm_xdmcp_chooser_display_new (const char *hostname,
16880N/A "x11-display-name", x11_display,
16880N/A "session-number", session_number,
18160N/A # Plus a lot of fun stuff added
18160N/A -e 's,[@]libexecdir[@],$(libexecdir),g' \
18160N/A- sed -e 's,[@]X_PATH[@],$(X_PATH),g' \
18160N/A- sed -e 's,[@]X_PATH[@],$(X_PATH),g' \
18160N/A- sed -e 's,[@]X_PATH[@],$(X_PATH),g' \
18160N/A sed -e 's,[@]GDM_DEFAULTS_CONF[@],$(GDM_DEFAULTS_CONF),g' \
18160N/A # Note that output goes into the .xsession-errors file for easy debugging
17753N/A@@ -1364,18 +1364,6 @@ TimedLogin=you
17753N/A- <synopsis>DisallowTCP=true</synopsis>
17753N/A- If true, then always append <filename>-nolisten tcp</filename>
17753N/A- to the command line when starting attached Xservers, thus
17753N/A- disallowing TCP connection. This is a more secure
17753N/A- configuration if you are not using remote connections.
20244N/A@@ -216,7 +216,19 @@ bus_proxy_destroyed_cb (DBusGProxy *bus
20244N/A+ * This function is only called when the D-Bus Service exits. Calling
20244N/A+ * this timeout function causes all GDM sessions to exit anyway. The
20244N/A+ * timeout function just cauess GDM to act like it is starting again.
20244N/A+ * Since SMF already takes care of restarting GDM on Solaris, and since
20244N/A+ * using the timeout confuses SMF, just exit and let SMF take care of
20244N/A g_timeout_add_seconds (3, (GSourceFunc)bus_reconnect, managerp);
20839N/A@@ -245,6 +245,7 @@ kill_slave (GdmSlaveProxy *slave)
20839N/A g_warning ("Unable to kill slave process");
20839N/A exit_status = gdm_wait_on_pid (slave->priv->pid);
20839N/A+ g_debug ("GdmSlaveProxy: Slave exit status %d", exit_status);
20839N/A g_spawn_close_pid (slave->priv->pid);
20816N/A@@ -154,6 +154,15 @@ on_slave_stopped (GdmSlave *slave,
20816N/A+on_slave_failed (GdmSlave *slave,
20816N/A@@ -256,6 +265,10 @@ main (int argc,