← Back to branch summary

~xnox/lightdm/archive-upload

« back to all changes in this revision

Viewing changes to src/seat.c

  • Committer: Robert Ancell
  • Date: 2013-11-27 03:48:36 UTC
  • mfrom: (1845 trunk)
  • mto: This revision was merged to the branch mainline in revision 1846.
  • Revision ID: robert.ancell@canonical.com-20131127034836-c9jba09zw4z3paur
Merge with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/seat.c
135
135
    return g_hash_table_lookup (seat->priv->properties, name);
136
136
}
137
137
 
 
138
gchar **
 
139
seat_get_string_list_property (Seat *seat, const gchar *name)
 
140
{
 
141
    g_return_val_if_fail (seat != NULL, NULL);
 
142
    return g_strsplit (g_hash_table_lookup (seat->priv->properties, name), ";", 0);
 
143
}
 
144
 
138
145
gboolean
139
146
seat_get_boolean_property (Seat *seat, const gchar *name)
140
147
{
430
437
        DisplayServer *display_server;
431
438
 
432
439
        display_server = create_display_server (seat, session_get_session_type (session));
 
440
        session_set_display_server (session, display_server);
433
441
        if (!display_server_start (display_server))
434
442
        {
435
443
            l_debug (seat, "Failed to start display server for greeter");
436
444
            seat_stop (seat);
437
445
        }
438
 
 
439
 
        session_set_display_server (session, display_server);
440
446
    }
441
447
 
442
448
    start_session (seat, SESSION (greeter_session));
1382
1388
        return FALSE;
1383
1389
 
1384
1390
    display_server = create_display_server (seat, session_get_session_type (session));
1385
 
    if (!display_server_start (display_server))
1386
 
        return FALSE;
1387
1391
 
1388
1392
    if (seat->priv->session_to_activate)
1389
1393
        g_object_unref (seat->priv->session_to_activate);
1391
1395
    session_set_pam_service (session, AUTOLOGIN_SERVICE);
1392
1396
    session_set_display_server (session, display_server);
1393
1397
 
1394
 
    return TRUE;
 
1398
    return display_server_start (display_server);
1395
1399
}
1396
1400
 
1397
1401
gboolean
1421
1425
        return FALSE;
1422
1426
 
1423
1427
    display_server = create_display_server (seat, session_get_session_type (SESSION (greeter_session)));
1424
 
    if (!display_server_start (display_server))
1425
 
        return FALSE;
1426
1428
 
1427
1429
    if (seat->priv->session_to_activate)
1428
1430
        g_object_unref (seat->priv->session_to_activate);
1432
1434
        greeter_set_hint (greeter_session, "select-user", username);
1433
1435
    session_set_display_server (SESSION (greeter_session), display_server);
1434
1436
 
1435
 
    return TRUE;
 
1437
    return display_server_start (display_server);
1436
1438
}
1437
1439
 
1438
1440
void