← Back to branch summary

~ubuntu-branches/ubuntu/natty/gnome-keyring/natty

« back to all changes in this revision

Viewing changes to daemon/login/gkd-login.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2010-12-06 17:58:28 UTC
  • mfrom: (1.1.65 upstream)
  • Revision ID: james.westby@ubuntu.com-20101206175828-8xjojyxw89qacpq7
Tags: 2.92.92.is.2.32.1-0ubuntu1
* New upstream version
* debian/control.in:
  - updated the libglib requirement
* debian/libgcr0.symbols:
  - new version update
* debian/patches/02_uidir_relocate.patch:
  - updated for the new version
* debian/patches/10_git_fix_cka_trusted_collections.patch:
  - dropped, the patch is the new version
* debian/patches/90_git_pam_headers.patch:
  - dropped, the patch is the new version

Show diffs side-by-side

added added

removed removed

Lines of Context:
daemon/login/gkd-login.c
224
224
        /* Failure, bad password? */
225
225
        if (cred == NULL) {
226
226
                if (login && g_error_matches (error, GP11_ERROR, CKR_PIN_INCORRECT))
227
 
                        gkm_wrap_layer_hint_login_unlock_failure ();
 
227
                        gkm_wrap_layer_mark_login_unlock_failure (master);
228
228
                else
229
229
                        g_warning ("couldn't create login credential: %s", egg_error_message (error));
230
230
                g_clear_error (&error);
239
239
 
240
240
        /* The unlock succeeded yay */
241
241
        } else {
242
 
                gkm_wrap_layer_hint_login_unlock_success ();
 
242
                gkm_wrap_layer_mark_login_unlock_success ();
243
243
        }
244
244
 
245
245
        if (cred)
340
340
                                g_message ("couldn't change login master password, "
341
341
                                           "original password was wrong: %s",
342
342
                                           egg_error_message (error));
343
 
                                gkm_wrap_layer_hint_login_unlock_failure ();
344
343
                        } else {
345
344
                                g_warning ("couldn't create original login credential: %s",
346
345
                                           egg_error_message (error));