← Back to branch summary

~josharenson/lightdm/fix-null-logname

« back to all changes in this revision

Viewing changes to src/seat-xlocal.c

  • Committer: Josh Arenson
  • Date: 2016-06-17 22:19:35 UTC
  • mfrom: (2321.2.10 trunk)
  • Revision ID: joshua.arenson@canonical.com-20160617221935-xmo23vf58j280616
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/seat-xlocal.c
170
170
create_x_server (Seat *seat)
171
171
{
172
172
    XServerLocal *x_server;
 
173
    gchar *number;
 
174
    XAuthority *cookie;
173
175
    const gchar *command = NULL, *layout = NULL, *config_file = NULL;
174
176
    gboolean allow_tcp;
175
177
    gint vt;
193
195
    if (command)
194
196
        x_server_local_set_command (x_server, command);
195
197
 
 
198
    number = g_strdup_printf ("%d", x_server_get_display_number (X_SERVER (x_server)));
 
199
    cookie = x_authority_new_local_cookie (number);
 
200
    x_server_set_authority (X_SERVER (x_server), cookie);
 
201
    g_free (number);
 
202
    g_object_unref (cookie);
 
203
 
196
204
    layout = seat_get_string_property (seat, "xserver-layout");
197
205
    if (layout)
198
206
        x_server_local_set_layout (x_server, layout);