Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 588764 | Differences between
and this patch

Collapse All | Expand All

(-)lightdm-gtk-greeter-2.0.1.orig/src/lightdm-gtk-greeter.c (-7 / +14 lines)
Lines 1919-1924 start_authentication (const gchar *usern Link Here
1919
    prompted = FALSE;
1919
    prompted = FALSE;
1920
    password_prompted = FALSE;
1920
    password_prompted = FALSE;
1921
    prompt_active = FALSE;
1921
    prompt_active = FALSE;
1922
    GError *error = NULL;
1922
1923
1923
    if (pending_questions)
1924
    if (pending_questions)
1924
    {
1925
    {
Lines 1932-1942 start_authentication (const gchar *usern Link Here
1932
    {
1933
    {
1933
        gtk_widget_show (GTK_WIDGET (username_entry));
1934
        gtk_widget_show (GTK_WIDGET (username_entry));
1934
        gtk_widget_show (GTK_WIDGET (cancel_button));
1935
        gtk_widget_show (GTK_WIDGET (cancel_button));
1935
        lightdm_greeter_authenticate (greeter, NULL);
1936
        lightdm_greeter_authenticate (greeter, NULL, &error);
1936
    }
1937
    }
1937
    else if (g_strcmp0 (username, "*guest") == 0)
1938
    else if (g_strcmp0 (username, "*guest") == 0)
1938
    {
1939
    {
1939
        lightdm_greeter_authenticate_as_guest (greeter);
1940
        lightdm_greeter_authenticate_as_guest (greeter, &error);
1940
    }
1941
    }
1941
    else
1942
    else
1942
    {
1943
    {
Lines 1956-1962 start_authentication (const gchar *usern Link Here
1956
            set_language (NULL);
1957
            set_language (NULL);
1957
        }
1958
        }
1958
1959
1959
        lightdm_greeter_authenticate (greeter, username);
1960
        lightdm_greeter_authenticate (greeter, username, &error);
1960
    }
1961
    }
1961
}
1962
}
1962
1963
Lines 1966-1971 cancel_authentication (void) Link Here
1966
    GtkTreeModel *model;
1967
    GtkTreeModel *model;
1967
    GtkTreeIter iter;
1968
    GtkTreeIter iter;
1968
    gboolean other = FALSE;
1969
    gboolean other = FALSE;
1970
    GError *error = NULL;
1969
1971
1970
    if (pending_questions)
1972
    if (pending_questions)
1971
    {
1973
    {
Lines 1978-1984 cancel_authentication (void) Link Here
1978
    if (lightdm_greeter_get_in_authentication (greeter))
1980
    if (lightdm_greeter_get_in_authentication (greeter))
1979
    {
1981
    {
1980
        cancelling = TRUE;
1982
        cancelling = TRUE;
1981
        lightdm_greeter_cancel_authentication (greeter);
1983
        lightdm_greeter_cancel_authentication (greeter, &error);
1982
        set_message_label (LIGHTDM_MESSAGE_TYPE_INFO, NULL);
1984
        set_message_label (LIGHTDM_MESSAGE_TYPE_INFO, NULL);
1983
    }
1985
    }
1984
1986
Lines 2009-2018 start_session (void) Link Here
2009
{
2011
{
2010
    gchar *language;
2012
    gchar *language;
2011
    gchar *session;
2013
    gchar *session;
2014
    GError *error = NULL;
2012
2015
2013
    language = get_language ();
2016
    language = get_language ();
2014
    if (language)
2017
    if (language)
2015
        lightdm_greeter_set_language (greeter, language);
2018
        lightdm_greeter_set_language (greeter, language, &error);
2016
    g_free (language);
2019
    g_free (language);
2017
2020
2018
    session = get_session ();
2021
    session = get_session ();
Lines 2220-2225 G_MODULE_EXPORT Link Here
2220
void
2223
void
2221
login_cb (GtkWidget *widget)
2224
login_cb (GtkWidget *widget)
2222
{
2225
{
2226
    GError *error = NULL;
2227
2223
    /* Reset to default screensaver values */
2228
    /* Reset to default screensaver values */
2224
    if (lightdm_greeter_get_lock_hint (greeter))
2229
    if (lightdm_greeter_get_lock_hint (greeter))
2225
        XSetScreenSaver (gdk_x11_display_get_xdisplay (gdk_display_get_default ()), timeout, interval, prefer_blanking, allow_exposures);
2230
        XSetScreenSaver (gdk_x11_display_get_xdisplay (gdk_display_get_default ()), timeout, interval, prefer_blanking, allow_exposures);
Lines 2233-2239 login_cb (GtkWidget *widget) Link Here
2233
        start_session ();
2238
        start_session ();
2234
    else if (lightdm_greeter_get_in_authentication (greeter))
2239
    else if (lightdm_greeter_get_in_authentication (greeter))
2235
    {
2240
    {
2236
        lightdm_greeter_respond (greeter, gtk_entry_get_text (password_entry));
2241
        lightdm_greeter_respond (greeter, gtk_entry_get_text (password_entry), &error);
2237
        /* If we have questions pending, then we continue processing
2242
        /* If we have questions pending, then we continue processing
2238
         * those, until we are done. (Otherwise, authentication will
2243
         * those, until we are done. (Otherwise, authentication will
2239
         * not complete.) */
2244
         * not complete.) */
Lines 2306-2311 show_message_cb (LightDMGreeter *greeter Link Here
2306
static void
2311
static void
2307
timed_autologin_cb (LightDMGreeter *greeter)
2312
timed_autologin_cb (LightDMGreeter *greeter)
2308
{
2313
{
2314
    GError *error = NULL;
2315
2309
    /* Don't trigger autologin if user locks screen with light-locker (thanks to Andrew P.). */
2316
    /* Don't trigger autologin if user locks screen with light-locker (thanks to Andrew P.). */
2310
    if (!lightdm_greeter_get_lock_hint (greeter))
2317
    if (!lightdm_greeter_get_lock_hint (greeter))
2311
    {
2318
    {
Lines 2326-2332 timed_autologin_cb (LightDMGreeter *gree Link Here
2326
            }
2333
            }
2327
        }
2334
        }
2328
        else
2335
        else
2329
            lightdm_greeter_authenticate_autologin (greeter);
2336
            lightdm_greeter_authenticate_autologin (greeter, &error);
2330
    }
2337
    }
2331
}
2338
}
2332
2339

Return to bug 588764