← Back to branch summary

~mterry/lightdm/upstart

« back to all changes in this revision

Viewing changes to src/display.c

  • Committer: Robert Ancell
  • Date: 2011-08-17 05:08:25 UTC
  • Revision ID: robert.ancell@canonical.com-20110817050825-gtg4pasqcd7ohusw
Fix whitespace

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/display.c
1
1
/*
2
2
 * Copyright (C) 2010-2011 Robert Ancell.
3
3
 * Author: Robert Ancell <robert.ancell@canonical.com>
4
 
 * 
 
4
 *
5
5
 * This program is free software: you can redistribute it and/or modify it under
6
6
 * the terms of the GNU General Public License as published by the Free Software
7
7
 * Foundation, either version 3 of the License, or (at your option) any later
59
59
 
60
60
    /* Session requested to log into */
61
61
    gchar *user_session;
62
 
  
 
62
 
63
63
    /* Program to run sessions through */
64
64
    gchar *session_wrapper;
65
65
 
71
71
 
72
72
    /* TRUE if in a user session */
73
73
    gboolean in_user_session;
74
 
  
 
74
 
75
75
    /* TRUE if have emitted ready signal */
76
76
    gboolean indicated_ready;
77
 
  
 
77
 
78
78
    /* Session process */
79
79
    Session *session;
80
80
 
88
88
 
89
89
    /* TRUE if start greeter if fail to login */
90
90
    gboolean start_greeter_if_fail;
91
 
  
 
91
 
92
92
    /* Hint to select user in greeter */
93
93
    gchar *select_user_hint;
94
94
    gboolean select_guest_hint;
95
 
  
 
95
 
96
96
    /* TRUE if allowed to log into guest account */
97
97
    gboolean allow_guest;
98
98
 
99
99
    /* TRUE if stopping the display (waiting for dispaly server, greeter and session to stop) */
100
 
    gboolean stopping;    
 
100
    gboolean stopping;
101
101
};
102
102
 
103
103
G_DEFINE_TYPE (Display, display, G_TYPE_OBJECT);
239
239
                                           NULL,
240
240
                                           "org.freedesktop.ConsoleKit",
241
241
                                           "/org/freedesktop/ConsoleKit/Manager",
242
 
                                           "org.freedesktop.ConsoleKit.Manager", 
 
242
                                           "org.freedesktop.ConsoleKit.Manager",
243
243
                                           NULL, &error);
244
244
    if (!proxy)
245
245
        g_warning ("Unable to get connection to ConsoleKit: %s", error->message);
313
313
                                           NULL,
314
314
                                           "org.freedesktop.ConsoleKit",
315
315
                                           "/org/freedesktop/ConsoleKit/Manager",
316
 
                                           "org.freedesktop.ConsoleKit.Manager", 
 
316
                                           "org.freedesktop.ConsoleKit.Manager",
317
317
                                           NULL, NULL);
318
318
    result = g_dbus_proxy_call_sync (proxy,
319
319
                                     "CloseSession",
484
484
    if (!display->priv->display_server)
485
485
        return;
486
486
 
487
 
    /* Start the session for the authenticated user */  
 
487
    /* Start the session for the authenticated user */
488
488
    if (greeter_get_guest_authenticated (display->priv->greeter))
489
489
    {
490
490
        started_session = autologin_guest (display, FALSE);
630
630
        process_set_env (PROCESS (session), "LIGHTDM_TEST_HOME_DIR", g_getenv ("LIGHTDM_TEST_HOME_DIR"));
631
631
        process_set_env (PROCESS (session), "LD_LIBRARY_PATH", g_getenv ("LD_LIBRARY_PATH"));
632
632
    }
633
 
 
 
633
 
634
634
    return session;
635
635
}
636
636
 
667
667
 
668
668
    /* Stop the greeter, the session will start when the greeter has quit */
669
669
    g_debug ("Stopping greeter");
670
 
    session_stop (display->priv->session);  
 
670
    session_stop (display->priv->session);
671
671
 
672
672
    return TRUE;
673
673
}
732
732
        if (display->priv->autologin_user)
733
733
            greeter_set_hint (display->priv->greeter, "autologin-user", display->priv->autologin_user);
734
734
        else if (display->priv->autologin_guest)
735
 
            greeter_set_hint (display->priv->greeter, "autologin-guest", "true");        
 
735
            greeter_set_hint (display->priv->greeter, "autologin-guest", "true");
736
736
    }
737
737
    if (display->priv->select_user_hint)
738
738
        greeter_set_hint (display->priv->greeter, "select-user", display->priv->select_user_hint);
777
777
    gboolean result = FALSE;
778
778
 
779
779
    g_debug ("Starting user session");
780
 
  
 
780
 
781
781
    user = pam_session_get_user (authentication);
782
782
 
783
783
    /* Load the users login settings (~/.dmrc) */
918
918
                                           NULL,
919
919
                                           "org.freedesktop.ConsoleKit",
920
920
                                           "/org/freedesktop/ConsoleKit/Manager",
921
 
                                           "org.freedesktop.ConsoleKit.Manager", 
 
921
                                           "org.freedesktop.ConsoleKit.Manager",
922
922
                                           NULL, &error);
923
923
    if (!proxy)
924
924
        g_warning ("Unable to get connection to ConsoleKit: %s", error->message);
954
954
                                           NULL,
955
955
                                           "org.freedesktop.ConsoleKit",
956
956
                                           session_path,
957
 
                                           "org.freedesktop.ConsoleKit.Session", 
 
957
                                           "org.freedesktop.ConsoleKit.Session",
958
958
                                           NULL, &error);
959
959
    if (!proxy)
960
960
        g_warning ("Unable to get connection to ConsoleKit session: %s", error->message);